yanxd
|
24a12115b0
|
Merge branch 'forum' of 10.0.47.245:/home/trustie2 into forum
|
12 years ago |
|
yanxd
|
8218fde509
|
memo controller.
|
12 years ago |
 fanqiang
|
cb494f460a
|
Merge branch 'forum' of 10.0.47.245:/home/trustie2 into forum
|
12 years ago |
|
fanqiang
|
4f00b12016
|
添加了论坛加tag功能
|
12 years ago |
|
yanxd
|
bc76ed2f4b
|
Merge remote-tracking branch 'origin/forum' into forum
|
12 years ago |
|
yanxd
|
54c6ed72c1
|
memos
|
12 years ago |
|
fanqiang
|
d77fed5d34
|
不好说啊，赶紧结束吧~~~~~~~~~~~~~
|
12 years ago |
|
yanxd
|
c6f4dbbafa
|
10%
|
12 years ago |
|
fanqiang
|
6e1913d00d
|
修改新建topic界面
|
12 years ago |
|
fanqiang
|
17cb97828d
|
修改forum的show界面
|
12 years ago |
|
yanxd
|
69d3ab5bef
|
add memo controller
|
12 years ago |
|
fanqiang
|
c50c77a7ca
|
frame
|
12 years ago |
|
yanxd
|
48650a2a91
|
init forum. again.
|
12 years ago |
|
yanxd
|
c03f17e3b4
|
Revert "小改怡情，大改伤身，强改灰飞烟灭"
This reverts commit 4a4d1159f8.
|
12 years ago |
|
fanqiang
|
4a4d1159f8
|
小改怡情，大改伤身，强改灰飞烟灭
|
12 years ago |
|
fanqiang
|
16f70437d1
|
forum init.
|
12 years ago |
 huangjingquan
|
b8db0f59d2
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
xianbo
|
9f1c03ee10
|
fix edit about forum
|
12 years ago |
|
fanqiang
|
6a0d362241
|
修改了以附件形式提交作业时，当作业为空时也能提交的BUG
修改了匿名用户提交作业的BUG
|
12 years ago |
|
huangjingquan
|
45fad95d48
|
冲突处理
|
12 years ago |
|
yanxd
|
0381179536
|
自动添加讨论区当项目课程创建的时候，学生是否能回复需要在全线报表里配置.
|
12 years ago |
|
yanxd
|
9491781b45
|
.
|
12 years ago |
|
yanxd
|
8ec2d8342b
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
349020182a
|
.
|
12 years ago |
 baiyu
|
1a42cdd013
|
增加了课程与竞赛的人名超链接
|
12 years ago |
|
baiyu
|
9293ef53b9
|
修正了竞赛配置的问题
|
12 years ago |
|
baiyu
|
6c9c849e7c
|
1、增加了竞赛的配置功能
2、增加了课程的成员学号显示
|
12 years ago |
|
yanxd
|
356a48caa8
|
move constant to module, fixed some translate.
|
12 years ago |
|
huangjingquan
|
16611d8eff
|
修改了管理员权限
|
12 years ago |
|
yanxd
|
2932f5a940
|
第一次db:migrate时创建admin的用户扩展表，防止第一次部署出错;为项目版本库diff增加过滤器。
|
12 years ago |
|
huangjingquan
|
bfcb68efab
|
课程添加了讨论区
限制学生下作业
讨论区权限设置
|
12 years ago |
|
baiyu
|
2f8ef03d32
|
1、增加了参与竞赛的用户列表
2、区分了个人主页里“粉丝”列表里的项目与课程的计数与显示
3、竞赛发布人的名字改为了全称
|
12 years ago |
|
baiyu
|
005e0802d4
|
增加了竞赛的“加入”
|
12 years ago |
|
xianbo
|
5366b50c56
|
modify admin show
BY nieguanfei && huangjinquan
|
12 years ago |
|
yanxd
|
88b9f943fc
|
fix issue#353
|
12 years ago |
|
yanxd
|
0ddd259fea
|
refactor: access controller move to filter.
|
12 years ago |
|
yanxd
|
8f59e035b0
|
Merge branch 'hidden_repo' into develop
|
12 years ago |
|
yanxd
|
98ccc97b27
|
add hidden repository function
|
12 years ago |
|
xianbo
|
02ff8b8955
|
take off course fomre form the projrct ehich is watched
|
12 years ago |
|
yanxd
|
5fb29c150b
|
refactory projectController#new
|
12 years ago |
|
yanxd
|
a101be344c
|
add any remark
|
12 years ago |
 nieguanghui
