 huang
|
0a989daf31
|
Merge branch 'cxt_course' into develop
Conflicts:
app/helpers/application_helper.rb
public/stylesheets/courses.css
public/stylesheets/new_user.css
|
2016-05-06 18:12:08 +08:00 |
 cxt
|
10d26f89d9
|
作业列表的二级回复
|
2016-05-06 17:36:28 +08:00 |
|
huang
|
df1c70880a
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_homework_repository.html.erb
public/stylesheets/new_user.css
|
2016-05-06 12:22:43 +08:00 |
|
cxt
|
0fafbffa49
|
项目的更新加到作业的最后更新时间中
|
2016-05-06 08:52:54 +08:00 |
 guange
|
cc9825e6a2
|
将wechat放到项目里面
|
2016-04-26 10:50:54 +08:00 |
|
guange
|
744c04b54a
|
修改gem源
|
2016-04-24 22:20:29 +08:00 |
|
huang
|
ab8c1a0bad
|
Merge branch 'hjq_beidou' into develop
|
2016-04-21 16:21:39 +08:00 |
|
huang
|
cb2033c80f
|
去掉rake中输出
|
2016-04-21 16:20:29 +08:00 |
|
huang
|
81f8559c48
|
gitlab版本库成员同步任务
|
2016-04-21 16:04:00 +08:00 |
|
huang
|
adc17c5038
|
代码优化
文件目录动态获取接口
文件目录显示样式
|
2016-04-19 09:34:55 +08:00 |
|
huang
|
7259d607dc
|
Merge branch 'hjq_beidou' into develop
|
2016-04-18 15:38:11 +08:00 |
|
huang
|
41aa81f966
|
rake 任务：同步文件数
|
2016-04-18 14:44:29 +08:00 |
|
cxt
|
d948536a10
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-14 12:33:15 +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 |
|
yuanke
|
a8dce5e520
|
代码查重功能增加,管理员界面增加代码测试列表.
|
2016-04-14 11:29:22 +08:00 |
|
huang
|
f7cb451feb
|
gitlab版本库添加提交信息统计接口
|
2016-04-13 14:36:43 +08:00 |
|
huang
|
2162d7d4b8
|
组织banner上传功能
|
2016-04-06 10:40:38 +08:00 |
 alan
|
1f0f7708c6
|
fix pagination bug
|
2016-03-30 15:09:06 +08:00 |
|
alan
|
03d855f5d5
|
修改资源区分页问题
|
2016-03-29 15:46:13 +08:00 |
|
alan
|
395fb8fae6
|
修改pagination,资源区bug
|
2016-03-28 22:37:01 +08:00 |
|
yuanke
|
dea947e9ce
|
Merge branch 'develop' into yuanke
Conflicts:
db/schema.rb
public/javascripts/application.js
public/javascripts/homework.js
public/stylesheets/new_user.css
|
2016-03-25 14:58:17 +08:00 |
|
yuanke
|
a10830c90f
|
Merge branch 'develop' into yuanke
Conflicts:
public/stylesheets/new_user.css
|
2016-03-21 14:40:47 +08:00 |
|
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 |