 huang
|
e063470a57
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-22 17:30:07 +08:00 |
|
huang
|
18ea59fc83
|
Merge branch 'szzh' into develop
|
2016-01-22 17:29:59 +08:00 |
|
huang
|
ea6a78893f
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-22 17:29:33 +08:00 |
 cxt
|
a96d8ce5a4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-22 17:29:29 +08:00 |
|
huang
|
3f195f8ee3
|
Merge branch 'hjq_new_course' into szzh
|
2016-01-22 17:29:24 +08:00 |
|
cxt
|
d9dea582da
|
Merge branch 'szzh' into develop
|
2016-01-22 17:29:20 +08:00 |
|
cxt
|
cdcdd96180
|
Merge branch 'cxt_course' into szzh
|
2016-01-22 17:28:01 +08:00 |
|
huang
|
faf1fcaf22
|
issue回复局部刷新
附件浏览问题
昵称改成登录名
|
2016-01-22 17:27:21 +08:00 |
|
cxt
|
0b2184c3d9
|
组织栏目的通知附件显示
|
2016-01-22 17:16:24 +08:00 |
 ouyangxuhua
|
d4c3cb8777
|
Merge branch 'develop' into dev_hjq
|
2016-01-22 17:13:46 +08:00 |
|
ouyangxuhua
|
0a9ecac3db
|
帖子栏目讨论区链接问题修复
|
2016-01-22 17:12:59 +08:00 |
|
cxt
|
e09f795171
|
附件的显示
|
2016-01-22 17:05:58 +08:00 |
|
ouyangxuhua
|
b5bfa6d824
|
1.组织配置中，允许游客下载格式对齐；2.新建组织中，允许游客下载选项生效。
|
2016-01-22 16:56:36 +08:00 |
|
huang
|
2947ff8997
|
精品课程数据迁移
|
2016-01-22 16:46:23 +08:00 |
|
ouyangxuhua
|
b6219c149a
|
解决一下bug:1.通知不能回复；2.组织通知作者不能编辑和删除；
|
2016-01-22 16:10:05 +08:00 |
|
cxt
|
338c224846
|
课程配置页面的结束学期可修改
|
2016-01-22 15:17:11 +08:00 |
|
ouyangxuhua
|
b5159d54c8
|
博客按更新时间排序
|
2016-01-22 15:05:52 +08:00 |
|
huang
|
edd198e91f
|
issue刷新
|
2016-01-22 14:21:17 +08:00 |
|
cxt
|
f7be78efc7
|
关联项目的更新时间包含项目的提交时间
|
2016-01-22 11:10:35 +08:00 |
|
ouyangxuhua
|
d7b17b455d
|
Merge branch 'szzh' into develop
|
2016-01-22 10:27:32 +08:00 |
|
cxt
|
6789693fc7
|
已评分作品超过5个时，作业优秀作品排行显示“更多”
|
2016-01-22 10:17:00 +08:00 |
|
huang
|
4f7d4bb4aa
|
Merge branch 'hjq_new_course' of http://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
2016-01-22 09:58:08 +08:00 |
|
huang
|
e871c6823f
|
Merge branch 'develop' into hjq_new_course
|
2016-01-22 09:57:45 +08:00 |
|
huang
|
59aa1e9c6f
|
issue截止修改
|
2016-01-22 09:55:58 +08:00 |
|
ouyangxuhua
|
a15f7fa97b
|
系统管理员增加组织管理员的权限
|
2016-01-22 09:54:20 +08:00 |
|
cxt
|
fea4f79dc8
|
组织帖子栏目的通知增加点赞tip
|
2016-01-22 09:47:18 +08:00 |
|
cxt
|
d9f109943f
|
Merge branch 'szzh' into cxt_course
|
2016-01-22 09:44:21 +08:00 |
|
ouyangxuhua
|
8ef3018adc
|
issue局部刷新使用update,方式是put
|
2016-01-22 09:41:05 +08:00 |
|
huang
|
da3dcb6fc0
|
Merge branch 'szzh' into develop
|
2016-01-22 09:32:36 +08:00 |
|
huang
|
2a50a850a7
|
Merge branch 'develop' into szzh
|
2016-01-22 09:32:05 +08:00 |
|
huang
|
42cc8bc69e
|
issue属性刷新
|
2016-01-22 09:30:52 +08:00 |
|
ouyangxuhua
|
5e72734bee
|
增加3个url定制路由
|
2016-01-22 09:25:58 +08:00 |
|
huang
|
448a412abf
|
issue详情页面在 user动态、project动态中修改
|
2016-01-21 17:29:46 +08:00 |
|
ouyangxuhua
|
594ce8a304
|
修改几个bug
|
2016-01-21 16:57:13 +08:00 |
|
ouyangxuhua
|
b6460633d2
|
个人博客按更新时间倒排
|
2016-01-21 16:15:45 +08:00 |
|
huang
|
e2fc88e3d1
|
课程讨论区样式混乱的问题
|
2016-01-21 16:14:39 +08:00 |
|
ouyangxuhua
|
600f5de32e
|
个人动态进入个人博客编辑后，跳转到个人首页
|
2016-01-21 16:11:06 +08:00 |
|
huang
|
61e67fa7f4
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/views/users/_course_message.html.erb
app/views/users/_project_issue.html.erb
db/schema.rb
|
2016-01-21 16:10:29 +08:00 |
|
huang
|
0ba724776e
|
项目版本库左侧添加提交次数统计
|
2016-01-21 16:06:50 +08:00 |
|
huang
|
56e804b423
|
issue邮件name问题
|
2016-01-21 15:52:07 +08:00 |
|
huang
|
ff475fb00b
|
Merge branch 'szzh' into develop
|
2016-01-21 15:35:38 +08:00 |
|
ouyangxuhua
|
b8ae62db84
|
Merge branch 'szzh' into dev_hjq
|
2016-01-21 15:32:18 +08:00 |
|
ouyangxuhua
|
bd99352ab1
|
组织增加是否允许游客下载的选项
|
2016-01-21 15:31:36 +08:00 |
|
huang
|
024e299817
|
gitlab同步问题
|
2016-01-21 15:29:06 +08:00 |
|
cxt
|
65563e6503
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-21 15:24:40 +08:00 |
|
cxt
|
219755e4d4
|
Merge branch 'cxt_course' into szzh
|
2016-01-21 15:24:29 +08:00 |
|
cxt
|
99cda66d00
|
编程作业：每次提交了测试集后，页面都会跳到作业页面的最底端，还得手动翻到页面最顶端，再点“发送”
|
2016-01-21 15:02:12 +08:00 |
|
ouyangxuhua
|
6b44b93f0e
|
在通知详情页面，也有发送按钮
|
2016-01-21 14:54:20 +08:00 |
|
cxt
|
5672b029fe
|
导入作业加提示语
|
2016-01-21 14:50:16 +08:00 |
|
ouyangxuhua
|
c303f7ff3f
|
将分享的js方法统一，分享文件、通知等均可复用
|
2016-01-21 14:33:31 +08:00 |