 cxt
|
95170b0b2b
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-02-25 09:35:45 +08:00 |
|
cxt
|
e5f899987b
|
Merge branch 'develop' into szzh
|
2016-02-25 09:35:37 +08:00 |
 guange
|
231df07c29
|
移除pry
|
2016-02-25 09:26:43 +08:00 |
|
cxt
|
e6ed988c10
|
Merge branch 'szzh' into develop
Conflicts:
db/schema.rb
|
2016-02-24 17:00:08 +08:00 |
|
guange
|
296d6efbf1
|
单文件作业不压缩
|
2016-02-24 16:52:36 +08:00 |
|
cxt
|
5e330de31a
|
学生看到的作业个数不包含未发布的作业
|
2016-02-24 16:20:59 +08:00 |
|
cxt
|
2aa0fefa1c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-02-24 16:08:38 +08:00 |
|
cxt
|
9758e18ba8
|
Merge branch 'cxt_course' into develop
|
2016-02-24 16:08:27 +08:00 |
|
cxt
|
e499be999f
|
课程英雄榜的样式修改
|
2016-02-24 16:05:48 +08:00 |
|
cxt
|
72c3fa1166
|
某个学生分数异常
|
2016-02-24 16:05:16 +08:00 |
 ouyangxuhua
|
264c6679e0
|
Merge branch 'ouyangxuhua' into develop
|
2016-02-24 16:02:38 +08:00 |
|
ouyangxuhua
|
11231d0ff9
|
1.解决组织配置报500的错误；2.增加转发表
|
2016-02-24 16:01:32 +08:00 |
 Tim
|
b376c5c6cd
|
版本库和问题跟踪的function样式冲突
|
2016-02-24 15:47:30 +08:00 |
|
cxt
|
adf9465443
|
课程英雄榜的积分只显示一位小数
|
2016-02-24 10:49:48 +08:00 |
|
cxt
|
347efa275d
|
Merge branch 'develop' into cxt_course
|
2016-02-24 09:50:53 +08:00 |
|
ouyangxuhua
|
3eb7c62b85
|
组织子域名迁移
|
2016-02-23 17:09:33 +08:00 |
|
ouyangxuhua
|
16efcafe77
|
注释迁移
|
2016-02-23 16:55:25 +08:00 |
|
ouyangxuhua
|
035b22d6dd
|
Merge branch 'ouyangxuhua' into develop
|
2016-02-23 16:49:12 +08:00 |
|
ouyangxuhua
|
2a26fd4e75
|
修改组织子域名的问题
|
2016-02-23 16:48:31 +08:00 |
|
ouyangxuhua
|
c83562bfd7
|
组织资源过滤：如图资源数统计应该是不同过滤条件下各资源数的统计
|
2016-02-23 16:32:16 +08:00 |
|
ouyangxuhua
|
5c9d8954ec
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-02-23 16:20:07 +08:00 |
|
ouyangxuhua
|
da057bb519
|
Merge branch 'szzh' into develop
|
2016-02-23 16:19:41 +08:00 |
|
ouyangxuhua
|
d818e1774b
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-02-23 16:18:01 +08:00 |
|
ouyangxuhua
|
e65c189913
|
Merge branch 'ouyangxuhua' into szzh
|
2016-02-23 16:17:40 +08:00 |
|
ouyangxuhua
|
f785277d42
|
解决回复框工具栏乱码、组织子域名等问题
|
2016-02-23 16:17:14 +08:00 |
|
cxt
|
3540aa1952
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-02-23 15:51:38 +08:00 |
|
cxt
|
c6d203d186
|
低版本的谷歌浏览器无法修改课程密码
|
2016-02-23 15:51:33 +08:00 |
 huang
|
69ae7e3845
|
解决附件无法更新问题
|
2016-02-23 15:45:19 +08:00 |
|
Tim
|
87f5f9c380
|
上传头像预览图片排版，课程关联组织取消按钮
|
2016-02-23 15:26:34 +08:00 |
|
cxt
|
070af9ad73
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-02-23 15:22:55 +08:00 |
|
cxt
|
e4bf35a1b8
|
个人留言的回复不能自动刷新
|
2016-02-23 15:22:44 +08:00 |
|
huang
|
c9ebd5b9e9
|
Merge branch 'develop' into szzh
|
2016-02-23 15:20:44 +08:00 |
|
ouyangxuhua
|
39c913f941
|
解决某些页面二级回复工具栏乱码问题
|
2016-02-23 14:52:15 +08:00 |
|
ouyangxuhua
|
62193ef7ff
|
组织页面右上角的退出、登陆、注册链接，使用类似https://www.trustie.net/域名
|
2016-02-23 14:12:55 +08:00 |
|
ouyangxuhua
|
4247ab4575
|
Merge branch 'ouyangxuhua' into develop
Conflicts:
db/schema.rb
|
2016-02-23 13:36:05 +08:00 |
|
ouyangxuhua
|
9c2d8f7ab6
|
组织二级回复中，工具栏图标乱码问题修复
|
2016-02-23 13:33:01 +08:00 |
|
ouyangxuhua
|
d2267106c2
|
修复team.trustie.net的侧栏点击后没有显示栏目内容的问题
|
2016-02-23 13:07:42 +08:00 |
|
ouyangxuhua
|
c91ef44570
|
组织子域名：所有子域名保存到secdomains表，将组织表中的子域名迁移到secdomains表中，并修改相应的代码
|
2016-02-23 12:52:04 +08:00 |
|
cxt
|
b6bf78a5df
|
当天发布的资源显示未发布、日期选择器用中文
|
2016-02-23 11:35:07 +08:00 |
|
huang
|
ed7183b1a9
|
0
|
2016-02-23 11:31:34 +08:00 |
|
cxt
|
a2e60944be
|
已发布资源的延期发布
|
2016-02-23 11:04:19 +08:00 |
|
huang
|
929afea196
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
2016-02-23 09:13:10 +08:00 |
|
huang
|
e62386ad65
|
版本局角色同步
|
2016-02-23 09:12:50 +08:00 |
|
cxt
|
6b4be999ee
|
资源的定时发布
|
2016-02-22 18:35:04 +08:00 |
|
huang
|
20b2430da9
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
2016-02-22 18:11:49 +08:00 |
|
cxt
|
d7500d1cc5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-02-22 18:10:31 +08:00 |
|
cxt
|
98946b9855
|
课程上传资源弹框的延迟发布功能
|
2016-02-22 18:10:20 +08:00 |
|
ouyangxuhua
|
3e699ebd99
|
Merge branch 'ouyangxuhua' into develop
|
2016-02-22 17:40:16 +08:00 |
|
huang
|
2156b6db76
|
issue回复 Forge自动更新排序靠前
|
2016-02-22 16:56:37 +08:00 |
|
huang
|
78c70dce81
|
版本库用户名长度引起的错位
|
2016-02-22 15:52:16 +08:00 |