 huang
|
743950d264
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
2015-12-29 18:13:15 +08:00 |
 cxt
|
c3ddbcfddf
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2015-12-29 16:33:32 +08:00 |
|
huang
|
41cd038758
|
讨论区帖子添加锁定
|
2015-12-29 15:05:07 +08:00 |
|
cxt
|
000f40ad42
|
作业动态的截止时间根据作业当前所处状态来确定是提交截止时间还是匿评截止时间
|
2015-12-29 10:59:26 +08:00 |
 ouyangxuhua
|
2076c9b449
|
Merge branch 'develop' into dev_hjq
Conflicts:
app/controllers/organizations_controller.rb
app/views/layouts/_footer.html.erb
app/views/layouts/base_org.html.erb
app/views/organizations/_org_activities.html.erb
db/schema.rb
public/stylesheets/new_user.css
public/stylesheets/org.css
public/stylesheets/public.css
|
2015-12-28 15:32:03 +08:00 |
|
huang
|
ce740170ca
|
Merge branch 'hjq_new_course' into szzh
Conflicts:
public/stylesheets/public.css
处理冲突
|
2015-12-25 18:05:36 +08:00 |
|
huang
|
cd36a6874e
|
修改issue动态错位
|
2015-12-25 18:03:32 +08:00 |
|
cxt
|
7f133c860a
|
发布和编辑作业时可设置是否启用匿评
|
2015-12-25 15:57:30 +08:00 |
|
cxt
|
b8d8cece02
|
关联项目的样式修改
|
2015-12-25 14:56:08 +08:00 |
|
cxt
|
ce5f0eb855
|
关联项目的样式修改
|
2015-12-25 11:00:41 +08:00 |
 Tim
|
b0b4527ea1
|
Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq
Conflicts:
public/stylesheets/org.css
|
2015-12-24 10:40:00 +08:00 |
|
cxt
|
24542105f4
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2015-12-24 09:57:47 +08:00 |
|
ouyangxuhua
|
9e0b88c186
|
项目讨论区样式改成方块样式
|
2015-12-24 09:46:18 +08:00 |
|
Tim
|
c405950469
|
课程关联项目列表显示调整
|
2015-12-23 17:26:13 +08:00 |
|
cxt
|
1623d846f4
|
动态的展开更多改成点击展开更多
|
2015-12-22 15:14:03 +08:00 |
|
cxt
|
65022f03cb
|
作业动态中的评分设置和匿评自动开启、关闭时间的自动刷新
|
2015-12-18 21:34:31 +08:00 |
|
cxt
|
e7db03f271
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-18 19:49:42 +08:00 |
 guange
|
e9a45012f8
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-18 19:47:21 +08:00 |
|
guange
|
08cd3808ad
|
ke引用错误
|
2015-12-18 19:47:06 +08:00 |
|
cxt
|
6a563d4256
|
匿评结束后不可修改作业的截止日期，作业发布后不可修改作业的发布日期
|
2015-12-18 18:47:36 +08:00 |
 lizanle
|
a1d0bf43ee
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-12-18 17:55:21 +08:00 |
|
lizanle
|
009dc089f0
|
资源库重命名修改
|
2015-12-18 17:55:15 +08:00 |
|
huang
|
ea51b24a4e
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-18 17:06:00 +08:00 |
|
cxt
|
63f9601c15
|
Merge branch 'cxt_course' into szzh
|
2015-12-18 16:27:31 +08:00 |
|
cxt
|
7ce8e330c3
|
课程留言动态的显示
|
2015-12-18 16:21:27 +08:00 |
|
huang
|
a080306f75
|
解决课程动态中，点击按钮，提交多次的问题
|
2015-12-18 16:05:39 +08:00 |
|
cxt
|
2eaa05306f
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/boards/_course_show.html.erb
|
2015-12-18 15:08:38 +08:00 |
|
cxt
|
ba4c93e4c4
|
Merge branch 'cxt_course' into szzh
|
2015-12-18 15:03:24 +08:00 |
|
lizanle
|
70f93741d6
|
issue图标问题
|
2015-12-18 14:38:04 +08:00 |
|
cxt
|
ca77af9221
|
作业动态添加扣分规则
|
2015-12-18 13:13:23 +08:00 |
|
cxt
|
2faddd7d75
|
分组设置中的基于项目实施默认勾选
|
2015-12-18 10:00:26 +08:00 |
|
guange
|
eb97f7dfb2
|
merge
|
2015-12-18 09:20:51 +08:00 |
|
cxt
|
0ed58d4898
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-17 19:07:17 +08:00 |
|
lizanle
|
5f8c04e3a0
|
Merge branch 'szzh' into dev_zanle
|
2015-12-17 18:17:38 +08:00 |
|
guange
|
fc63dfcb7b
|
消息通知
|
2015-12-17 15:14:52 +08:00 |
|
cxt
|
89d3d3821c
|
分组作业的导入
|
2015-12-17 10:38:14 +08:00 |
|
cxt
|
51e082a551
|
编辑和新建作品时的样式和提示信息调整
|
2015-12-17 10:17:13 +08:00 |
|
cxt
|
fa0f9c6751
|
分组作业的编辑，若分组作业已提交了作品则不可再编辑分组设置
|
2015-12-17 10:16:29 +08:00 |
|
cxt
|
ff579afd45
|
作业动态中添加分组人数
|
2015-12-17 09:27:51 +08:00 |
|
cxt
|
a8c8dc3cc6
|
关联项目的提示信息修改
|
2015-12-16 17:38:28 +08:00 |
|
guange
|
c0de5d55de
|
加入了issue的at消息提醒
|
2015-12-16 16:37:00 +08:00 |
|
cxt
|
dc0f004021
|
关联项目的提示信息
|
2015-12-16 15:47:30 +08:00 |
|
cxt
|
5cf88a287b
|
分组作业提示语的修改
|
2015-12-16 11:37:59 +08:00 |
|
cxt
|
72c475e8a2
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-15 16:03:26 +08:00 |
|
Tim
|
b687c42de3
|
Merge branch 'dev_zanle' of https://git.trustie.net/jacknudt/trustieforge into dev_zanle
|
2015-12-15 15:01:21 +08:00 |
|
Tim
|
b761121f9f
|
"指派给"颜色更换
|
2015-12-15 15:00:24 +08:00 |
|
guange
|
4f57e48b92
|
merge
|
2015-12-14 18:20:32 +08:00 |
|
guange
|
d1315e35b5
|
merge
|
2015-12-14 17:26:40 +08:00 |
|
guange
|
f61f639af2
|
转换为remote js
|
2015-12-14 17:13:57 +08:00 |
|
cxt
|
438ae82980
|
非课程学生不能关联项目
|
2015-12-14 17:02:44 +08:00 |