 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 |
|
cxt
|
2889353844
|
作品列表中的“未参与”增加tip：“该作品未被匿评”
|
2016-04-13 16:27:20 +08:00 |
|
cxt
|
062af3c57a
|
作业积分出现负分
|
2016-04-13 16:11:57 +08:00 |
|
huang
|
f9c4c4b86f
|
版本库不同分支之间的统计
|
2016-04-13 16:03:59 +08:00 |
|
cxt
|
42f960922a
|
个人主页的项目排序按更新时间排序
|
2016-04-13 15:39:05 +08:00 |
|
cxt
|
a21ea98b37
|
个人主页中的课程列表出现重复课程
|
2016-04-13 15:14:35 +08:00 |
|
cxt
|
f5122d7ef0
|
微信url切换到正式版
|
2016-04-13 14:52:18 +08:00 |
|
huang
|
426f5a76cc
|
提交列表中添加不分支的提交记录功能
|
2016-04-13 14:44:57 +08:00 |
|
huang
|
f7cb451feb
|
gitlab版本库添加提交信息统计接口
|
2016-04-13 14:36:43 +08:00 |
|
Tim
|
deda05b048
|
作业下拉选择
|
2016-04-13 14:23:24 +08:00 |
|
cxt
|
4d581d07b8
|
作业发布默认选中禁用匿评
|
2016-04-13 14:14:41 +08:00 |
|
cxt
|
fcd1684658
|
作业列表按更新时间排序 作业列表左上角添加作业的下拉列表
|
2016-04-13 11:20:38 +08:00 |
|
cxt
|
7fcd229f85
|
分组作业--作品列表中：点击关联的项目跳转至该项目主页
|
2016-04-13 10:09:54 +08:00 |
|
cxt
|
59f49f586b
|
上线测试版
|
2016-04-12 16:32:53 +08:00 |
|
cxt
|
a6f4b7f505
|
测试版
|
2016-04-12 16:23:52 +08:00 |
|
huang
|
04849659de
|
版本库统计
|
2016-04-12 16:00:54 +08:00 |
|
cxt
|
5a3b68816a
|
冲突
|
2016-04-12 15:57:18 +08:00 |
|
cxt
|
e420be8ee9
|
Merge branch 'weixin_guange' into develop
Conflicts:
app/models/blog_comment.rb
|
2016-04-12 15:56:08 +08:00 |
|
txz
|
38c182d76a
|
作业发布者真名为空时，显示昵称
|
2016-04-12 15:51:18 +08:00 |
|
cxt
|
70afbb3323
|
姓名的判断、
|
2016-04-12 15:46:56 +08:00 |
|
cxt
|
1882cd8f4f
|
用户姓名不显示
|
2016-04-12 15:42:59 +08:00 |
|
cxt
|
cb7834fa97
|
解决冲突
|
2016-04-12 15:14:55 +08:00 |
|
cxt
|
2898805aa7
|
回复的模板消息
|
2016-04-12 15:12:40 +08:00 |
|
txz
|
efca9c5d17
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-12 14:56:24 +08:00 |
|
txz
|
3665597153
|
详情页面排版调整
|
2016-04-12 14:56:17 +08:00 |
|
huang
|
dc0b7defa1
|
版本库show页面简化及注释
|
2016-04-12 11:10:30 +08:00 |
|
cxt
|
00d79f2ed0
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-12 11:00:56 +08:00 |
|
cxt
|
275895f805
|
模板消息的重构
|
2016-04-12 11:00:47 +08:00 |
|
txz
|
a6fcb072c0
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-11 15:11:12 +08:00 |