|
6352ae7aa6
|
fix bug
|
12 years ago |
|
nieguanghui
|
adf8a7bc92
|
修改课程活跃度排序方式，解决课程列表文件链接错误
|
12 years ago |
|
xianbo
|
1cfba644f5
|
fix show of someone who watch and fxi the show of homework exdit
|
12 years ago |
|
xianbo
|
607eb2c2ff
|
modify shoew of project
|
12 years ago |
|
nieguanghui
|
50b91e3942
|
修改按钮样式，增加附件过滤
|
12 years ago |
|
yanxd
|
239a1484ae
|
remove useless code block
|
12 years ago |
|
fanqiang
|
9996386fe4
|
增加课程留言与项目反馈功能，修改了点击课程作业时tab页显示问题
|
12 years ago |
|
huangjingquan
|
17317da314
|
修改了项目和课程里面配置成员bug
|
12 years ago |
|
yanxd
|
2d4b9f8c52
|
nothing
|
12 years ago |
|
yanxd
|
9526f6d67a
|
remove string unkown
|
12 years ago |
|
nieguanghui
|
2b10258ae1
|
修改课程列表显示样式
|
12 years ago |
|
yanxd
|
397eb11dca
|
refactor memberlist
|
12 years ago |
|
nieguanghui
|
cab092cd04
|
修改课程默认排序方式
|
12 years ago |
|
nieguanghui
|
583c022048
|
修复作业列表搜索bug
|
12 years ago |
|
huangjingquan
|
5febe8a58d
|
个人主页课程列表加入了“退出课程”和加入课程按钮
|
12 years ago |
|
baiyu
|
b2080a4470
|
加入了开课时间，结课时间选项
增加了课时文本框
相应的增加了显示
|
12 years ago |
|
nieguanghui
|
db25900336
|
修复新建项目的时候相关信息写入丢失bug
|
12 years ago |
|
nieguanghui
|
75c0480071
|
增加个人活动列表，作业过滤功能，删除课程作业搜索框，修复课程页面以学生角色搜索也会出现新建课程的bug
|
12 years ago |
|
xianbo
|
67d228142a
|
add the root in bid modify about homework
|
12 years ago |
|
huangjingquan
|
477e299e24
|
修改了用户主页课程列表显示
去掉了作业和关注需求，将关注需求统计显示
|
12 years ago |
|
yanxd
|
0b04b28024
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
2286fbeff5
|
members split (teacher,student) in course
|
12 years ago |
|
xianbo
|
5dfac1d8e3
|
add modify about homework and modify the show of toll bar
|
12 years ago |
|
baiyu
|
9b9745ea0a
|
对于应标需求，提交作业，提交竞赛作品成功后闪出的flash做了区别
|
12 years ago |
|
yanxd
|
67216ca463
|
fix back_url bug
|
12 years ago |
|
nieguanghui
|
224a194759
|
修复成员 bug，修复作业显示bug‘
|
12 years ago |
|
xianbo
|
1f09bfbab1
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
xianbo
|
e9856b3524
|
modify the style of the projects witch show
|
12 years ago |
|
nieguanghui
|
1f8c10e48a
|
修复bug
|
12 years ago |
|
xianbo
|
a50aff3fb4
|
1.add special reward
2.give a root controller in bid controller && give the administrator the root can change the reward who is deadine.
|
12 years ago |
|
xianbo
|
2fa6276829
|
fix natural
|
12 years ago |
|
xianbo
|
21ffbe637e
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/projects/_project.html.erb
app/views/projects/member.html.erb
app/views/users/index.html.erb
config/locales/zh.yml
db/schema.rb
files/2013/10/131007102834__my_course.html.erb
|
12 years ago |
|
xianbo
|
2589d429b0
|
add the project what one watch
|
12 years ago |
|
nieguanghui
|
5ce9bcdb2c
|
解决竞赛，需求，作业列表搜索bug
|
12 years ago |
|
xianbo
|
5a1bb0f2d4
|
fix bug in arrange to net
|
12 years ago |
|
nieguanghui
|
b04fe3d1bb
|
增加项目评分 个人评分 ，个人在项目中的评分机制
|
12 years ago |
|
yanxd
|
5d0b5812b3
|
share completed with fq, xianbo
|
12 years ago |
baiyu
|
ecdeaf123e
|
修改了部分国际化
|
12 years ago |
|
baiyu
|
0206d3f2c3
|
需求里面添加了用户和项目与需求的联系
|
12 years ago |
|
yanxd
|
ab5d8853b5
|
fixed issue#314
|
12 years ago |
|
yanxd
|
081a8e9825
|
fixed issue#319
|
12 years ago |
|
yanxd
|
69869a05c9
|
reverse projects list, add explain to role.
|
12 years ago |
|
nieguanghui
|
17a4f14f2a
|
修复课程和项目搜索bug
|
12 years ago |
 huangjingquan
