 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 |
 cxt
|
de9f5131b6
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-24 16:30:30 +08:00 |
|
daiao
|
84d5b5bc4a
|
竞赛列表
|
2016-12-24 16:29:53 +08:00 |
|
cxt
|
9af9945cb4
|
竞赛
|
2016-12-24 16:29:10 +08:00 |
 huang
|
87c134c007
|
登录名能修改
|
2016-12-24 11:16:33 +08:00 |
|
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 |
|
daiao
|
110bbd6c3b
|
issue 动态样式宽度
|
2016-12-23 21:34:21 +08:00 |
|
huang
|
41312d82c5
|
竞赛动态中通知回复及删除局部刷新
|
2016-12-23 21:23:07 +08:00 |
|
huang
|
b563b170bd
|
竞赛动态新闻
|
2016-12-23 21:13:40 +08:00 |
|
daiao
|
dbd8802b9c
|
项目动态内容样式调整，重发邮件调整
|
2016-12-23 21:11:39 +08:00 |
|
daiao
|
0ce62b9e8c
|
关联commit数据为空时，显示调整
|
2016-12-23 20:34:23 +08:00 |
|
huang
|
69bacc1f6e
|
base添加竞赛入口
|
2016-12-23 20:27:16 +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 |
|
daiao
|
1c868e5f12
|
Issue统计过滤条件样式调整。管理员帖子界面点击跳新页面
|
2016-12-23 18:42:44 +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 |
|
daiao
|
283f8035b9
|
邮件激活页面，点击“重新获取验证码”时间间隔设置为60秒，并调整按钮样式
|
2016-12-23 16:57:32 +08:00 |
|
daiao
|
c3465537b5
|
pullrequest列表，点击跳新页面
|
2016-12-23 15:41:52 +08:00 |
|
daiao
|
d10a12fadd
|
邮箱激活页面调整
|
2016-12-23 15:30:39 +08:00 |
|
cxt
|
544702e11f
|
新建题目
|
2016-12-23 14:41:21 +08:00 |
|
黄井泉
|
4125c1b44a
|
Merge branch 'develop' into 'develop'
issue详情页面一、二级回复、一级删除局部刷新
See merge request !80
|
2016-12-23 14:35:51 +08:00 |
|
daiao
|
fd97d8b421
|
课程社区的首页动态，加入班级资源库动态
|
2016-12-23 14:03:43 +08:00 |
|
daiao
|
1f10a75150
|
项目社区首页，点击动态选项“论坛动态”报500问题
|
2016-12-23 11:12:05 +08:00 |
|
huang
|
244303f0e4
|
课程问卷 其它选项如果过多的时候默认显示， 添加“隐藏”和“显示”按钮
|
2016-12-23 10:54:19 +08:00 |
|
daiao
|
a40b7f6fd0
|
申请项目，申请人接受到的消息调整为：申请人头像+申请姓名+消息
|
2016-12-23 09:34:23 +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 |
|
daiao
|
b4d4fa4e28
|
待办任务的所有列表页，首列加上发布人的头像
|
2016-12-22 14:49:19 +08:00 |
|
huang
|
01d9fbbef3
|
组织base框架
|
2016-12-22 14:47:42 +08:00 |
|
daiao
|
884a201953
|
项目加入申请，被审批后，其他管理员的消息显示加入操作人姓名（并将提示弹框改为新版）
|
2016-12-22 13:48:03 +08:00 |
|
cxt
|
5242e12373
|
竞赛框架搭建
|
2016-12-22 10:01:37 +08:00 |
|
daiao
|
c42861c8b5
|
个人主页，待办任务数字实时刷新
|
2016-12-21 17:27:53 +08:00 |
|
daiao
|
97148ae172
|
个人首页左侧导航栏的字体样式调整
|
2016-12-21 16:20:50 +08:00 |
|
daiao
|
63bad2383b
|
首页左侧导航栏课程，项目，我发布的issue等数字样式调整
|
2016-12-21 11:03:38 +08:00 |