Commit Graph

11792 Commits

Author SHA1 Message Date
cxt 05f822a5c2 导出在线测验成绩列表 2016-01-07 16:43:03 +08:00
cxt 5b234580a8 学生作品列表打开报500 2016-01-07 15:59:51 +08:00
cxt 1263e4cac0 关联项目的样式修改 2016-01-07 15:33:21 +08:00
cxt 2b75c1e11a Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-01-07 15:29:38 +08:00
cxt 151c08ac5c 复制学期 2016-01-07 15:29:25 +08:00
Tim e9d986b311 课程关联项目样式调整 2016-01-06 11:01:00 +08:00
cxt cf125159f2 关联项目增加提交次数 2016-01-06 10:36:53 +08:00
Tim 17800e8cf2 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-01-06 10:36:28 +08:00
cxt d4d96e66fc Merge branch 'develop' into cxt_course 2016-01-06 10:03:21 +08:00
cxt 0606584edf Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-06 09:59:56 +08:00
cxt 50a1344aa3 Merge branch 'szzh' into develop 2016-01-06 09:59:48 +08:00
cxt 244e133803 关联项目的对齐 2016-01-06 09:57:54 +08:00
huang cf32085564 Merge branch 'szzh' into develop 2016-01-05 17:03:51 +08:00
huang 7ee4ff69b3 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
	public/stylesheets/new_user.css
	public/stylesheets/public.css
2016-01-05 17:03:10 +08:00
huang f81eea54b1 Merge branch 'develop' into szzh 2016-01-05 17:02:06 +08:00
huang fc55be78c6 博客列表展开/ 2016-01-05 17:01:41 +08:00
ouyangxuhua a81eb5cbc8 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-05 16:55:38 +08:00
ouyangxuhua dab3f0d225 为组织1添加子域名:team 2016-01-05 16:55:21 +08:00
huang 738acad211 展开、收缩 2016-01-05 16:52:34 +08:00
cxt 9ccca401f6 匿评时也显示系统测试情况 2016-01-05 16:47:55 +08:00
huang 2efcb5b89a 课程讨论区添加展开、收缩 2016-01-05 16:05:27 +08:00
huang dc77eb6ef6 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-01-05 15:59:30 +08:00
huang be218baa52 添加迁移:项目讨论区数据重复问题 2016-01-05 15:59:13 +08:00
cxt 2b2abd912d Merge branch 'szzh' into cxt_course 2016-01-05 15:50:11 +08:00
cxt 0a2d2a539f 关联项目的组长名字加个title 2016-01-05 15:46:41 +08:00
cxt 6786ef3235 Merge branch 'szzh' into cxt_course 2016-01-05 15:38:19 +08:00
Tim 06fa32f0e2 博客高度控制 2016-01-05 15:23:37 +08:00
cxt c4886306d4 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-05 15:05:51 +08:00
cxt 94eaf608c3 Merge branch 'cxt_course' into szzh 2016-01-05 15:05:39 +08:00
huang 428eb018a3 隐藏注册中“组织一列” 2016-01-05 15:02:39 +08:00
huang 1f09817e4d 增加课程讨论区/项目讨论展开更多功能
博客列表页面展开更多
统一展开高度为一个屏幕
2016-01-05 12:59:59 +08:00
guange 1b177a8498 默认禁用自动高度 2016-01-05 11:55:30 +08:00
cxt f52dc37a76 作业动态添加作品评阅和作品提交消息 2016-01-05 11:29:30 +08:00
huang 0d6ad9ffac 修改课程删除后可以显示的问题 2016-01-04 17:08:15 +08:00
guange d2c7d12cd9 merge 2016-01-04 15:53:56 +08:00
guange 8ea9430318 at链接问题修改 2016-01-04 15:51:24 +08:00
cxt 3ddbeae100 课程的“更多”模式的文字不用粗体 2016-01-04 11:32:48 +08:00
cxt a4a29b0ee9 关联项目的文字样式调整 2016-01-04 11:26:42 +08:00
cxt 28d491495a Merge branch 'develop' into cxt_course 2016-01-04 11:25:43 +08:00
cxt 7f751cfc63 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2015-12-31 17:58:59 +08:00
cxt 4d4e91c358 Merge branch 'szzh' into develop 2015-12-31 17:58:51 +08:00
huang 11444f43f0 解决issue多附件,删除一个附件后,提交弹出白色框框的问题 2015-12-31 17:55:48 +08:00
cxt 6b5341805e Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-31 17:54:04 +08:00
cxt f0216cf604 Merge branch 'cxt_course' into szzh 2015-12-31 17:53:52 +08:00
cxt 3dac8d2944 课程/项目帖子的编辑/删除跳转 所有用户都有发送帖子的权限 2015-12-31 17:53:05 +08:00
lizanle 87b8e4dafc Merge remote-tracking branch 'origin/szzh' into szzh 2015-12-31 17:07:04 +08:00
lizanle b06bd51347 项目资源库更新资源公开私有属性的时候 需要区分 项目课程 2015-12-31 17:06:49 +08:00
ouyangxuhua 527897bff0 新建组织后,增加默认栏目 2015-12-31 16:23:10 +08:00
ouyangxuhua 692f13d1de Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-31 16:12:19 +08:00
ouyangxuhua defba80427 栏目配置中,“设为显示”改成“设为可见" 2015-12-31 16:11:48 +08:00