Commit Graph

12461 Commits

Author SHA1 Message Date
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
huang 40fb140b6d 版本库提交记录diff信息 2016-02-23 15:09:15 +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
huang 90208e166f 项目统计数小于0情况判断 2016-02-23 13:24:20 +08:00
ouyangxuhua d2267106c2 修复team.trustie.net的侧栏点击后没有显示栏目内容的问题 2016-02-23 13:07:42 +08:00
huang 44f192e5a6 解决资源总数为负数的问题 2016-02-23 13:02:37 +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 0b34be5a30 Merge branch 'develop' into hjq_course 2016-02-23 11:32:03 +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 bd72e7a435 Merge branch 'develop' into hjq_course 2016-02-22 17:34:03 +08:00
huang 2156b6db76 issue回复 Forge自动更新排序靠前 2016-02-22 16:56:37 +08:00
huang 78c70dce81 版本库用户名长度引起的错位 2016-02-22 15:52:16 +08:00
huang 1234bc0aef 课程导语从帖子中获取 2016-02-22 15:34:50 +08:00
cxt 278139104b 允许老师修改开始学期 2016-02-22 15:09:07 +08:00
ouyangxuhua c1a84e2ce5 组织页面右上角的用户链接改成https://www.trustie.net的形式 2016-02-22 11:14:26 +08:00
cxt ba66425bef 学生打开分组作业列表报500 2016-02-20 18:26:52 +08:00
cxt 84a1397a7a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-20 18:16:12 +08:00
cxt 3369183fb7 课程表的数据迁移 2016-02-20 18:16:07 +08:00
huang efff99c05b Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-02-20 17:49:06 +08:00
huang 935ddc053a 解决项目500问题 2016-02-20 17:48:45 +08:00
cxt 7305b20ab0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-20 17:43:24 +08:00
cxt d84da7908d 学生查看问卷调查结果的提示 2016-02-20 17:43:15 +08:00
ouyangxuhua 808f9a6b7a 组织页面右上角样式还原 2016-02-20 17:40:00 +08:00
ouyangxuhua 41b8dc1d74 Merge branch 'szzh' into develop 2016-02-20 17:37:36 +08:00
huang 5fea90b993 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-02-20 17:25:26 +08:00
huang 0b1362c0de Merge branch 'szzh' into develop 2016-02-20 17:25:14 +08:00
ouyangxuhua 9a72f5d0d7 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-02-20 17:24:27 +08:00
ouyangxuhua 5893d7fc15 解决问题:组织资源栏目页面,点击展开更多报500 2016-02-20 17:24:08 +08:00
Tim 228857f20c 资源历史版本样式 2016-02-20 17:23:24 +08:00
huang e92e31893e Merge branch 'develop' into szzh 2016-02-20 17:19:22 +08:00
huang 59d45f2d52 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-02-20 17:18:49 +08:00