huang
|
2e81633308
|
TPM TPi权限控制
|
2017-02-24 14:46:29 +08:00 |
huang
|
d76e34889a
|
task不重复执行
|
2017-02-24 13:42:58 +08:00 |
huang
|
30c14c2e07
|
任务启动回调逻辑控制
|
2017-02-24 12:30:36 +08:00 |
huang
|
6e9ef8ee12
|
Merge branch 'develop' into dev_raining
Conflicts:
app/controllers/repositories_controller.rb
app/views/layouts/_base_project_top.html.erb
|
2017-02-24 10:26:22 +08:00 |
huang
|
7074cbdba6
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-23 17:24:12 +08:00 |
huang
|
019ce762f8
|
针对实训子项目,一些权限修改
|
2017-02-23 17:23:52 +08:00 |
daiao
|
75f1fc964a
|
实训任务项目动态展开更多与收起回复功能
|
2017-02-23 17:09:22 +08:00 |
huang
|
705f94428e
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-23 16:18:16 +08:00 |
huang
|
49f63992d8
|
任务开启的时候权限控制
|
2017-02-23 16:17:37 +08:00 |
daiao
|
1e56a69eed
|
动态消息的实训动态添加回复/二级回复功能
|
2017-02-23 16:12:29 +08:00 |
huang
|
6f06fde7dc
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-23 14:13:47 +08:00 |
huang
|
727a6fd536
|
实训项目一些封装
|
2017-02-23 14:13:25 +08:00 |
daiao
|
31d852cd60
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-23 13:40:07 +08:00 |
daiao
|
6d14cb131a
|
问吧右下角贴吧排序按照帖子发布数和回帖数之和排序
|
2017-02-23 13:39:44 +08:00 |
huang
|
9a3793ffa9
|
完成training_task 编辑功能
|
2017-02-23 10:45:28 +08:00 |
huang
|
04edefac8b
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-23 09:47:39 +08:00 |
huang
|
ac77c26c50
|
task写入项目动态中
|
2017-02-23 09:47:15 +08:00 |
daiao
|
8d51e896fa
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-23 09:32:36 +08:00 |
daiao
|
fa7b15db47
|
注册成功提示页与账号未激活提示页,增加‘更换邮箱的功能’
|
2017-02-23 09:32:13 +08:00 |
huang
|
006608dca8
|
修改参数名
|
2017-02-22 16:30:16 +08:00 |
huang
|
b08a8e8050
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-22 15:52:05 +08:00 |
huang
|
eeba0c362d
|
实训项目一些ajax控制
|
2017-02-22 15:49:37 +08:00 |
huang
|
3f105cefe7
|
版本库访问权限控制清理
|
2017-02-22 12:33:45 +08:00 |
huang
|
0629b31e53
|
解决部分项目(比如:594)切换版本库分支500问题
|
2017-02-22 10:14:04 +08:00 |
daiao
|
06306e0214
|
实训项目叠层回复功能
|
2017-02-22 10:08:05 +08:00 |
huang
|
96aa9b7261
|
实训项目一些调整,api和结构
|
2017-02-22 08:54:38 +08:00 |
daiao
|
4a925201eb
|
实训任务增加二级回复功能
|
2017-02-21 17:23:44 +08:00 |
daiao
|
43c990c0a9
|
二级回复功能(回复未刷新)
|
2017-02-21 16:24:30 +08:00 |
huang
|
e6deabadba
|
后台作业列表添加编程作业过滤
|
2017-02-21 14:45:18 +08:00 |
daiao
|
818d7ad2ef
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-21 14:38:32 +08:00 |
daiao
|
544432adce
|
实训任务详情页面的一级回复功能
|
2017-02-21 14:38:05 +08:00 |
huang
|
f59243ab9f
|
实训api改进及一些提醒
|
2017-02-21 14:34:17 +08:00 |
huang
|
8063932500
|
fork项目的时候一并forkmodule
|
2017-02-20 14:23:02 +08:00 |
huang
|
336c28ccdb
|
实训项目权限控制
|
2017-02-20 12:33:27 +08:00 |
huang
|
e5cfc7280b
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-19 17:50:17 +08:00 |
huang
|
8d1987567e
|
实训项目相关模块相关api的开发
|
2017-02-19 17:49:58 +08:00 |
daiao
|
2aa025cf32
|
实训项目新建页面样式调整
|
2017-02-19 15:17:46 +08:00 |
huang
|
82c6799953
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
Conflicts:
db/schema.rb
|
2017-02-19 14:40:27 +08:00 |
huang
|
df66e6d60c
|
启动任务相关接口
|
2017-02-19 14:39:15 +08:00 |
daiao
|
77f58d76a5
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into develop
# Conflicts:
# db/schema.rb
|
2017-02-19 09:21:55 +08:00 |
huang
|
a43c5cdb2f
|
启动实训Api等
|
2017-02-18 17:44:50 +08:00 |
huang
|
d4eb4c0d56
|
实训任务模块
|
2017-02-17 19:29:00 +08:00 |
cxt
|
c6ae00c6be
|
作品列表出现重复的数据
|
2017-02-17 18:54:15 +08:00 |
cxt
|
24f766d0a5
|
更换管理员发送微信模板消息
|
2017-02-17 16:19:49 +08:00 |
cxt
|
c1301bbd7d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-02-17 15:02:24 +08:00 |
cxt
|
b81d9b86c4
|
班级的配置页面,管理员增加“更换管理员”功能
|
2017-02-17 15:00:14 +08:00 |
daiao
|
2c42a51195
|
平台管理员的首页报500
|
2017-02-17 09:00:35 +08:00 |
daiao
|
cb5548c853
|
博客回复发送的消息,点击之后没有自动更新为已读
|
2017-02-16 15:18:35 +08:00 |
daiao
|
9af54a9288
|
我发布的issue列表,标题没有居中对齐,视觉上有错位
|
2017-02-16 14:09:15 +08:00 |
daiao
|
2cad08614f
|
系统发出的加入班级\项目\竞赛消息通知,点击后自动变为已读(并优化消息代码结构)
|
2017-02-15 10:54:09 +08:00 |