 cxt
|
076c241d10
|
实训
|
2017-04-01 10:55:46 +08:00 |
|
cxt
|
e3150716f3
|
Merge branch 'dev_bigdata' into dev_shixun_project
Conflicts:
app/views/layouts/_footer.html.erb
app/views/layouts/base_contest_community.html.erb
app/views/layouts/base_contests.html.erb
app/views/layouts/base_course_community.html.erb
app/views/layouts/base_courses.html.erb
app/views/layouts/base_project_community.html.erb
app/views/layouts/new_base.html.erb
app/views/layouts/new_base_user.html.erb
db/schema.rb
public/stylesheets/css/structure.css
public/stylesheets/font/FontAwesome.otf
public/stylesheets/font/fontawesome-webfont.eot
public/stylesheets/font/fontawesome-webfont.svg
public/stylesheets/font/fontawesome-webfont.ttf
public/stylesheets/font/fontawesome-webfont.woff
public/stylesheets/font2/FontAwesome.otf
public/stylesheets/font2/fontawesome-webfont.eot
public/stylesheets/font2/fontawesome-webfont.svg
public/stylesheets/font2/fontawesome-webfont.ttf
public/stylesheets/font2/fontawesome-webfont.woff
public/stylesheets/fonts/FontAwesome.otf
public/stylesheets/fonts/fontawesome-webfont.eot
public/stylesheets/fonts/fontawesome-webfont.svg
public/stylesheets/fonts/fontawesome-webfont.ttf
public/stylesheets/fonts/fontawesome-webfont.woff
|
2017-03-24 16:17:01 +08:00 |
|
cxt
|
324d14ee92
|
新版登录和注册
|
2017-03-24 16:05:52 +08:00 |
 huang
|
3231f96b5f
|
完成首次进入展示代码功能
|
2017-03-24 15:31:16 +08:00 |
|
huang
|
62ab862516
|
tpm权限控制
及index一些统计
|
2017-03-23 17:41:32 +08:00 |
|
huang
|
1eb0cf06e5
|
实训版本库公开
|
2017-03-23 16:44:14 +08:00 |
|
huang
|
56da0352b1
|
版本库添加编辑功能
|
2017-03-21 08:56:00 +08:00 |
|
cxt
|
6cfd5d6dbd
|
头像上传调整
|
2017-03-17 17:40:26 +08:00 |
|
huang
|
5992bcc128
|
版本库文件局部刷新
|
2017-03-14 14:56:08 +08:00 |
|
huang
|
63881869f6
|
game局部显示版本库路由及相关action
|
2017-03-13 17:39:27 +08:00 |
 guange
