Commit Graph

12464 Commits

Author SHA1 Message Date
cxt 6789693fc7 已评分作品超过5个时,作业优秀作品排行显示“更多” 2016-01-22 10:17:00 +08:00
huang 4f7d4bb4aa Merge branch 'hjq_new_course' of http://git.trustie.net/jacknudt/trustieforge into hjq_new_course 2016-01-22 09:58:08 +08:00
huang e871c6823f Merge branch 'develop' into hjq_new_course 2016-01-22 09:57:45 +08:00
huang 59aa1e9c6f issue截止修改 2016-01-22 09:55:58 +08:00
ouyangxuhua a15f7fa97b 系统管理员增加组织管理员的权限 2016-01-22 09:54:20 +08:00
cxt fea4f79dc8 组织帖子栏目的通知增加点赞tip 2016-01-22 09:47:18 +08:00
cxt d9f109943f Merge branch 'szzh' into cxt_course 2016-01-22 09:44:21 +08:00
ouyangxuhua 8ef3018adc issue局部刷新使用update,方式是put 2016-01-22 09:41:05 +08:00
huang da3dcb6fc0 Merge branch 'szzh' into develop 2016-01-22 09:32:36 +08:00
huang 2a50a850a7 Merge branch 'develop' into szzh 2016-01-22 09:32:05 +08:00
huang 42cc8bc69e issue属性刷新 2016-01-22 09:30:52 +08:00
ouyangxuhua 5e72734bee 增加3个url定制路由 2016-01-22 09:25:58 +08:00
huang 448a412abf issue详情页面在 user动态、project动态中修改 2016-01-21 17:29:46 +08:00
ouyangxuhua 594ce8a304 修改几个bug 2016-01-21 16:57:13 +08:00
ouyangxuhua b6460633d2 个人博客按更新时间倒排 2016-01-21 16:15:45 +08:00
huang e2fc88e3d1 课程讨论区样式混乱的问题 2016-01-21 16:14:39 +08:00
ouyangxuhua 600f5de32e 个人动态进入个人博客编辑后,跳转到个人首页 2016-01-21 16:11:06 +08:00
huang 61e67fa7f4 Merge branch 'develop' into hjq_new_course
Conflicts:
	app/views/users/_course_message.html.erb
	app/views/users/_project_issue.html.erb
	db/schema.rb
2016-01-21 16:10:29 +08:00
huang 0ba724776e 项目版本库左侧添加提交次数统计 2016-01-21 16:06:50 +08:00
huang 56e804b423 issue邮件name问题 2016-01-21 15:52:07 +08:00
huang ff475fb00b Merge branch 'szzh' into develop 2016-01-21 15:35:38 +08:00
ouyangxuhua b8ae62db84 Merge branch 'szzh' into dev_hjq 2016-01-21 15:32:18 +08:00
ouyangxuhua bd99352ab1 组织增加是否允许游客下载的选项 2016-01-21 15:31:36 +08:00
huang 024e299817 gitlab同步问题 2016-01-21 15:29:06 +08:00
cxt 65563e6503 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-21 15:24:40 +08:00
cxt 219755e4d4 Merge branch 'cxt_course' into szzh 2016-01-21 15:24:29 +08:00
cxt 99cda66d00 编程作业:每次提交了测试集后,页面都会跳到作业页面的最底端,还得手动翻到页面最顶端,再点“发送” 2016-01-21 15:02:12 +08:00
ouyangxuhua 6b44b93f0e 在通知详情页面,也有发送按钮 2016-01-21 14:54:20 +08:00
cxt 5672b029fe 导入作业加提示语 2016-01-21 14:50:16 +08:00
ouyangxuhua c303f7ff3f 将分享的js方法统一,分享文件、通知等均可复用 2016-01-21 14:33:31 +08:00
cxt 247924af26 动态内容显示不全 2016-01-21 11:24:26 +08:00
huang 524e152b24 Issue截止时间到了邮件提醒 2016-01-21 11:19:08 +08:00
huang 7de48f143e issue状态修改 2016-01-21 10:38:07 +08:00
cxt f15847371c 附件显示过长 2016-01-21 10:36:30 +08:00
ouyangxuhua ece9f9dc6f 项目新闻使用方块样式 2016-01-21 10:33:53 +08:00
guange 769b044df5 动态内容调整 2016-01-20 23:39:47 +08:00
guange 745b8399d1 动态内容调整 2016-01-20 23:38:40 +08:00
guange 6075f44786 动态内容调整 2016-01-20 23:34:05 +08:00
guange 9d33dcf2f3 动态内容调整 2016-01-20 23:32:43 +08:00
guange 74b643584f 动态内容调整 2016-01-20 23:31:29 +08:00
guange 472c6acf2b 动态内容调整 2016-01-20 23:29:22 +08:00
guange 22a83bee0e 动态内容调整 2016-01-20 23:26:58 +08:00
guange c439d62a64 动态内容调整 2016-01-20 23:20:44 +08:00
guange 4607d1a78d 动态内容调整 2016-01-20 23:18:21 +08:00
guange 6d732ff5ff 动态内容调整 2016-01-20 23:17:17 +08:00
guange fce8d85380 动态内容调整 2016-01-20 23:15:22 +08:00
guange f644aa1144 图片调整 2016-01-20 22:31:36 +08:00
guange a72339fe2c 图片调整 2016-01-20 22:27:50 +08:00
guange 02cf9b56e1 图片调整 2016-01-20 22:25:14 +08:00
guange 95070b7e83 添加js方法 2016-01-20 22:21:50 +08:00