 cxt
|
44b3f6019c
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-23 21:44:20 +08:00 |
|
cxt
|
86bd5b97b1
|
竞赛头部调整
|
2016-12-23 21:44:03 +08:00 |
 huang
|
41312d82c5
|
竞赛动态中通知回复及删除局部刷新
|
2016-12-23 21:23:07 +08:00 |
|
huang
|
b563b170bd
|
竞赛动态新闻
|
2016-12-23 21:13:40 +08:00 |
|
huang
|
69bacc1f6e
|
base添加竞赛入口
|
2016-12-23 20:27:16 +08:00 |
|
huang
|
854de1fae6
|
新建竞赛通知发送消息， 及竞赛通知删除
|
2016-12-23 20:19:17 +08:00 |
|
huang
|
2c97f12538
|
竞赛编辑功能
|
2016-12-23 19:56:00 +08:00 |
|
huang
|
bc5846c2d6
|
竞赛通知 详情页面完成
|
2016-12-23 19:48:39 +08:00 |
|
huang
|
43bb3fe4eb
|
完成竞赛通知 列表页面
|
2016-12-23 19:35:02 +08:00 |
|
huang
|
c98a8b5113
|
竞赛通知新建
|
2016-12-23 19:08:13 +08:00 |
|
huang
|
345d8b5045
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-12-23 17:00:37 +08:00 |
|
huang
|
0877aae0d6
|
竞赛通知 index方法
|
2016-12-23 17:00:11 +08:00 |
|
cxt
|
a03c0f68c2
|
提交作品
|
2016-12-23 16:58:50 +08:00 |
|
cxt
|
544702e11f
|
新建题目
|
2016-12-23 14:41:21 +08:00 |
|
cxt
|
5a27b84e97
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-22 17:13:25 +08:00 |
|
cxt
|
9331525304
|
竞赛消息的调整
|
2016-12-22 17:13:10 +08:00 |
|
huang
|
3406d4ba0d
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-12-22 17:11:15 +08:00 |
|
huang
|
9f0b17424d
|
竞赛配置样式调整
|
2016-12-22 17:10:40 +08:00 |
|
huang
|
f37c292e99
|
添加成员
|
2016-12-22 17:02:54 +08:00 |
|
huang
|
b74c034237
|
项目配置添加ke编辑 base中去掉配置
|
2016-12-22 16:39:54 +08:00 |
|
cxt
|
c4927070a0
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-22 16:05:12 +08:00 |
|
huang
|
eb7ecd4143
|
竞赛配置功能
|
2016-12-22 16:03:58 +08:00 |
|
cxt
|
346dc069ef
|
加入竞赛的消息通知
|
2016-12-22 16:02:36 +08:00 |
|
huang
|
0d00b6ca74
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-12-22 15:17:54 +08:00 |
|
huang
|
037e717937
|
竞赛邀请码 竞赛settings（部分）
|
2016-12-22 15:17:02 +08:00 |
|
cxt
|
cf8725f2ee
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-22 15:08:49 +08:00 |
|
cxt
|
4c5a2aa40b
|
加入竞赛
|
2016-12-22 15:08:15 +08:00 |
|
huang
|
55e1b0d8f2
|
settings 路由， 组织管理员、裁判、参赛人员方法封装
|
2016-12-22 14:50:26 +08:00 |
|
huang
|
01d9fbbef3
|
组织base框架
|
2016-12-22 14:47:42 +08:00 |
|
cxt
|
1d23b2cf65
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-22 11:19:59 +08:00 |
|
cxt
|
fddcbe2a56
|
新建竞赛
|
2016-12-22 11:17:13 +08:00 |
|
cxt
|
159f0b294f
|
Merge branch 'develop' into cxt_course
|
2016-12-22 10:11:47 +08:00 |
|
cxt
|
5242e12373
|
竞赛框架搭建
|
2016-12-22 10:01:37 +08:00 |
|
黄井泉
|
426ee0a26c
|
Merge branch 'develop' into 'develop'
个人主页课程、项目链接修改
See merge request !79
|
2016-12-19 12:22:44 +08:00 |
|
huang
|
3bf6c35d0e
|
我(Ta)的主页 课程、项目链接修改
|
2016-12-19 11:33:14 +08:00 |
|
黄井泉
|
b74ddd8348
|
Merge branch 'develop' into 'develop'
message数据重复问题
See merge request !78
|
2016-12-19 11:08:29 +08:00 |
|
huang
|
711f234148
|
message 中重复发消息问题
|
2016-12-19 11:06:45 +08:00 |
|
黄井泉
|
38659fc5a9
|
Merge branch 'develop' into 'develop'
message 的delay job发送方式优化
See merge request !77
|
2016-12-19 10:27:45 +08:00 |
|
huang
|
cb33bec7db
|
讨论区发帖delay 模式优化
|
2016-12-19 10:24:36 +08:00 |
|
huang
|
9a6a4a5203
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-19 09:55:07 +08:00 |
|
huang
|
7a8eb84806
|
Merge branch 'guange_dev' into develop
|
2016-12-18 18:52:47 +08:00 |
 guange
|
34f8450885
|
ids为空时不需要执行
|
2016-12-18 18:29:24 +08:00 |
|
guange
|
d34ed4b744
|
切分一下，解决delayed_job卡死问题。
|
2016-12-18 18:25:14 +08:00 |
|
guange
|
d7155afbe5
|
切分一下，解决delayed_job卡死问题。
|
2016-12-18 18:17:39 +08:00 |
|
guange
|
6ef7a15a5b
|
设置只读不需要放到delayed_job
|
2016-12-18 12:28:56 +08:00 |
|
陈晓婷
|
73de078c58
|
Merge branch 'cxt_course' into 'develop'
消息列表报500
See merge request !76
|
2016-12-17 18:03:28 +08:00 |
|
cxt
|
35dfdeea98
|
消息报500
|
2016-12-17 18:01:08 +08:00 |
|
cxt
|
fc6d2f1155
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-12-17 17:59:05 +08:00 |
|
cxt
|
c444096a04
|
消息列表报500
|
2016-12-17 17:58:31 +08:00 |
|
陈晓婷
|
7d2bcaada3
|
Merge branch 'develop' into 'develop'
项目社区、课程社区点击我的动态错误，新建用户个人主页显示错误
项目社区、课程社区点击我的动态错误，新建用户个人主页显示错误
See merge request !75
|
2016-12-17 17:10:09 +08:00 |