Commit Graph

11908 Commits

Author SHA1 Message Date
Tim 04fded784e 单词折行样式 2016-01-19 17:02:46 +08:00
huang 86516df88a Merge branch 'cxt_course' of http://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
	app/helpers/application_helper.rb
2016-01-15 15:41:02 +08:00
Tim 50849baade 侧导航“+”号图标调小 2016-01-15 15:27:03 +08:00
cxt 0be6e36020 缺陷、通知、个人留言动态的点赞 2016-01-14 21:07:05 +08:00
cxt cef9fd96cd 组织帖子的动态点赞 2016-01-14 18:05:58 +08:00
cxt 58c96a0df0 作业动态的点赞 2016-01-14 16:15:40 +08:00
cxt 0ffce929f4 项目讨论区的动态点赞 2016-01-14 15:22:37 +08:00
cxt bf6f46174e 课程讨论区回复的点赞 2016-01-14 10:07:46 +08:00
cxt fff7ab4993 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-01-13 19:17:02 +08:00
cxt 093574ebef 首页课程讨论区动态的点赞 2016-01-13 19:16:51 +08:00
Tim f0347c9166 精品课程图标 2016-01-13 18:16:19 +08:00
Tim 88895ff262 英文文本强制折行修复 2016-01-13 16:36:34 +08:00
cxt b73aab1cf6 课程讨论区的点赞 2016-01-13 16:32:05 +08:00
cxt 96a28fe5b5 博客动态添加更新时间 2016-01-12 16:13:49 +08:00
cxt b48a2848b0 首页、课程、项目、组织动态增加更新时间 2016-01-12 15:53:15 +08:00
cxt e5f8c4c4a8 测试结果的对齐显示 2016-01-11 17:00:29 +08:00
cxt a93539da5e 课程学期往前推一个学期 2016-01-11 11:07:03 +08:00
cxt a3a16b5591 问题跟踪、作业列表页面“展开更多”改为“点击展开更多” 2016-01-11 10:21:42 +08:00
cxt 28aa2e5c97 Merge branch 'develop' into cxt_course 2016-01-11 09:28:34 +08:00
huang 4e25b9730f Merge branch 'szzh' into develop 2016-01-08 23:03:39 +08:00
guange d4d1fe65b3 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-08 23:01:33 +08:00
guange e96496ddcd avatar.js和attachments.js冲突,导致头像不能上传 2016-01-08 23:01:16 +08:00
huang 100ecfb184 Merge branch 'szzh' into develop 2016-01-08 22:31:29 +08:00
huang 28c3dca099 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-08 22:30:48 +08:00
huang df16b9b22d Merge branch 'develop' into szzh 2016-01-08 22:30:39 +08:00
cxt 66c3cee3f8 课程关联组织列表 2016-01-08 22:30:04 +08:00
huang c719fd96a3 0 2016-01-08 22:29:57 +08:00
cxt bb0a03b309 若无任何个人留言,或者当前用户无权限看到任何个人留言,不要显示白框 2016-01-08 22:02:35 +08:00
huang 8c10ce6fee 修改组织500问题 2016-01-08 21:47:42 +08:00
cxt a3370b693c 课程关联组织列表为空 2016-01-08 21:46:10 +08:00
huang 5d68d185d5 资源样式冲突 2016-01-08 21:24:25 +08:00
cxt eab8cc7231 复制学期的默认图片 2016-01-08 21:22:36 +08:00
huang f9bc1efd7c issue编辑的时候ajax刷新附件 2016-01-08 21:18:08 +08:00
huang 3df542ff6a Merge branch 'szzh' into develop 2016-01-08 20:46:06 +08:00
cxt ff42d584ef Merge branch 'cxt_course' into szzh 2016-01-08 20:45:06 +08:00
cxt a206a1d7f1 样式 2016-01-08 20:43:33 +08:00
cxt 6c4dbb9ba0 Merge branch 'szzh' into cxt_course 2016-01-08 20:38:02 +08:00
cxt cc135503c2 Merge branch 'cxt_course' into szzh 2016-01-08 20:36:08 +08:00
cxt 1264d5f6ca Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-08 20:35:19 +08:00
cxt 9368e3875c 去掉关联项目的提交次数 2016-01-08 20:35:05 +08:00
cxt 75e2eecc37 课程配置中点击开课学期或结束学期弹框中,“复制学期”入口要开通 2016-01-08 20:23:27 +08:00
huang 64889fd14a 项目资源提供新分页 2016-01-08 20:10:43 +08:00
ouyangxuhua 5d819625c0 快捷菜单上传文件使用最新的上传方式 2016-01-08 20:09:57 +08:00
ouyangxuhua 0ac99571de 样式调整 2016-01-08 19:50:17 +08:00
cxt ef441d3bca 关联项目样式修改 2016-01-08 19:43:37 +08:00
ouyangxuhua 3a62db6475 Merge branch 'dev_hjq' into szzh 2016-01-08 19:34:36 +08:00
ouyangxuhua ceeec3af12 修改一些bug 2016-01-08 19:33:58 +08:00
cxt 7c376ed60b 数据迁移 2016-01-08 19:15:47 +08:00
cxt cf61fd6b85 Merge branch 'develop' into szzh 2016-01-08 19:09:18 +08:00
cxt 5dbad5a672 已关联项目的样式修改 2016-01-08 19:04:22 +08:00