 guange
|
59923dfb03
|
merge
|
2016-03-18 16:38:21 +08:00 |
 huang
|
7c624cd571
|
公共资源只包括公开资源
|
2016-03-14 16:35:18 +08:00 |
 cxt
|
7d2bb572b2
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
public/stylesheets/new_user.css
|
2016-03-11 19:43:36 +08:00 |
|
guange
|
24a278d7d6
|
加上atall
|
2016-03-11 18:50:37 +08:00 |
 linchun
|
8c145c9d39
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
2016-03-11 17:25:30 +08:00 |
 luoquan
|
1900a824e8
|
0
|
2016-03-11 14:39:17 +08:00 |
|
huang
|
a6c7766b00
|
修复部分用户不能删除的问题
|
2016-03-09 18:06:26 +08:00 |
|
linchun
|
3c66a29767
|
完善课程资源列表，完成项目资源列表
|
2016-03-08 11:01:08 +08:00 |
|
linchun
|
b7f4b584f2
|
完成管理员界面课程资源列表
|
2016-03-07 16:46:02 +08:00 |
|
linchun
|
bb8a6af13e
|
admin界面添加精品课程页面，目前该页面中的精品课程是固定的
|
2016-03-04 15:31:40 +08:00 |
|
huang
|
a10e973c75
|
版本库配置默认分支
|
2016-02-26 19:25:12 +08:00 |
|
huang
|
ed7183b1a9
|
0
|
2016-02-23 11:31:34 +08:00 |
|
huang
|
929afea196
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
2016-02-23 09:13:10 +08:00 |
|
huang
|
e62386ad65
|
版本局角色同步
|
2016-02-23 09:12:50 +08:00 |
|
cxt
|
6b4be999ee
|
资源的定时发布
|
2016-02-22 18:35:04 +08:00 |
|
guange
|
1f7bcbed20
|
处理导入题库标题中的换行字符
|
2016-02-02 21:28:52 +08:00 |
|
guange
|
eb3644a197
|
将一堆的rake命令变为一条
|
2016-02-02 19:16:15 +08:00 |
|
guange
|
609d98f8a3
|
执行task时没有代入环境变量
|
2016-02-02 16:33:08 +08:00 |
|
guange
|
ed2a3c976d
|
执行task时没有代入环境变量
|
2016-02-02 16:25:26 +08:00 |
|
cxt
|
184e0ee689
|
管理员界面增加项目、组织、课程、用户、作业个数的显示
|
2016-01-25 16:50:34 +08:00 |
|
huang
|
655cc0d2db
|
issue截止时间邮件通知
|
2016-01-22 20:26:44 +08:00 |
|
huang
|
59aa1e9c6f
|
issue截止修改
|
2016-01-22 09:55:58 +08:00 |
|
huang
|
024e299817
|
gitlab同步问题
|
2016-01-21 15:29:06 +08:00 |
|
huang
|
524e152b24
|
Issue截止时间到了邮件提醒
|
2016-01-21 11:19:08 +08:00 |
|
huang
|
500527a12d
|
gitlab同步问题
|
2016-01-12 10:42:25 +08:00 |
|
guange
|
1b177a8498
|
默认禁用自动高度
|
2016-01-05 11:55:30 +08:00 |
|
huang
|
1a549eda46
|
版本库显示问题
|
2015-12-21 14:33:28 +08:00 |
|
huang
|
ab1397d982
|
恢复版本
|
2015-12-21 13:53:22 +08:00 |
|
huang
|
3de4c7129a
|
版本库读取错误问题
|
2015-12-21 13:48:25 +08:00 |
|
huang
|
52adcb378d
|
注释任务
|
2015-12-18 21:29:25 +08:00 |
|
huang
|
dae6e68623
|
renwu
|
2015-12-18 20:46:17 +08:00 |
|
huang
|
747493993b
|
上线测试
|
2015-12-18 19:57:08 +08:00 |
|
huang
|
88cdb5a3ed
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/controllers/repositories_controller.rb
解决冲突
|
2015-12-18 17:08:26 +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
|
b65e84d166
|
未答测验的学生在测验截止时间到了后算作零分
|
2015-12-18 12:47:34 +08:00 |
|
guange
|
d703f75c98
|
merge
|
2015-12-18 09:23:52 +08:00 |
 houxiang
|
fc2eae4c62
|
add something by hx
|
2015-12-17 20:56:30 +08:00 |
|
huang
|
1dae37f613
|
添加commit总数 api
|
2015-12-17 18:28:12 +08:00 |
|
houxiang
|
0324282641
|
查询每个项目的各个成员中的提交贡献次数
|
2015-12-16 14:30:46 +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
|
bb2f49439e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2015-12-11 15:00:35 +08:00 |
|
cxt
|
27ed6df9d6
|
Merge branch 'szzh' into develop
|
2015-12-11 14:59:52 +08:00 |
|
cxt
|
a3715051b1
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-11 14:59:13 +08:00 |
|
cxt
|
f880ccd749
|
分组作业
|
2015-12-11 14:57:09 +08:00 |
|
huang
|
f2c1595d0d
|
1、同步没成功检测程序
2、注册验证修改
|
2015-12-09 16:57:12 +08:00 |
|
huang
|
da04607859
|
Merge branch 'gitlab_guange' of http://git.trustie.net/jacknudt/trustieforge into gitlab_guange
|
2015-12-08 16:53:56 +08:00 |
 lizanle
|
ef2ef7111c
|
添加对帖子的全文搜索
|
2015-12-07 14:31:05 +08:00 |
|
guange
|
af31946586
|
issue列表开启AT功能
|
2015-12-06 15:03:12 +08:00 |