jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
12,550 Commits 98 Branches 0 Tags 0 B
Commit Graph

12550 Commits

Author SHA1 Message Date
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
huang fe978de829 Merge branch 'szzh' into develop 2016-02-20 17:18:41 +08:00
huang 6f9d4eccbe 解决合并引起的问题 2016-02-20 17:17:12 +08:00
Tim 954e61433b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-20 17:01:10 +08:00
Tim 55b13e7dde 历史版本样式更改 2016-02-20 17:00:21 +08:00
ouyangxuhua 1216f49ac2 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	app/views/org_document_comments/edit.html.erb
 2016-02-20 16:59:58 +08:00
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
 2016-02-20 16:58:20 +08:00
huang 1c5e09196d Merge branch 'develop' into szzh 2016-02-20 16:51:00 +08:00
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
 2016-02-20 16:49:19 +08:00
huang 75214f0211 新课导语修改：导语的时候显示trustie信息 2016-02-20 16:45:45 +08:00
Tim 89eff0f920 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-02-20 16:29:28 +08:00
Tim e223ac77d0 自动生成文件 2016-02-20 16:28:19 +08:00