 ouyangxuhua
|
d818e1774b
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
9 years ago |
|
ouyangxuhua
|
e65c189913
|
Merge branch 'ouyangxuhua' into szzh
|
9 years ago |
|
ouyangxuhua
|
f785277d42
|
解决回复框工具栏乱码、组织子域名等问题
|
9 years ago |
 huang
|
69ae7e3845
|
解决附件无法更新问题
|
9 years ago |
|
huang
|
c9ebd5b9e9
|
Merge branch 'develop' into szzh
|
9 years ago |
|
ouyangxuhua
|
39c913f941
|
解决某些页面二级回复工具栏乱码问题
|
9 years ago |
|
ouyangxuhua
|
62193ef7ff
|
组织页面右上角的退出、登陆、注册链接，使用类似https://www.trustie.net/域名
|
9 years ago |
|
ouyangxuhua
|
4247ab4575
|
Merge branch 'ouyangxuhua' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
ouyangxuhua
|
9c2d8f7ab6
|
组织二级回复中，工具栏图标乱码问题修复
|
9 years ago |
|
ouyangxuhua
|
d2267106c2
|
修复team.trustie.net的侧栏点击后没有显示栏目内容的问题
|
9 years ago |
|
ouyangxuhua
|
c91ef44570
|
组织子域名：所有子域名保存到secdomains表，将组织表中的子域名迁移到secdomains表中，并修改相应的代码
|
9 years ago |
 cxt
|
b6bf78a5df
|
当天发布的资源显示未发布、日期选择器用中文
|
9 years ago |
|
huang
|
ed7183b1a9
|
0
|
9 years ago |
|
cxt
|
a2e60944be
|
已发布资源的延期发布
|
9 years ago |
|
huang
|
929afea196
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
e62386ad65
|
版本局角色同步
|
9 years ago |
|
cxt
|
6b4be999ee
|
资源的定时发布
|
9 years ago |
|
huang
|
20b2430da9
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
d7500d1cc5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
98946b9855
|
课程上传资源弹框的延迟发布功能
|
9 years ago |
|
ouyangxuhua
|
3e699ebd99
|
Merge branch 'ouyangxuhua' into develop
|
9 years ago |
|
huang
|
2156b6db76
|
issue回复 Forge自动更新排序靠前
|
9 years ago |
|
huang
|
78c70dce81
|
版本库用户名长度引起的错位
|
9 years ago |
|
huang
|
1234bc0aef
|
课程导语从帖子中获取
|
9 years ago |
|
cxt
|
278139104b
|
允许老师修改开始学期
|
9 years ago |
|
ouyangxuhua
|
c1a84e2ce5
|
组织页面右上角的用户链接改成https://www.trustie.net的形式
|
9 years ago |
|
cxt
|
ba66425bef
|
学生打开分组作业列表报500
|
9 years ago |
|
cxt
|
84a1397a7a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
3369183fb7
|
课程表的数据迁移
|
9 years ago |
|
huang
|
efff99c05b
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
935ddc053a
|
解决项目500问题
|
9 years ago |
|
cxt
|
7305b20ab0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
d84da7908d
|
学生查看问卷调查结果的提示
|
9 years ago |
|
ouyangxuhua
|
808f9a6b7a
|
组织页面右上角样式还原
|
9 years ago |
|
ouyangxuhua
|
41b8dc1d74
|
Merge branch 'szzh' into develop
|
9 years ago |
|
huang
|
5fea90b993
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
0b1362c0de
|
Merge branch 'szzh' into develop
|
9 years ago |
|
ouyangxuhua
|
9a72f5d0d7
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
9 years ago |
|
ouyangxuhua
|
5893d7fc15
|
解决问题：组织资源栏目页面，点击展开更多报500
|
9 years ago |
 Tim
|
228857f20c
|
资源历史版本样式
|
9 years ago |
|
huang
|
e92e31893e
|
Merge branch 'develop' into szzh
|
9 years ago |
|
huang
|
59d45f2d52
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
fe978de829
|
Merge branch 'szzh' into develop
|
9 years ago |
|
huang
|
6f9d4eccbe
|
解决合并引起的问题
|
9 years ago |
|
Tim
|
954e61433b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
Tim
|
55b13e7dde
|
历史版本样式更改
|
9 years ago |
|
ouyangxuhua
|
1216f49ac2
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/org_document_comments/edit.html.erb
|
9 years ago |
|
huang
|
3fda270a66
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/org_document_comments/edit.html.erb
app/views/users/search_user_course.js.erb
app/views/users/search_user_org.js.erb
app/views/users/search_user_project.js.erb
|
9 years ago |
|
huang
|
1c5e09196d
|
Merge branch 'develop' into szzh
|
9 years ago |
|
ouyangxuhua
|
a4ca676ccb
|
Merge branch 'szzh' into ouyangxuhua
Conflicts:
app/views/org_document_comments/edit.html.erb
app/views/users/search_user_course.js.erb
app/views/users/search_user_org.js.erb
app/views/users/search_user_project.js.erb
|
9 years ago |
