 cxt
|
44b3f6019c
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-23 21:44:20 +08:00 |
|
cxt
|
86bd5b97b1
|
竞赛头部调整
|
2016-12-23 21:44:03 +08:00 |
 huang
|
41312d82c5
|
竞赛动态中通知回复及删除局部刷新
|
2016-12-23 21:23:07 +08:00 |
|
huang
|
b563b170bd
|
竞赛动态新闻
|
2016-12-23 21:13:40 +08:00 |
|
huang
|
69bacc1f6e
|
base添加竞赛入口
|
2016-12-23 20:27:16 +08:00 |
|
huang
|
2c97f12538
|
竞赛编辑功能
|
2016-12-23 19:56:00 +08:00 |
|
huang
|
bc5846c2d6
|
竞赛通知 详情页面完成
|
2016-12-23 19:48:39 +08:00 |
|
huang
|
43bb3fe4eb
|
完成竞赛通知 列表页面
|
2016-12-23 19:35:02 +08:00 |
|
huang
|
c98a8b5113
|
竞赛通知新建
|
2016-12-23 19:08:13 +08:00 |
|
huang
|
345d8b5045
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-12-23 17:00:37 +08:00 |
|
huang
|
0877aae0d6
|
竞赛通知 index方法
|
2016-12-23 17:00:11 +08:00 |
|
cxt
|
a03c0f68c2
|
提交作品
|
2016-12-23 16:58:50 +08:00 |
|
cxt
|
544702e11f
|
新建题目
|
2016-12-23 14:41:21 +08:00 |
|
cxt
|
5a27b84e97
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-22 17:13:25 +08:00 |
|
cxt
|
9331525304
|
竞赛消息的调整
|
2016-12-22 17:13:10 +08:00 |
|
huang
|
3406d4ba0d
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-12-22 17:11:15 +08:00 |
|
huang
|
9f0b17424d
|
竞赛配置样式调整
|
2016-12-22 17:10:40 +08:00 |
|
huang
|
f37c292e99
|
添加成员
|
2016-12-22 17:02:54 +08:00 |
|
huang
|
b74c034237
|
项目配置添加ke编辑 base中去掉配置
|
2016-12-22 16:39:54 +08:00 |
|
cxt
|
c4927070a0
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-22 16:05:12 +08:00 |
|
huang
|
eb7ecd4143
|
竞赛配置功能
|
2016-12-22 16:03:58 +08:00 |
|
cxt
|
346dc069ef
|
加入竞赛的消息通知
|
2016-12-22 16:02:36 +08:00 |
|
huang
|
0d00b6ca74
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-12-22 15:17:54 +08:00 |
|
huang
|
037e717937
|
竞赛邀请码 竞赛settings（部分）
|
2016-12-22 15:17:02 +08:00 |
|
cxt
|
cf8725f2ee
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-22 15:08:49 +08:00 |
|
cxt
|
4c5a2aa40b
|
加入竞赛
|
2016-12-22 15:08:15 +08:00 |
|
huang
|
01d9fbbef3
|
组织base框架
|
2016-12-22 14:47:42 +08:00 |
|
cxt
|
5242e12373
|
竞赛框架搭建
|
2016-12-22 10:01:37 +08:00 |
|
huang
|
3bf6c35d0e
|
我(Ta)的主页 课程、项目链接修改
|
2016-12-19 11:33:14 +08:00 |
|
huang
|
9a6a4a5203
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-19 09:55:07 +08:00 |
|
cxt
|
35dfdeea98
|
消息报500
|
2016-12-17 18:01:08 +08:00 |
|
cxt
|
fc6d2f1155
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-12-17 17:59:05 +08:00 |
|
cxt
|
c444096a04
|
消息列表报500
|
2016-12-17 17:58:31 +08:00 |
|
陈晓婷
|
7d2bcaada3
|
Merge branch 'develop' into 'develop'
项目社区、课程社区点击我的动态错误，新建用户个人主页显示错误
项目社区、课程社区点击我的动态错误，新建用户个人主页显示错误
See merge request !75
|
2016-12-17 17:10:09 +08:00 |
 daiao
|
96e02cd48f
|
项目社区、课程社区点击我的动态错误，新建用户个人主页显示错误
|
2016-12-17 17:04:44 +08:00 |
|
cxt
|
4755294743
|
班级作业：老师或助教同意申诉后，作品列表中“同意/拒绝”、“申诉中”、分数没有自动刷新
|
2016-12-17 16:26:06 +08:00 |
|
daiao
|
d16e9e4ecd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-17 15:38:49 +08:00 |
|
daiao
|
73747a81d6
|
个人主页消息铃铛翻页
|
2016-12-17 15:34:26 +08:00 |
|
cxt
|
ef78de1a9c
|
班级分组作业：评分设置中勾选启用匿评申诉，点击确定按钮报500
|
2016-12-17 14:50:40 +08:00 |
|
cxt
|
21377fa45a
|
班级作业：评分设置中“最终评分”设置为“助教评分+学生匿评”不可用
|
2016-12-17 14:36:32 +08:00 |
|
cxt
|
f7f1c68576
|
匿评申诉的错别字、匿评申诉：评阅人、老师或助教点击收到的申诉消息返回对应的作品列表，建议定位到对应的作品
|
2016-12-17 14:10:51 +08:00 |
|
cxt
|
d9dcb3b291
|
“我的作业”页面中“评分”建议跳转到作品列表，而不是作业信息页面
|
2016-12-17 10:41:30 +08:00 |
|
cxt
|
fc67e6e3be
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/users/_anonymous_evaluation_list.html.erb
|
2016-12-17 10:25:48 +08:00 |
|
cxt
|
d6c51cce2a
|
首页：如图关注列表中添加关注、取消关注后关注数统计未自动刷新
|
2016-12-17 10:20:08 +08:00 |
|
daiao
|
b76dd30b6d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-17 10:17:34 +08:00 |
|
daiao
|
882ceb6a63
|
个人主页样式调整
|
2016-12-17 10:12:56 +08:00 |
|
cxt
|
e29eb67f68
|
课程列表中删除课程确认弹框中“关闭”改为“取消”
|
2016-12-17 10:07:51 +08:00 |
|
cxt
|
d876962f05
|
课程社区和项目社区的左侧列表无法收回
|
2016-12-17 09:53:23 +08:00 |
|
cxt
|
16fe5f58a1
|
详细列表的样式调整
|
2016-12-17 09:38:48 +08:00 |
|
cxt
|
2275a0ecae
|
首页、课程社区、项目社区的点击展开更多
|
2016-12-17 09:38:32 +08:00 |