|
bcb66f2b32
|
在个人主页项目里面添加新建按钮
|
12 years ago |
|
huangjingquan
|
673850bd03
|
fix
|
12 years ago |
|
huangjingquan
|
19ebd48a95
|
修改了作业列表无法显示
|
12 years ago |
|
huangjingquan
|
00cef03049
|
修改了个人主页里关注需求全部需求改成只关注的需求
|
12 years ago |
|
huangjingquan
|
8082bb456f
|
为竞赛添加新的页面
|
12 years ago |
|
yanxd
|
a5cdbc8e92
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
f1a31c7f6b
|
提升头像图片显示分辨力
|
12 years ago |
|
xianbo
|
d3f46adc34
|
fix
|
12 years ago |
|
xianbo
|
fd14457446
|
add delete homework in course
|
12 years ago |
|
xianbo
|
d7f7ff5fa9
|
delete homework
|
12 years ago |
|
huangjingquan
|
c49209cbfb
|
将课程和作业分开
作业单独一个tabs
|
12 years ago |
|
baiyu
|
13a2cfe644
|
修改了fork页面，增加了教师超链接
|
12 years ago |
|
fanqiang
|
962842d841
|
修改了提交作业数量显示问题，修改了创建需求的种类选择问题
|
12 years ago |
|
xianbo
|
956aa3d0c1
|
remove forum block in course setting
|
12 years ago |
|
huangjingquan
|
e25425d9a7
|
用户看别人课程主页时显示问题
|
12 years ago |
|
nieguanghui
|
8703709bd0
|
解决了课程创建时设置私有依旧显示在课程列表的bug
|
12 years ago |
|
huangjingquan
|
a0c6a183fe
|
修改了个人主页的关注需求里面只显示需求不显示作业
|
12 years ago |
|
xianbo
|
543279eb84
|
add course filter
|
12 years ago |
|
huangjingquan
|
64cddc8687
|
修改了课程设置里面bug
角色改成英文
|
12 years ago |
|
xianbo
|
b0d413a216
|
modify the admin select
|
12 years ago |
|
xianbo
|
3b6f0e3d34
|
modify delete project and user and define a course is a public
|
12 years ago |
|
huangjingquan
|
bf081b95bd
|
学生自己的主页课程里面添加加入课程链接
竞赛里面 修复列表排序bug
新建竞赛的时候 修复了几个bug
|
12 years ago |
|
huangjingquan
|
9e77d3e001
|
修改了作业课程里面一些Bug
|
12 years ago |
|
huangjingquan
|
2c45fb8760
|
竞赛
|
12 years ago |
|
fanqiang
|
8e51ea7327
|
修改了企业注册与修改企业资料过程，以及一些企业主页中的显示细节
|
12 years ago |
|
huangjingquan
|
cab5fb8b52
|
新的
|
12 years ago |
|
nieguanghui
|
606c998247
|
修改课程列表显示内容，修复作业列表显示bug
|
12 years ago |
|
baiyu
|
56e5e55589
|
修改了fork里的格式及若干国际化
修改了给项目留言回复的权限
隐藏了作业列表的“发布作业”
|
12 years ago |
|
baiyu
|
64f36f2c9d
|
修改了一些BUG
|
12 years ago |
|
baiyu
|
2a9cb28c4e
|
1、修改了国际化
2、增加了课程“年度”“学期”
3、主讲教师显示bug
|
12 years ago |
|
huangjingquan
|
43a0a875f4
|
修改课程创建问题
|
12 years ago |
|
huangjingquan
|
9c0b68460a
|
修改课程与企业样式
|
12 years ago |
|
huangjingquan
|
b6ca2c3d74
|
修改了讨论区bug
|
12 years ago |
|
fanqiang
|
838894a19c
|
修改了需求评分功能，以及作业的提交
|
12 years ago |
|
huangjingquan
|
b19ed67d79
|
新的课程
修改了一些bug
|
12 years ago |
|
fanqiang
|
9fbccfbb6d
|
改了一些问题
创建课程问题
添加了需求的FORK功能
|
12 years ago |
 william
