Commit Graph

1459 Commits

Author SHA1 Message Date
cxt 11bf8f77dc Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-25 15:59:33 +08:00
cxt b8d8cece02 关联项目的样式修改 2015-12-25 14:56:08 +08:00
huang a92d33300b 里程碑 添加 “已解决”,区分已解决和已关闭 2015-12-24 17:18:52 +08:00
Tim c405950469 课程关联项目列表显示调整 2015-12-23 17:26:13 +08:00
huang 0e68266f49 版本库显示调整 2015-12-22 10:59:09 +08:00
lizanle 70f93741d6 issue图标问题 2015-12-18 14:38:04 +08:00
guange eb97f7dfb2 merge 2015-12-18 09:20:51 +08:00
cxt 0ed58d4898 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-17 19:07:17 +08:00
lizanle 5f8c04e3a0 Merge branch 'szzh' into dev_zanle 2015-12-17 18:17:38 +08:00
lizanle 8ce2dbc4b8 issue回复 2015-12-17 18:12:38 +08:00
ouyangxuhua ef46191c80 Merge branch 'szzh' into dev_hjq 2015-12-17 17:42:48 +08:00
guange ed649e0724 @颜色修改 2015-12-17 15:54:29 +08:00
lizanle 1809a93770 editor修改 2015-12-17 15:41:36 +08:00
lizanle 66f88cdf5a issue 文件 2015-12-16 16:55:07 +08:00
cxt dc0f004021 关联项目的提示信息 2015-12-16 15:47:30 +08:00
lizanle 2aa241bffa issue 2015-12-16 11:50:30 +08:00
cxt bfde278340 学生作品列表的样式调整 2015-12-16 11:02:52 +08:00
lizanle 02a9f08fe6 表单长度对齐 2015-12-16 10:19:48 +08:00
lizanle 68aceaa7df issue下载 2015-12-15 18:43:58 +08:00
guange 4ce9eb428e at样式问题 2015-12-15 16:28:11 +08:00
cxt 72c475e8a2 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-15 16:03:26 +08:00
cxt 0deffdba33 在线测验学生答题时可点击保存也可点击提交 2015-12-15 15:21:52 +08:00
guange d1315e35b5 merge 2015-12-14 17:26:40 +08:00
ouyangxuhua a5fa68c928 资源栏目增加资源 2015-12-14 16:41:18 +08:00
huang a791c39b4b Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-11 18:12:25 +08:00
ouyangxuhua de0b5d1897 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2015-12-11 16:58:19 +08:00
ouyangxuhua e98338bf22 栏目增加资源类型,可以添加文件、删除文件、显示文件等 2015-12-11 16:30:50 +08:00
cxt d4bde8e73c 调整学生作品列表的样式 2015-12-11 16:05:18 +08:00
cxt bb2f49439e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	db/schema.rb
2015-12-11 15:00:35 +08:00
cxt 27ed6df9d6 Merge branch 'szzh' into develop 2015-12-11 14:59:52 +08:00
ouyangxuhua 48e7aa78d1 项目加载更多样式问题 2015-12-10 17:00:24 +08:00
ouyangxuhua 0a85fbf613 1.配置栏目列表,增加类型一列;
2.暂时隐藏类型为“资源”的栏目的链接
2015-12-10 15:53:05 +08:00
cxt 53f9141cf1 分组作业动态 2015-12-09 10:29:54 +08:00
cxt a9f6e817b4 分组作业关联项目 2015-12-08 17:37:15 +08:00
huang 3459164e64 过滤条件样式 2015-12-07 17:25:32 +08:00
huang 5f6d9f2425 项目动态新样式 2015-12-07 17:14:13 +08:00
ouyangxuhua 7057a4cfea 组织页首增加退出功能 2015-12-07 14:31:08 +08:00
ouyangxuhua 5034ddb4b6 修复组织的bug 2015-12-07 12:53:51 +08:00
Tim 75d79c6c47 问题跟踪样式调整 2015-12-07 10:14:39 +08:00
huang 9d7bc17115 Merge branch 'develop' into dev_hjq 2015-12-05 11:39:40 +08:00
ouyangxuhua ab4d0e4678 组织界面增加分栏 2015-12-04 17:34:48 +08:00
Tim d115a97f78 追加附件效果调整 2015-12-04 16:49:14 +08:00
cxt 8fe53468e1 作品追加附件 2015-12-04 16:21:11 +08:00
cxt fd51b02e16 添加修订附件 2015-12-03 18:33:08 +08:00
cxt 77e96af78f 还原分组作业 2015-12-03 10:41:27 +08:00
lizanle 3c946c034a Merge branch 'szzh' into dev_zanle
Conflicts:
	db/schema.rb
	kaminari分页添加上一页下一页
2015-11-30 11:07:53 +08:00
lizanle 582cd6f5d4 Merge branch 'szzh' into dev_zanle
Conflicts:
	app/models/attachment.rb
	db/schema.rb
2015-11-27 18:47:02 +08:00
huang 41b99af7dd Merge branch 'develop' into sw_new_course 2015-11-27 17:17:21 +08:00
Tim 06ca4c8f4b 作品列表样式调整 2015-11-27 16:52:28 +08:00
cxt 85aade79ce Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
	public/stylesheets/courses.css
2015-11-27 15:21:32 +08:00