 cxt
|
88c4a26303
|
Merge branch 'cxt_course' into develop
|
2016-11-25 14:03:01 +08:00 |
|
cxt
|
faa894cb56
|
分组作业关联的项目若已删除则给出提示
|
2016-11-25 13:54:31 +08:00 |
|
cxt
|
3d63d2ae2c
|
老师反馈：学生列表中“导出列表”不显眼
|
2016-11-25 13:37:31 +08:00 |
 daiao
|
09506c0954
|
项目成员,关注成员，fork新页面
|
2016-11-25 12:17:27 +08:00 |
|
daiao
|
bff5a36577
|
pull request各种情况给出提示 项目顶头的fork信息弹出新页面及鼠标经过手型效果
|
2016-11-25 11:32:45 +08:00 |
|
cxt
|
a614b4eb93
|
班级的讨论区列表与通知列表、项目的讨论区列表、博客列表：显示请微调
|
2016-11-25 11:25:04 +08:00 |
|
cxt
|
8efcf876c6
|
班级删除成员后，隐藏对应作品记录历史数据迁移
|
2016-11-25 11:03:30 +08:00 |
 huang
|
c1ee387a66
|
Merge branch 'develop' into dai_ao
|
2016-11-25 10:54:05 +08:00 |
|
黄井泉
|
253768e73c
|
Merge branch 'dai_ao' into 'develop'
项目成员关注列表分页
See merge request !14
|
2016-11-25 10:52:15 +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 |
|
daiao
|
e6e4a320ee
|
项目关注列表
|
2016-11-25 10:47:48 +08:00 |
|
cxt
|
6a6dda2ec3
|
课程大纲：如图“归档”按钮显示换行了
|
2016-11-25 10:39:24 +08:00 |
|
huang
|
2f07aefd36
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-25 10:34:06 +08:00 |
|
huang
|
58790bcb72
|
版本库删除数据一致性 解决Gitlab本身bug，删除操作会报异常的问题
|
2016-11-25 10:31:03 +08:00 |
|
cxt
|
5c8d92ae4e
|
Merge branch 'develop' into cxt_course
|
2016-11-25 10:02:21 +08:00 |
|
cxt
|
8743460134
|
动态与详情的回复叠层调整
|
2016-11-25 09:59:03 +08:00 |
|
huang
|
89e9a309e3
|
Merge branch 'develop' into dai_ao
|
2016-11-25 09:11:36 +08:00 |
|
huang
|
30a0347cd6
|
项目头部修改，及其成员列表，关注列表新版样式（未完）
|
2016-11-24 17:40:33 +08:00 |
|
黄井泉
|
1736ada972
|
Merge branch 'yuanke_youhua' into 'develop'
项目简介单词不换行
项目简介单词不换行
See merge request !12
|
2016-11-24 16:47:50 +08:00 |
|
huang
|
abc6eafdb4
|
修复删除版本库功能
|
2016-11-24 16:04:29 +08:00 |
 yuanke
|
4fcddf743d
|
项目简介单词不换行修改
|
2016-11-24 15:15:52 +08:00 |
|
huang
|
45bbd7b293
|
pull request 选择项目的时候JS控制分支
|
2016-11-24 14:47:02 +08:00 |
|
黄井泉
|
57fd455c00
|
Merge branch 'yuanke_youhua' into 'develop'
个人留言列表优化
个人留言列表优化
See merge request !11
|
2016-11-24 14:37:14 +08:00 |
|
yuanke
|
891f966a66
|
Merge branch 'develop' into yuanke_youhua
|
2016-11-24 14:31:59 +08:00 |
|
yuanke
|
7713fba2f8
|
个人留言列表优化
|
2016-11-24 14:30:24 +08:00 |
|
黄井泉
|
0fd6ca1969
|
Merge branch 'yuanke_youhua' into 'develop'
上线问题合并
微信加网站地址，项目简介单词不换行，博客排序，个人主页关注BUG,autoUrl自动识别网址BUG修改，修改密码BUG修改等
See merge request !10
|
2016-11-24 11:02:58 +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 |
|
daiao
|
f7db47be41
|
Merge branch 'dai_ao' into develop
|
2016-11-24 10:45:43 +08:00 |
|
黄井泉
|
db18c3fd32
|
Merge branch 'develop' into 'develop'
版本库添加删除功能
See merge request !7
|
2016-11-24 10:40:55 +08:00 |
|
daiao
|
980ae78185
|
修改pull request发送源项目提示
|
2016-11-24 10:11:59 +08:00 |
|
daiao
|
5ed9d169f3
|
Merge branch 'develop' into dai_ao
|
2016-11-24 10:05:18 +08:00 |
|
cxt
|
f6034b56f0
|
作业的提交截止时间一直显示
|
2016-11-24 09:53:36 +08:00 |
|
daiao
|
1c0b4e99a8
|
项目配置，创建版本库提示字样式调整，和Pull Requests页面的tab点击样式调整
|
2016-11-24 09:47:10 +08:00 |
|
huang
|
42dee92c60
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-23 17:18:42 +08:00 |
|
daiao
|
61a3ffcbd0
|
项目issue统计显示顺序按任务量排序，调整total位置和样式并增加未指派一栏
|
2016-11-23 17:18:12 +08:00 |
|
huang
|
67a9d04a64
|
版本库添加删除功能
|
2016-11-23 17:14:49 +08:00 |
|
yuanke
|
2dc6171b48
|
微信反馈时的提示语加入www.trustie.net
|
2016-11-23 16:40:31 +08:00 |
|
yuanke
|
9720f84fce
|
js的自动转换URL函数autoUrl加上个异常处理
|
2016-11-23 13:29:02 +08:00 |
|
yuanke
|
82fa7600da
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-23 09:29:02 +08:00 |
|
yuanke
|
40c7afbc38
|
Merge branch 'yuanke_youhua' of https://git.trustie.net/jacknudt/trustieforge into yuanke_youhua
|
2016-11-23 09:28:04 +08:00 |
|
daiao
|
85f9f636a2
|
修复：里程碑关闭，编辑issue，里程碑被清空的情况
|
2016-11-22 16:51:16 +08:00 |
|
huang
|
bbf9ca075a
|
Merge branch 'develop' into dev_newproject
|
2016-11-22 16:18:30 +08:00 |
|
huang
|
fca68c24dc
|
pull_request合并到源项目的问题
|
2016-11-22 15:05:33 +08:00 |
|
daiao
|
196d3b31a1
|
为完 切换分支
|
2016-11-22 14:29:03 +08:00 |
|
cxt
|
f9d12758d4
|
班级分班：如图在某具体分班中，编辑某成员分班为“暂无”或其他分班，原始分班列表未自动刷新
|
2016-11-22 11:29:45 +08:00 |
|
huang
|
79b1cdcf84
|
pull request 源项目拉取代码及提交
|
2016-11-22 11:06:18 +08:00 |
|
cxt
|
eeacd76aa9
|
首页班级列表的归档
|
2016-11-22 10:27:56 +08:00 |
|
yuanke
|
c571d19548
|
项目简介单词不换行
|
2016-11-22 10:16:09 +08:00 |
|
yuanke
|
88057fdf4e
|
Merge branch 'develop' into yuanke_youhua
Conflicts:
app/views/projects/show.html.erb
|
2016-11-22 10:15:15 +08:00 |