 huang
|
53ecbdf8f0
|
issue详情中添加截止日期
|
2016-12-15 12:25:36 +08:00 |
|
huang
|
5facd08af6
|
issue新建和编辑样式调整
|
2016-12-15 12:24:57 +08:00 |
 cxt
|
ea6078ee5f
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-12-15 10:20:26 +08:00 |
|
cxt
|
d70b779c92
|
匿评申诉：评分设置
|
2016-12-15 10:19:16 +08:00 |
|
huang
|
75f2b013a6
|
个人主页未解决issue分页不能用问题
|
2016-12-15 09:40:41 +08:00 |
|
黄井泉
|
bf6bdc8c9e
|
Merge branch 'dev_newproject' into 'develop'
Pull Request冲突提醒及处理、Issue编辑跳详情问题、Issue编辑返回空白问题
See merge request !57
|
2016-12-15 09:28:05 +08:00 |
|
huang
|
79fc4b7752
|
Merge branch 'dai_ao' of https://git.trustie.net/jacknudt/trustieforge into dai_ao
Conflicts:
Gemfile
app/controllers/pull_requests_controller.rb
|
2016-12-15 09:26:24 +08:00 |
|
黄井泉
|
cc3f52a78c
|
Merge branch 'develop' into 'dai_ao'
个人主页（未完）
See merge request !59
|
2016-12-15 09:22:19 +08:00 |
 guange
|
6d272d2034
|
解决win10浏览器乱码问题
|
2016-12-15 09:19:15 +08:00 |
 daiao
|
ffd1e3942c
|
个人主页tab列表
|
2016-12-15 09:13:39 +08:00 |
|
huang
|
9b2781999c
|
commit 按钮样式调整
|
2016-12-14 17:04:52 +08:00 |
|
huang
|
e205a08573
|
issue commit 关联样式调整
|
2016-12-14 16:57:56 +08:00 |
|
huang
|
185e8957e6
|
student_works_scores_appeal model
|
2016-12-14 16:00:38 +08:00 |
|
huang
|
58a45e8f16
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-14 15:21:56 +08:00 |
 siteen
|
4e854776d1
|
issue详情右侧样式问题
|
2016-12-14 14:08:08 +08:00 |
|
cxt
|
23e1f2b3bd
|
作业匿评期间，小铃铛消息、作业动态以及作品详情的回复显示，暴露了评阅人或匿评对象的信息
|
2016-12-14 13:37:52 +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 |
|
daiao
|
0d4dc89c73
|
个人主页的tab的JS及其样式
|
2016-12-14 10:17:39 +08:00 |
|
siteen
|
f82ea16102
|
版本库数据同步任务
|
2016-12-14 10:08:41 +08:00 |
|
cxt
|
5ef8f19fbd
|
班级的归档提示不完整
|
2016-12-14 09:38:19 +08:00 |
|
cxt
|
8c1e2da2d3
|
新建个人主页的标题栏，去除输入例的说明
|
2016-12-14 09:16:50 +08:00 |
|
daiao
|
f124470af2
|
Merge branch 'develop' of https://git.trustie.net/daiao/trustieforge into develop
Conflicts:
app/views/users/show.html.erb
|
2016-12-13 17:30:09 +08:00 |
|
cxt
|
a8335f841d
|
提示修改
|
2016-12-13 17:26:44 +08:00 |
|
daiao
|
54687793ec
|
铃铛样式重新排版
|
2016-12-13 17:22:30 +08:00 |
|
siteen
|
413efa8d02
|
gitlab数据同步一致性任务
|
2016-12-13 17:21:58 +08:00 |
|
cxt
|
633c314a67
|
IE浏览器提交作品给出提示
|
2016-12-13 17:21:10 +08:00 |
|
cxt
|
ec476cbd74
|
班级头部的调整
|
2016-12-13 16:16:32 +08:00 |
|
huang
|
a2b7778de1
|
对齐
|
2016-12-13 14:22:15 +08:00 |
|
huang
|
17ae5e6e8d
|
编辑issue点击取消的时候空白问题
|
2016-12-13 14:02:58 +08:00 |
|
cxt
|
30dccdec90
|
个人首页的待匿评作品、待完成问卷
|
2016-12-13 13:57:25 +08:00 |
|
huang
|
0c8447ac83
|
多个地方的Issue编辑跳至详情页面问题
|
2016-12-13 13:51:08 +08:00 |
|
huang
|
6434644975
|
解决issue编辑跳到issue详情的问题
|
2016-12-13 13:42:33 +08:00 |
|
huang
|
49862a0be9
|
pull request合并代码冲突提示
|
2016-12-13 13:33:55 +08:00 |
|
cxt
|
203d98133a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-13 11:07:26 +08:00 |
|
cxt
|
90c3c33dd4
|
ke编辑的样式与显示样式不一致
|
2016-12-13 11:07:03 +08:00 |
|
guange
|
5074d61dba
|
修改个人信息中的邮箱去除
|
2016-12-13 11:04:31 +08:00 |
|
cxt
|
eaaca22e4d
|
老师给未提交的作品评语时不应变为已提交
|
2016-12-13 09:49:11 +08:00 |
|
cxt
|
9715cba687
|
用户待完成的测验、用户待完成的作业
|
2016-12-12 16:44:01 +08:00 |
|
daiao
|
120f65401b
|
Merge branch 'develop' of https://git.trustie.net/daiao/trustieforge into develop
|
2016-12-12 15:58:06 +08:00 |
|
cxt
|
93cf24cf41
|
首页消息提醒、消息动态样式
|
2016-12-12 15:57:26 +08:00 |
|
cxt
|
3402c011f8
|
班级左侧活跃度和英雄榜的“积分规则”字样去除
|
2016-12-12 13:52:18 +08:00 |
|
cxt
|
065900b02a
|
班级学生列表中、作品列表中点击姓名返回个人主页，建议是弹出新的tab页
|
2016-12-12 11:23:44 +08:00 |
|
huang
|
1e415624fc
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-12 10:55:36 +08:00 |
|
huang
|
6e67e4a5c7
|
0
|
2016-12-12 10:55:19 +08:00 |
|
huang
|
4ea8bbb64a
|
Revert "部分项目404问题"
This reverts commit 818e63386c.
|
2016-12-12 10:50:21 +08:00 |
|
huang
|
8dbe2b76ee
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-12 10:28:36 +08:00 |
|
huang
|
5445ae3f22
|
conflict
|
2016-12-12 10:28:20 +08:00 |
|
huang
|
7a106cdc9c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_new_user_message.html.erb
app/views/users/_no_data.html.erb
app/views/users/course_community.html.erb
app/views/users/course_community.js.erb
app/views/users/project_community.html.erb
app/views/users/project_community.js.erb
public/stylesheets/css/user.css
|
2016-12-12 10:11:12 +08:00 |