huang
|
16bba76f61
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-15 16:52:15 +08:00 |
huang
|
6027b6d0f5
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
|
2016-04-15 16:51:37 +08:00 |
huang
|
5e5f677bab
|
动态中显示默认分支的统计
|
2016-04-15 16:50:39 +08:00 |
huang
|
a18daeecd1
|
版本库统计与动态统一
|
2016-04-15 16:01:25 +08:00 |
cxt
|
4c4afb7a94
|
在新窗口中打开作业批次列表中的作业
|
2016-04-15 15:57:49 +08:00 |
huang
|
a21200ab14
|
动态中添加分支
|
2016-04-15 15:53:29 +08:00 |
cxt
|
9fdd229b2c
|
Merge branch 'cxt_course' into develop
|
2016-04-15 15:45:54 +08:00 |
huang
|
4a8d572cb1
|
项目动态中版本库统计样式
|
2016-04-15 15:38:08 +08:00 |
cxt
|
7f3fcb7d01
|
精品课程列表中的全部课程可点击动态数排序
|
2016-04-15 14:54:17 +08:00 |
yuanke
|
f1090d45ad
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
2016-04-15 14:13:44 +08:00 |
yuanke
|
8eebfd7480
|
Merge branch 'yuanke' into develop
|
2016-04-15 12:40:06 +08:00 |
yuanke
|
365540cf1f
|
管理员界面显示代码测试列表的修改
|
2016-04-15 12:39:22 +08:00 |
huang
|
40b45ce1b4
|
版本库动态中统计改成从数据库获取
|
2016-04-15 12:24:54 +08:00 |
cxt
|
36e8b05f9c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-15 11:32:38 +08:00 |
cxt
|
bca0a4bf39
|
Merge branch 'cxt_course' into develop
|
2016-04-15 11:32:24 +08:00 |
yuanke
|
e58f1ab94b
|
Merge branch 'yuanke' into develop
|
2016-04-15 11:29:40 +08:00 |
yuanke
|
998106b37b
|
修改代码查重的一些弹框显示效果等问题
|
2016-04-15 11:28:20 +08:00 |
cxt
|
143f3f8f9a
|
管理员界面增加精品课程的设置
|
2016-04-15 11:26:56 +08:00 |
cxt
|
3b4f6f4846
|
添加分班和修改分班名称时刷新学生列表
|
2016-04-14 17:24:56 +08:00 |
cxt
|
829399b8af
|
个人主页的课程列表和项目列表排序
|
2016-04-14 16:59:25 +08:00 |
cxt
|
96accf1e7a
|
未发布的作业不应进行作业的积分统计
|
2016-04-14 15:35:27 +08:00 |
cxt
|
2d4f724e33
|
导出的学生列表作品排序按作业发布时间升序排列
|
2016-04-14 15:01:18 +08:00 |
Tim
|
5ba2149f43
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-04-14 14:50:31 +08:00 |
cxt
|
4e4eb7b759
|
学生作业积分默认显示两位小数
|
2016-04-14 14:50:33 +08:00 |
Tim
|
37bd547d87
|
作业下拉框效果
|
2016-04-14 14:50:16 +08:00 |
cxt
|
d91d2bfa17
|
作业下拉列表显示全部作业
|
2016-04-14 14:45:42 +08:00 |
Tim
|
f479277a96
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-04-14 14:38:34 +08:00 |
yuanke
|
36f3d61915
|
Merge branch 'yuanke' into develop
|
2016-04-14 14:36:30 +08:00 |
yuanke
|
25fd655a56
|
修改转不到查重结果页面的BUG
|
2016-04-14 14:35:50 +08:00 |
yuanke
|
de0ba0fbe5
|
Merge branch 'yuanke' into develop
|
2016-04-14 13:56:42 +08:00 |
yuanke
|
6444d859a7
|
迁移文件修改
|
2016-04-14 13:55:55 +08:00 |
huang
|
fddf03d80c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-14 13:44:14 +08:00 |
huang
|
7d8715e82b
|
Merge branch 'hjq_beidou' into develop
|
2016-04-14 13:43:58 +08:00 |
huang
|
2a00c4ddd7
|
版本库统计show权限统计
|
2016-04-14 13:39:19 +08:00 |
cxt
|
d948536a10
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-14 12:33:15 +08:00 |
cxt
|
e5b07c6c12
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-04-14 12:33:11 +08:00 |
cxt
|
19861ba8c6
|
超级管理员的组织可关联所有公开课程和项目
|
2016-04-14 12:30:33 +08:00 |
yuanke
|
ef4b256313
|
Merge branch 'yuanke' into develop
Conflicts:
app/models/homework_common.rb
config/locales/zh.yml
db/schema.rb
|
2016-04-14 11:32:35 +08:00 |
cxt
|
5e1284605f
|
Merge branch 'hjq_beidou' into cxt_course
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-04-14 11:29:26 +08:00 |
yuanke
|
a8dce5e520
|
代码查重功能增加,管理员界面增加代码测试列表.
|
2016-04-14 11:29:22 +08:00 |
huang
|
c87611dfec
|
动态中添加版本库统计
|
2016-04-14 11:18:17 +08:00 |
cxt
|
d33f839b95
|
中文字符
|
2016-04-14 10:57:37 +08:00 |
cxt
|
76cfa83666
|
微信模板消息接口
|
2016-04-14 10:47:53 +08:00 |
huang
|
ef28266225
|
曲线颜色
|
2016-04-14 10:37:38 +08:00 |
huang
|
acf4e15f09
|
统计数左侧刷新
|
2016-04-14 10:26:25 +08:00 |
huang
|
12efc10759
|
图标曲线 总变更为+
|
2016-04-14 10:10:31 +08:00 |
txz
|
13576ca477
|
app.js
|
2016-04-14 09:43:43 +08:00 |
huang
|
adf6cca435
|
完成代码行数的提交和统计
|
2016-04-13 20:39:20 +08:00 |
cxt
|
f97699037b
|
冲突解决
|
2016-04-13 16:58:44 +08:00 |
cxt
|
2befcd6634
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-04-13 16:52:52 +08:00 |