 daiao
|
ffce6f074f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-02 16:19:42 +08:00 |
|
daiao
|
b48fc7ba3b
|
pullrequest发送消息
|
2016-12-02 16:18:31 +08:00 |
 黄井泉
|
42775a82f9
|
Merge branch 'cxt_course' into 'develop'
班级作业增加设置选项：成绩公开范围
See merge request !37
|
2016-12-02 14:53:55 +08:00 |
|
黄井泉
|
ef86b6da2a
|
Merge branch 'develop' into 'develop'
项目提交动态的方法优化，及多个样式调整风格一致
See merge request !38
|
2016-12-02 14:47:25 +08:00 |
|
黄井泉
|
9a83b81269
|
Merge branch 'develop' into 'develop'
项目没有数据的页面调整为新版；项目3类成员页面调整；组织列表新增新建功能；issue显示加长;
项目没有数据的页面调整为新版；项目3类成员页面调整；组织列表新增新建功能；issue显示加长;
See merge request !35
|
2016-12-02 13:36:25 +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 |
|
daiao
|
7e5fda197e
|
组织列表增加新建组织按钮，并将我的issue与issue列表的issue标题显示加长
|
2016-12-02 10:21:56 +08:00 |
|
陈晓婷
|
39258f4ac5
|
Merge branch 'develop' into 'develop'
课程相关bug修复；叠层回复的“回复”、“赞”的显隐
See merge request !32
|
2016-12-02 10:14:07 +08:00 |
|
daiao
|
7a8c937173
|
项目issue列表，讨论区，版本库，pullrequests，里程碑及其里程碑详情页面，数据为空时，页面调整
|
2016-12-01 17:29:14 +08:00 |
|
daiao
|
c745f69e95
|
项目成员列表，fork列表，关注列表样式调整。并修改小铃铛消息的班级加入的申请文字
|
2016-12-01 15:44:15 +08:00 |
|
daiao
|
eeb57401d9
|
优化消息列表代码
|
2016-12-01 14:40:58 +08:00 |
|
daiao
|
c960b401f6
|
修复消息列表为匿名用户
|
2016-12-01 14:16:36 +08:00 |
|
daiao
|
233ce0428b
|
消息列表改为用户名
|
2016-12-01 13:55:15 +08:00 |
|
daiao
|
2e5cd96bb9
|
pullrequest发送消息
|
2016-12-01 11:31:48 +08:00 |
|
daiao
|
2cee4448ea
|
pullrequest消息通知（未完）
|
2016-11-29 18:19:29 +08:00 |
|
daiao
|
ea30873665
|
创建，或关闭PullRequest时，发送消息（未完）
|
2016-11-29 17:02:36 +08:00 |
|
cxt
|
4814c1db3d
|
叠层中的回复、赞的显隐
|
2016-11-29 15:29:30 +08:00 |
|
daiao
|
b2de81394e
|
项目PullRequest列表，显示创建者的名字
|
2016-11-29 14:44:28 +08:00 |
|
daiao
|
e4d43cc163
|
项目pull request 项目消息框架搭建
|
2016-11-29 12:25:15 +08:00 |
|
cxt
|
3f35b7f806
|
贴吧回复改版
|
2016-11-29 09:36:38 +08:00 |
|
daiao
|
f359b26344
|
我的issue导出excel功能
|
2016-11-28 16:50:09 +08:00 |
|
daiao
|
2cbc7bca33
|
我的Issue导出功能
|
2016-11-28 16:11:52 +08:00 |
|
daiao
|
2c664dcd21
|
我的issue导出功能（未完）
|
2016-11-28 15:32:02 +08:00 |
|
daiao
|
2a768cbd49
|
Innov用户消息通知报500，并将Pull request的登录名改为姓名
|
2016-11-28 11:32:28 +08:00 |
|
cxt
|
e202a7b99c
|
二级回复
|
2016-11-25 20:13:01 +08:00 |
|
cxt
|
c965f72ce3
|
还原回复的隐藏
|
2016-11-25 19:19:38 +08:00 |
|
cxt
|
9115020a43
|
匿评状态调整
|
2016-11-25 18:40:04 +08:00 |
|
cxt
|
8a52e136cf
|
点击展开回复
|
2016-11-25 18:01:50 +08:00 |
|
cxt
|
785f027a63
|
Merge branch 'cxt_course' into develop
|
2016-11-25 14:56:24 +08:00 |
|
cxt
|
88c4a26303
|
Merge branch 'cxt_course' into develop
|
2016-11-25 14:03:01 +08:00 |
|
cxt
|
a614b4eb93
|
班级的讨论区列表与通知列表、项目的讨论区列表、博客列表：显示请微调
|
2016-11-25 11:25:04 +08:00 |
|
cxt
|
8743460134
|
动态与详情的回复叠层调整
|
2016-11-25 09:59:03 +08:00 |
 yuanke
|
d28f597aed
|
Merge branch 'develop' into yuanke_youhua
|
2016-11-24 10:53:41 +08:00 |
|
yuanke
|
86da6a0fe7
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-24 10:53:22 +08:00 |
|
cxt
|
f6034b56f0
|
作业的提交截止时间一直显示
|
2016-11-24 09:53:36 +08:00 |
|
cxt
|
eeacd76aa9
|
首页班级列表的归档
|
2016-11-22 10:27:56 +08:00 |
|
cxt
|
4388b7625e
|
首页班级列表的归档
|
2016-11-21 16:58:25 +08:00 |
|
daiao
|
e585687e9c
|
铃铛消息，将登录名改为用户姓名，并将部分没有链接的加链接
|
2016-11-21 16:30:37 +08:00 |
|
daiao
|
c31287f2f5
|
temp用户，铃铛消息报500，并修改点击名称进个人主页（目前申请类消息点击进自己主页）
|
2016-11-21 15:21:51 +08:00 |
|
yuanke
|
3099b37f5e
|
个人主页关注BUG修改
|
2016-11-21 12:07:14 +08:00 |
|
yuanke
|
6cb711d66b
|
Merge branch 'develop' into yuanke_youhua
|
2016-11-21 10:14:08 +08:00 |
|
yuanke
|
14552abd56
|
博客人气排序修改，个人主页关注BUG修改
|
2016-11-21 10:08:27 +08:00 |
|
daiao
|
f9a384b253
|
Merge branch 'dai_ao' into develop
|
2016-11-18 19:18:36 +08:00 |
|
daiao
|
286422e1c5
|
我的issue样式调整
|
2016-11-18 19:17:35 +08:00 |
|
cxt
|
003c6a7551
|
新建作业初始显示调整
|
2016-11-18 18:37:41 +08:00 |
|
daiao
|
f91722a422
|
我的issue样式调整
|
2016-11-18 17:46:51 +08:00 |
|
cxt
|
20465ef281
|
导航栏题库“发送”后的提示弹框丢失了
|
2016-11-18 17:37:25 +08:00 |
|
huang
|
de61d699a8
|
Merge branch 'dev_newproject' into develop
|
2016-11-18 16:22:03 +08:00 |
|
daiao
|
290a301cee
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/css/common.css
|
2016-11-18 15:48:40 +08:00 |