 黄井泉
|
4125c1b44a
|
Merge branch 'develop' into 'develop'
issue详情页面一、二级回复、一级删除局部刷新
See merge request !80
|
2016-12-23 14:35:51 +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 |
|
daiao
|
884a201953
|
项目加入申请，被审批后，其他管理员的消息显示加入操作人姓名（并将提示弹框改为新版）
|
2016-12-22 13:48:03 +08:00 |
|
daiao
|
51f5bb6050
|
课程和项目的首页，在标签名称中显示
|
2016-12-21 10:29:54 +08:00 |
|
huang
|
ff34ec6de8
|
版本库下载 参数加密 gitlab添加解密功能
|
2016-12-20 16:33:26 +08:00 |
|
huang
|
611494ec93
|
系统消息只显示30天前的
|
2016-12-16 19:36:37 +08:00 |
|
huang
|
f71ccb6c67
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-16 16:30:25 +08:00 |
|
huang
|
c477d15fae
|
Merge branch 'dev_newproject' into develop
|
2016-12-16 16:13:26 +08:00 |
 cxt
|
bc16476646
|
首页待办任务个数的计算调整
|
2016-12-16 15:28:45 +08:00 |
|
huang
|
7f3b29830e
|
个人主页任务显示tip简化，及没有内容不显示
|
2016-12-16 14:21:51 +08:00 |
|
daiao
|
1ff1ed3c54
|
个人主页
|
2016-12-16 14:03:01 +08:00 |
|
huang
|
5b93bf2b4d
|
pull request中如果登录名在Trustie中不存在则有匿名改成登录名；匿名用户改成邮箱显示
|
2016-12-15 14:36:08 +08:00 |
|
daiao
|
0f328d36e1
|
代码改进
|
2016-12-12 10:00:05 +08:00 |
|
daiao
|
fb62d4f1b2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/css/project.css
|
2016-12-09 20:00:07 +08:00 |
|
黄井泉
|
b8eee2b131
|
Merge branch 'cxt_course' into 'develop'
本周上线任务
See merge request !50
|
2016-12-09 16:43:00 +08:00 |
|
daiao
|
224c0b686c
|
个人首页的课程社区
|
2016-12-08 09:59:22 +08:00 |
|
huang
|
a1a96e4667
|
issue编辑优化，性能简单优化
|
2016-12-08 09:55:41 +08:00 |
|
huang
|
122946804d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-12-08 09:36:36 +08:00 |
|
huang
|
c84d17bd6a
|
用户邮箱没注册时候显示用户邮箱方法封装
|
2016-12-08 09:36:01 +08:00 |
|
cxt
|
c24f9b8c3b
|
作业的小齿轮菜单增加“启用匿评”的选项，同时更新“禁用匿评”的提示信息、禁用匿评的作业截止后也可以编辑“是否启用匿评”
|
2016-12-07 17:23:52 +08:00 |
|
daiao
|
69d9228808
|
个人主页的消息页面
|
2016-12-07 15:13:51 +08:00 |
|
daiao
|
e6763c6d0c
|
用户消息铃铛样式调整
|
2016-12-07 09:00:33 +08:00 |
|
cxt
|
5a6e64beb2
|
Revert "测验头部和新建题目的改版"
This reverts commit c33bf1b163.
Conflicts:
public/stylesheets/css/courses.css
|
2016-12-06 15:02:32 +08:00 |
|
cxt
|
5bbe9e71ba
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into sx_cxt
Conflicts:
db/schema.rb
|
2016-12-06 14:12:40 +08:00 |
|
daiao
|
35fdf9a8a7
|
个人首页头部及其左侧导航(未完)
|
2016-12-06 09:36:13 +08:00 |
|
huang
|
66066e6899
|
commit导出方法及显示页面
|
2016-12-05 14:52:46 +08:00 |
|
huang
|
20e07bb1ba
|
学生列表得分显示
|
2016-12-03 10:56:35 +08:00 |
|
黄井泉
|
42775a82f9
|
Merge branch 'cxt_course' into 'develop'
班级作业增加设置选项：成绩公开范围
See merge request !37
|
2016-12-02 14:53:55 +08:00 |
|
cxt
|
2fd4cb9064
|
班级作业增加设置选项：成绩公开范围
|
2016-12-02 13:30:49 +08:00 |
|
daiao
|
77f252b538
|
Merge branch 'develop' into dai_ao
Conflicts:
app/controllers/pull_requests_controller.rb
app/views/users/_user_message_course.html.erb
app/views/users/_user_message_forge.html.erb
|
2016-12-02 13:26:41 +08:00 |
|
陈晓婷
|
39258f4ac5
|
Merge branch 'develop' into 'develop'
课程相关bug修复；叠层回复的“回复”、“赞”的显隐
See merge request !32
|
2016-12-02 10:14:07 +08:00 |
|
cxt
|
423018fa15
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-01 15:47:46 +08:00 |
|
cxt
|
c33bf1b163
|
测验头部和新建题目的改版
|
2016-12-01 15:42:07 +08:00 |
|
daiao
|
2e5cd96bb9
|
pullrequest发送消息
|
2016-12-01 11:31:48 +08:00 |
|
huang
|
dbc8c5811a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
Conflicts:
app/controllers/pull_requests_controller.rb
|
2016-11-30 09:55:45 +08:00 |
|
daiao
|
2cee4448ea
|
pullrequest消息通知（未完）
|
2016-11-29 18:19:29 +08:00 |
|
daiao
|
b2de81394e
|
项目PullRequest列表，显示创建者的名字
|
2016-11-29 14:44:28 +08:00 |
|
cxt
|
3f35b7f806
|
贴吧回复改版
|
2016-11-29 09:36:38 +08:00 |
|
huang
|
42e301659e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-28 09:24:29 +08:00 |
|
huang
|
ecf5101ef2
|
pull request 列表增加源项目/姓名 目标项目/姓名
|
2016-11-25 20:34:59 +08:00 |
|
cxt
|
e202a7b99c
|
二级回复
|
2016-11-25 20:13:01 +08:00 |
|
cxt
|
c965f72ce3
|
还原回复的隐藏
|
2016-11-25 19:19:38 +08:00 |
|
huang
|
872d8295e8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-25 17:51:30 +08:00 |
|
huang
|
9c12e774d1
|
pull request 文件内容正则修改
|
2016-11-25 17:50:37 +08:00 |
|
daiao
|
f1b6e67e50
|
项目头部样式修改，fork数目错误
|
2016-11-25 17:10:49 +08:00 |
|
cxt
|
785f027a63
|
Merge branch 'cxt_course' into develop
|
2016-11-25 14:56:24 +08:00 |
|
daiao
|
599d233176
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dai_ao
|
2016-11-25 10:49:57 +08:00 |
|
cxt
|
8743460134
|
动态与详情的回复叠层调整
|
2016-11-25 09:59:03 +08:00 |