|
981a191b05
|
短信发送测试通过
|
2017-03-13 11:40:07 +08:00 |
|
huang
|
fbc52a7892
|
games模块相关功能
|
2017-03-13 09:00:13 +08:00 |
|
guange
|
606e431396
|
集成云片的短信发送功能
|
2017-03-12 16:53:47 +08:00 |
|
huang
|
dd31a55bdd
|
Merge branch 'develop' into dev_shixun_project
Conflicts:
db/schema.rb
|
2017-03-07 09:32:40 +08:00 |
|
huang
|
ca118e2bef
|
版本库分离
|
2017-03-06 14:56:34 +08:00 |
|
huang
|
8d54187e04
|
周五内容
|
2017-03-03 18:49:56 +08:00 |
|
cxt
|
f30507b6f0
|
在线测验改版
|
2017-03-03 14:43:51 +08:00 |
|
cxt
|
099fcde246
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2017-02-24 15:20:34 +08:00 |
|
cxt
|
cee2569796
|
作业定时发布的任务调整
|
2017-02-24 11:05:27 +08:00 |
|
huang
|
a43c5cdb2f
|
启动实训Api等
|
2017-02-18 17:44:50 +08:00 |
|
huang
|
d4eb4c0d56
|
实训任务模块
|
2017-02-17 19:29:00 +08:00 |
|
cxt
|
9351af6819
|
资源定时发布的rake任务修改
|
2017-02-10 17:11:56 +08:00 |
|
cxt
|
e4ebd4dd2c
|
班级的统计模块显示“活跃度”、“英雄榜”、“项目活跃度”(单个作业的过滤未完成)
|
2017-02-10 14:35:43 +08:00 |
|
guange
|
3146342586
|
merge
|
2017-01-18 00:18:58 +08:00 |
|
guange
|
6d1503f3bd
|
issue 11269 性能问题，从12秒到6秒多，还有优化空间
|
2017-01-18 00:17:41 +08:00 |
|
cxt
|
231fa56c49
|
管理员界面增加竞赛列表
|
2017-01-11 16:45:41 +08:00 |
|
cxt
|
cc4d46c3ee
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/css/common.css
|
2017-01-06 15:06:22 +08:00 |
|
guange
|
29dda04a2d
|
变量统一
|
2017-01-06 14:52:47 +08:00 |
|
guange
|
e369a45478
|
大于200M附件提示
|
2017-01-06 11:30:54 +08:00 |
|
guange
|
09356b593c
|
提供手工打包zip的命令
|
2017-01-06 10:47:25 +08:00 |
|
guange
|
db707dd408
|
提供手工打包zip的命令
|
2017-01-06 10:27:41 +08:00 |
|
cxt
|
1fce3e7778
|
在线评审启动失败发消息
|
2017-01-05 19:12:31 +08:00 |
|
cxt
|
9f62c3d22a
|
竞赛相关消息通知的完善
|
2017-01-04 15:53:36 +08:00 |
|
cxt
|
57e2ab9ff1
|
竞赛作品的在线评审分布
|
2016-12-30 19:35:43 +08:00 |
|
cxt
|
b92bb88985
|
匿评的rake
|
2016-12-30 17:25:44 +08:00 |
|
cxt
|
73350e34f1
|
竞赛作品的相关设置
|
2016-12-30 10:30:21 +08:00 |
|
cxt
|
bdd2a60d00
|
竞赛：加入竞赛、发布竞赛、发布通知等的消息
|
2016-12-28 11:30:31 +08:00 |
|
cxt
|
e22e1caaed
|
bug修复
|
2016-12-24 18:48:50 +08:00 |
 daiao
|
e86bd6728e
|
Merge branch 'cxt_course' into develop
Conflicts:
app/controllers/users_controller.rb
app/helpers/application_helper.rb
app/views/users/_user_activities.html.erb
db/schema.rb
|
2016-12-24 16:48:48 +08:00 |
|
huang
|
0877aae0d6
|
竞赛通知 index方法
|
2016-12-23 17:00:11 +08:00 |
|
huang
|
37f1aa1442
|
邮件相关改进
|
2016-12-23 14:29:48 +08:00 |
|
huang
|
5527adb795
|
版本406异常处理，pull request 冲突接受后406异常提醒
|
2016-12-15 17:03:59 +08:00 |
 siteen
|
be1fc144da
|
rake 任务异常跳过
|
2016-12-14 13:32:25 +08:00 |
|
siteen
|
5f56edda15
|
rake 任务异常处理
|
2016-12-14 10:28:14 +08:00 |
|
siteen
|
1561a1176a
|
修改rake 任务获取gitlab roles方法
|
2016-12-14 10:22:49 +08:00 |
|
siteen
|
f82ea16102
|
版本库数据同步任务
|
2016-12-14 10:08:41 +08:00 |
|
siteen
|
413efa8d02
|
gitlab数据同步一致性任务
|
2016-12-13 17:21:58 +08:00 |
|
黄井泉
|
b8eee2b131
|
Merge branch 'cxt_course' into 'develop'
本周上线任务
See merge request !50
|
2016-12-09 16:43:00 +08:00 |
|
huang
|
d98b1e17cc
|
Gitlab提供搜索接口，commit 关联提供搜索功能及局部刷新
|
2016-12-08 16:36:11 +08:00 |
|
cxt
|
c24f9b8c3b
|
作业的小齿轮菜单增加“启用匿评”的选项，同时更新“禁用匿评”的提示信息、禁用匿评的作业截止后也可以编辑“是否启用匿评”
|
2016-12-07 17:23:52 +08:00 |