|
da82a630e9
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into tmp1
Conflicts:
app/controllers/bids_controller.rb
app/helpers/bids_helper.rb
config/locales/zh.yml
db/schema.rb
|
12 years ago |
|
william
|
2079c87362
|
增加tag删除。
|
12 years ago |
|
fanqiang
|
781fa32dbb
|
添加了需求的fork功能
|
12 years ago |
|
baiyu
|
436569c88d
|
1、修改了location和identity不能显示的问题
2、修改了学号框样式
|
12 years ago |
|
william
|
61e4021625
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/controllers/bids_controller.rb
app/views/bids/_history.html.erb
app/views/bids/_project_list.html.erb
app/views/bids/show.html.erb
config/locales/zh.yml
config/routes.rb
lib/redmine.rb
|
12 years ago |
|
william
|
7d919fd3c3
|
Merge branch 'liuping' into develop
Conflicts:
app/helpers/bids_helper.rb
app/views/bids/_project_list.html.erb
app/views/bids/show.html.erb
config/locales/zh.yml
db/schema.rb
|
12 years ago |
|
xianbo
|
8ff8d0f4d4
|
modify some little bug && merge handle
|
12 years ago |
|
xianbo
|
806fae7b19
|
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop
Conflicts:
app/controllers/account_controller.rb
app/controllers/my_controller.rb
app/controllers/projects_controller.rb
app/controllers/users_controller.rb
app/helpers/projects_helper.rb
app/helpers/users_helper.rb
app/models/project.rb
app/models/user.rb
app/models/user_extensions.rb
app/views/account/register.html.erb
app/views/bids/_bid_show.html.erb
app/views/bids/_history.html.erb
app/views/bids/_project_list.html.erb
app/views/bids/show.html.erb
app/views/files/index.html.erb
app/views/layouts/base_bids.html.erb
app/views/layouts/base_users.html.erb
app/views/my/account.html.erb
app/views/users/watch_bids.html.erb
config/locales/en.yml
config/locales/zh.yml
config/routes.rb
db/schema.rb
lib/redmine.rb
public/stylesheets/application.css
|
12 years ago |
|
william
|
dcbaf1c02b
|
增加需求结束方法。
|
12 years ago |
baiyu
|
4fb040bc61
|
modify register bug
|
12 years ago |
|
huangjingquan
|
5dbef9e2c5
|
修改了日历和版本库bug
|
12 years ago |
|
huangjingquan
|
278cb57ab9
|
修改了项目里面一些bug
|
12 years ago |
|
baiyu
|
6ce27271e3
|
修改了身份
增加了职称、学号
|
12 years ago |
|
huangjingquan
|
3536883248
|
课程合并
|
12 years ago |
 baiyu
|
1c4f7f99e8
|
一些修订
|
12 years ago |
|
baiyu
|
c2302dc0c7
|
增加了附件删除功能
修改用户主页中课程与项目之间的关系
用户课程页面中的作业进行了按课程分组
|
12 years ago |
|
baiyu
|
a7b500f5e7
|
修正了“注册”和“我的账号”的显示格式
|
12 years ago |
|
nieguanghui
|
45178e178f
|
fix the projects's present bug
|
12 years ago |
|
fanqiang
|
9d2ea5639f
|
添加自动生成课程标识功能
|
12 years ago |
|
huangjingquan
|
466922d13b
|
修改了上次会议提出的几点
|
12 years ago |
|
fanqiang
|
671b81035c
|
修改课程部分的权限设置，并且修改了作业的侧边栏显示
|
12 years ago |
|
fanqiang
|
50894d8950
|
将新闻添加进活动
|
12 years ago |
|
huangjingquan
|
11370329dd
|
修改了部分功能
|
12 years ago |
|
baiyu
|
2768c935be
|
1、增加了“我的状态”
|
12 years ago |
|
huangjingquan
|
e4cbc7533e
|
tabs显示
|
12 years ago |
|
baiyu
|
313e66537e
|
增加了“地区”
|
12 years ago |
|
huangjingquan
|
3a6f055159
|
solve some little problem
|
12 years ago |
|
fanqiang
|
805ad6600b
|
添加了提交作业
|
12 years ago |
|
huangjingquan
|
767231c202
|
fg
|
12 years ago |
|
huangjingquan
|
ffa412d290
|
x
|
12 years ago |
