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

9806 Commits

Author SHA1 Message Date
huang 00711f1100 issue编辑、添加邮件中去掉token 2015-12-23 16:12:23 +08:00
ouyangxuhua b9ae579622 将课程帖子转发至组织帖子栏目 2015-12-23 15:35:26 +08:00
lizanle e8bf93e4ad 文件上传button的路径去掉project参数。 2015-12-23 11:13:14 +08:00
lizanle 7688546e7a 论坛编辑的时候上传文件后没有显示 2015-12-23 11:12:34 +08:00
ouyangxuhua 9dc2cb8541 添加组织文章附件功能 2015-12-23 10:40:50 +08:00
lizanle bececd1547 Merge remote-tracking branch 'origin/szzh' into szzh 2015-12-23 10:03:12 +08:00
lizanle 2eca28a10d LastName 姓 
FirstName 名
 2015-12-23 10:02:54 +08:00
ouyangxuhua 2220e0b7cc 增加帖子-组织栏目关联表 2015-12-22 15:48:41 +08:00
guange 22d8fc9abd 作业附件乱码优化 2015-12-22 15:45:17 +08:00
cxt 1623d846f4 动态的展开更多改成点击展开更多 2015-12-22 15:14:03 +08:00
huang 0e68266f49 版本库显示调整 2015-12-22 10:59:09 +08:00
cxt 1a042fd822 组织首页的加载更多动态重复加载 2015-12-22 10:54:27 +08:00
cxt 6f12ba883d 学生作品列表的tag显示不对 2015-12-22 09:49:18 +08:00
huang 4111cb53dc 解决fork部分项目404问题 2015-12-21 17:13:13 +08:00
cxt c8760445ab Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2015-12-21 17:00:28 +08:00
cxt a5cc1390f2 学生匿评打分时必须填写评语 2015-12-21 17:00:01 +08:00
houxiang 240a859f2d Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course 2015-12-21 16:45:58 +08:00
houxiang 21461fb583 修正了以前的方法调用 by 侯翔 2015-12-21 16:45:16 +08:00
huang 471e5f5370 Merge branch 'hjq_new_course' of http://git.trustie.net/jacknudt/trustieforge into hjq_new_course 2015-12-21 16:29:58 +08:00
houxiang 3e57237969 修改了整个提交记录总数，运用了黄总的修改的gitlab API by 侯翔 2015-12-21 16:21:39 +08:00
guange 1724ae430e Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-21 15:15:48 +08:00
guange bb94a41435 红点中包含at的消息 2015-12-21 15:11:41 +08:00
huang c29ab5dc6d Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-21 14:49:17 +08:00
huang 1a549eda46 版本库显示问题 2015-12-21 14:33:28 +08:00
huang c381ce177f 解决通知太长不能发的问题 2015-12-21 14:00:09 +08:00
huang ab1397d982 恢复版本 2015-12-21 13:53:22 +08:00
huang 73f0d70e23 Merge branch 'cxt_course' of http://git.trustie.net/jacknudt/trustieforge into cxt_course 2015-12-21 13:49:19 +08:00
huang 3de4c7129a 版本库读取错误问题 2015-12-21 13:48:25 +08:00
lizanle 31cbf3fbce onchange函数去掉 2015-12-21 11:19:34 +08:00
lizanle 60381fded5 表单长度对齐 2015-12-21 11:14:27 +08:00
lizanle 4630576146 issue的创建成功不需要提示sucess 2015-12-21 10:30:39 +08:00
lizanle 480775f2b9 Merge remote-tracking branch 'origin/szzh' into szzh 2015-12-21 09:27:17 +08:00
lizanle 538c64329f issue的修改 2015-12-21 09:26:56 +08:00
cxt 84f6ec0978 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 21:34:50 +08:00
cxt 65022f03cb 作业动态中的评分设置和匿评自动开启、关闭时间的自动刷新 2015-12-18 21:34:31 +08:00
huang 4092401e68 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 21:22:08 +08:00
huang d2ba950044 绝对成 2015-12-18 21:03:36 +08:00
huang 5941d41b19 测试 2015-12-18 20:53:32 +08:00
cxt c073e56b79 学生匿评必须添加评语 2015-12-18 20:46:20 +08:00
huang 747493993b 上线测试 2015-12-18 19:57:08 +08:00
cxt e7db03f271 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 19:49:42 +08:00
cxt 459e1f332b 编辑分组作品时如果不修改分组成员则不能提交 2015-12-18 19:48:13 +08:00
guange e9a45012f8 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 19:47:21 +08:00
guange 08cd3808ad ke引用错误 2015-12-18 19:47:06 +08:00
huang e673540323 还原提交次数 2015-12-18 18:51:29 +08:00
cxt 6a563d4256 匿评结束后不可修改作业的截止日期，作业发布后不可修改作业的发布日期 2015-12-18 18:47:36 +08:00
huang 4dda355d2e 测试版 2015-12-18 18:28:20 +08:00
lizanle a657a5b98d 课程留言 重复提交问题 2015-12-18 18:09:20 +08:00
cxt 902570173d Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 18:09:00 +08:00
lizanle a1d0bf43ee Merge remote-tracking branch 'origin/szzh' into szzh 2015-12-18 17:55:21 +08:00
lizanle 009dc089f0 资源库重命名修改 2015-12-18 17:55:15 +08:00
ouyangxuhua 714dfdc2d5 解决组织资源栏目点击上传资源没反应的问题 2015-12-18 17:51:22 +08:00
cxt 8769d6af4f Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 17:28:59 +08:00
cxt 108448cf4d 课程讨论区的加载更多 2015-12-18 17:28:47 +08:00
guange e02b865fa6 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 17:09:01 +08:00
huang ea51b24a4e Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 17:06:00 +08:00
guange 57b1c0c7d8 at是否开启加入到配置 2015-12-18 17:02:50 +08:00
guange f4d861c727 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 16:51:17 +08:00
guange d0e139650f issue回复的at出错 2015-12-18 16:50:44 +08:00
cxt 63f9601c15 Merge branch 'cxt_course' into szzh 2015-12-18 16:27:31 +08:00
guange c38191eb42 问题回复at 2015-12-18 16:25:14 +08:00
cxt 7ce8e330c3 课程留言动态的显示 2015-12-18 16:21:27 +08:00
huang a080306f75 解决课程动态中，点击按钮，提交多次的问题 2015-12-18 16:05:39 +08:00
lizanle 0ed7d84914 Merge remote-tracking branch 'origin/szzh' into szzh 2015-12-18 15:22:35 +08:00
lizanle 084844941f 个人单位修改。 
聚焦就搜索所有的学校
 2015-12-18 15:22:29 +08:00
cxt 2eaa05306f Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	app/views/boards/_course_show.html.erb
 2015-12-18 15:08:38 +08:00
cxt ba4c93e4c4 Merge branch 'cxt_course' into szzh 2015-12-18 15:03:24 +08:00
cxt a7c006c59f 课程讨论区的展开更多不可用 2015-12-18 15:02:36 +08:00
huang 8a53978d23 项目得分更新 2015-12-18 14:51:33 +08:00
lizanle eb02a3d34a Merge remote-tracking branch 'origin/szzh' into szzh 2015-12-18 14:38:10 +08:00
lizanle 70f93741d6 issue图标问题 2015-12-18 14:38:04 +08:00
ouyangxuhua b3b5bc7ffd Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 14:30:43 +08:00
ouyangxuhua 85bc9ce43d 解决组织模块的一些bug 2015-12-18 14:30:25 +08:00
cxt c230ff5bed 普通作业提交报500 2015-12-18 13:16:01 +08:00
cxt ca77af9221 作业动态添加扣分规则 2015-12-18 13:13:23 +08:00
cxt b65e84d166 未答测验的学生在测验截止时间到了后算作零分 2015-12-18 12:47:34 +08:00
lizanle e867358bc1 Merge remote-tracking branch 'origin/szzh' into szzh 2015-12-18 11:20:07 +08:00
lizanle 06734d86ca attachment_acts页面变量错误 2015-12-18 11:19:55 +08:00
guange 8c967e6559 格式改进 2015-12-18 11:13:27 +08:00
guange e8cf5d1042 at消息html代码问题 2015-12-18 10:53:35 +08:00
guange 39ad191dd0 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 10:41:06 +08:00
guange b4016faeb6 编辑框消失 2015-12-18 10:40:12 +08:00
lizanle 47b20d3639 journal不应该算入ForgeActivity 2015-12-18 10:19:18 +08:00
cxt 2faddd7d75 分组设置中的基于项目实施默认勾选 2015-12-18 10:00:26 +08:00
lizanle f3f64b8655 Merge remote-tracking branch 'origin/szzh' into szzh 2015-12-18 09:46:35 +08:00
lizanle 5d47afdc43 issue 删除回复的权限问题 2015-12-18 09:46:28 +08:00
huang b34b1181b7 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 09:39:55 +08:00
huang 4ca177970b fork点击提示 2015-12-18 09:39:36 +08:00
lizanle 38c3422b83 Merge remote-tracking branch 'origin/szzh' into szzh 2015-12-18 09:28:41 +08:00
lizanle 0659015ada issue 多了一个提交按钮和时间显示 2015-12-18 09:26:35 +08:00
guange d703f75c98 merge 2015-12-18 09:23:52 +08:00
guange eb97f7dfb2 merge 2015-12-18 09:20:51 +08:00
huang 5259831224 Merge branch 'szzh' into hjq_new_course 2015-12-18 09:17:49 +08:00
huang b87943ff1d Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	db/schema.rb
处理冲突
 2015-12-18 09:17:18 +08:00
guange b69f5f0da3 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-17 22:36:33 +08:00
guange c98e9fc639 查看作业代码着色 2015-12-17 22:36:18 +08:00
houxiang fc2eae4c62 add something by hx 2015-12-17 20:56:30 +08:00
cxt 0ed58d4898 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-17 19:07:17 +08:00
cxt 3b25616f0c 编辑作品时可编辑分组成员 2015-12-17 19:06:10 +08:00
cxt c7f321475a 多选题错判 2015-12-17 19:05:22 +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
guange 716604903b 修复讨论区at错误 2015-12-17 18:07:19 +08:00
ouyangxuhua ef46191c80 Merge branch 'szzh' into dev_hjq 2015-12-17 17:42:48 +08:00
lizanle 1dbccd81d6 issue回复的删除功能 2015-12-17 17:15:03 +08:00
guange 923cb3c84f 中文报错 2015-12-17 15:44:17 +08:00
lizanle 1809a93770 editor修改 2015-12-17 15:41:36 +08:00
cxt a2ebaa0729 分组作业提交作品时如果关联了项目则从项目成员中添加分组成员 2015-12-17 15:28:28 +08:00
lizanle 505d1b5546 editor修改 2015-12-17 15:19:29 +08:00
lizanle 4bc68081ee editor修改 2015-12-17 15:15:00 +08:00
guange fc63dfcb7b 消息通知 2015-12-17 15:14:52 +08:00
ouyangxuhua de229c0f1c 组织资源栏目的文件可以被引用至当前组织下的资源栏目 2015-12-17 14:51:02 +08:00
huang 2d2329a1e0 代码定位问题 2015-12-17 14:31:55 +08:00
lizanle b02cb6fdd4 issue的修改如果更改issue的类型，那么就会有问题。需要重新新建editor 2015-12-17 11:30:52 +08:00
lizanle 31c57b78bf issue的修改如果更改issue的类型，那么就会有问题。需要重新新建editor 2015-12-17 11:28:28 +08:00
cxt 89d3d3821c 分组作业的导入 2015-12-17 10:38:14 +08:00
lizanle c183574a5e 博客回复 2015-12-17 10:19:43 +08:00
cxt 51e082a551 编辑和新建作品时的样式和提示信息调整 2015-12-17 10:17:13 +08:00
cxt fa0f9c6751 分组作业的编辑，若分组作业已提交了作品则不可再编辑分组设置 2015-12-17 10:16:29 +08:00
ouyangxuhua acb604883d 项目/课程配置关联组织，左边的组织列表由每页10个组织增至15个组织。 2015-12-17 10:01:28 +08:00
cxt ff579afd45 作业动态中添加分组人数 2015-12-17 09:27:51 +08:00
lizanle 0a3c5f6acc issues如果标题为空需要弹框报错 2015-12-17 09:22:01 +08:00
cxt a8c8dc3cc6 关联项目的提示信息修改 2015-12-16 17:38:28 +08:00
lizanle 71f6a637e0 帖子按时间倒排 2015-12-16 17:26:19 +08:00
lizanle ffd8d55aa6 memo更新时间 2015-12-16 17:08:59 +08:00
huang bb23049f55 版本库提交次数封装 
提交页面样式修改
 2015-12-16 17:04:17 +08:00
lizanle 66f88cdf5a issue 文件 2015-12-16 16:55:07 +08:00
lizanle a0035a4c1e issue 查询 2015-12-16 16:49:33 +08:00
guange c0de5d55de 加入了issue的at消息提醒 2015-12-16 16:37:00 +08:00
cxt ab96bf8e5e 作品列表中未参与匿评的作品显示“未参与” 2015-12-16 16:00:25 +08:00
lizanle b13ae8f599 issue 2015-12-16 15:55:40 +08:00
cxt dc0f004021 关联项目的提示信息 2015-12-16 15:47:30 +08:00
ouyangxuhua 0fef18312d 鼠标经过资源栏目TAG时，变成手型 2015-12-16 15:36:01 +08:00
lizanle 2aa241bffa issue 2015-12-16 11:50:30 +08:00
cxt 5cf88a287b 分组作业提示语的修改 2015-12-16 11:37:59 +08:00
ouyangxuhua 977100e92e 双击资源栏目标签可编辑，编辑标签后更新标签 2015-12-16 11:17:06 +08:00
huang 85d277da0d Merge branch 'develop' into hjq_new_course 2015-12-16 10:54:11 +08:00
huang 98d0e6d411 版本库“提交明细” 2015-12-16 10:53:28 +08:00
lizanle 02a9f08fe6 表单长度对齐 2015-12-16 10:19:48 +08:00
huang ac8aa9e0a6 解决作业留言和课程留言导致的bug 2015-12-16 10:03:51 +08:00
huang 41bb37d6d4 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb

解决冲突
 2015-12-16 10:02:08 +08:00
huang 06e5784436 解决英雄榜两个用户同时存在的but 2015-12-16 10:00:10 +08:00
lizanle 47a9be132a 详情和编辑页面 2015-12-16 09:31:11 +08:00
ouyangxuhua 8d7a84285b 资源栏目在搜索结果中，更新相应的tag数量 2015-12-16 09:28:55 +08:00
ouyangxuhua 704954583b 资源栏目新增Tag后，更新相应的tag数量 2015-12-16 09:15:54 +08:00
lizanle 8d1003770a 在本页面重复修改的时候，由于edit页面没有更新，导致issue更新触发乐观锁。lock_version比数据库记录存在的lock_version更低，所以回滚。 2015-12-15 23:01:54 +08:00
cxt 097d0653ba 注释掉给未答题的学生0分的代码 2015-12-15 20:33:29 +08:00
cxt 481b7b96eb 正式版报500 2015-12-15 20:15:10 +08:00
lizanle 68aceaa7df issue下载 2015-12-15 18:43:58 +08:00
cxt fa4a2eb0dd 未答题的学生测验分数为0 2015-12-15 18:37:00 +08:00
lizanle b7ae8d866f Merge remote-tracking branch 'origin/dev_zanle' into dev_zanle 2015-12-15 18:12:49 +08:00
lizanle ef2f142f62 论坛资源允许下载 2015-12-15 18:12:32 +08:00
cxt f7a932d7b9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2015-12-15 17:37:28 +08:00
ouyangxuhua dc45321454 组织文章二级回复代码被覆盖，恢复代码 2015-12-15 17:34:40 +08:00
cxt 44ce4fe592 多次点击留言不会重复提交 2015-12-15 17:34:08 +08:00
cxt 45726576cf 学生测验列表的点击 2015-12-15 17:31:27 +08:00
ouyangxuhua af157a9c63 组织资源栏目增加标签功能 2015-12-15 17:30:24 +08:00
cxt 086cfa3867 学生列表不可点击 2015-12-15 16:51:21 +08:00
guange 4ce9eb428e at样式问题 2015-12-15 16:28:11 +08:00
cxt 90c7822c38 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2015-12-15 16:06:59 +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 d6c2b95858 学生测验列表的提示信息 2015-12-15 16:02:10 +08:00
cxt 0215e5e38c 若测验已截止且学生已提交则在测验列表后面显示“已答” 2015-12-15 15:37:57 +08:00
cxt 0deffdba33 在线测验学生答题时可点击保存也可点击提交 2015-12-15 15:21:52 +08:00
Tim b687c42de3 Merge branch 'dev_zanle' of https://git.trustie.net/jacknudt/trustieforge into dev_zanle 2015-12-15 15:01:21 +08:00
Tim b761121f9f "指派给"颜色更换 2015-12-15 15:00:24 +08:00
guange da5709e3f0 . 2015-12-15 14:52:24 +08:00
cxt 0b25f36a7f 在线测验再次编辑时默认隐藏头部编辑块 2015-12-15 14:39:32 +08:00
ouyangxuhua d9df926c2b 组织添加项目/组织弹窗，点击取消后，关闭弹窗。 2015-12-15 10:47:35 +08:00
cxt 1f4454d908 课程左侧的在线测验统计数 2015-12-15 10:43:43 +08:00
ouyangxuhua 3efb36a28e 在组织非资源栏目页面中，添加资源后跳转至资源栏目页面。 2015-12-15 09:59:11 +08:00
guange 8d797c5c0b 项目动态添加at 2015-12-15 09:09:41 +08:00
huang ea1849e51f 去掉邮件token值 2015-12-15 09:09:26 +08:00
lizanle 88c2db47b7 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/helpers/application_helper.rb
 2015-12-15 08:48:08 +08:00
guange 4f57e48b92 merge 2015-12-14 18:20:32 +08:00
guange d1315e35b5 merge 2015-12-14 17:26:40 +08:00
guange f61f639af2 转换为remote js 2015-12-14 17:13:57 +08:00
cxt 2b5bf9540d 关闭了匿评再补交作品，给学生的提示信息中“当前作业已开启匿评...”改为“当前作业已关闭匿评...” 2015-12-14 17:11:07 +08:00
cxt 438ae82980 非课程学生不能关联项目 2015-12-14 17:02:44 +08:00
ouyangxuhua a5fa68c928 资源栏目增加资源 2015-12-14 16:41:18 +08:00
cxt 85b11010d2 在线测验报500、 学生看不到已截止的测验、测验列表的样式调整 2015-12-14 16:18:39 +08:00
lizanle f3013ca3e7 修改了搜索的提示描述 2015-12-14 11:22:36 +08:00
lizanle c5f903146d 博客资源下载问题 2015-12-14 11:19:43 +08:00
lizanle 9aebafee09 课程添加更新时间 2015-12-14 11:11:09 +08:00
lizanle 14912078ee 博客资源允许下载 2015-12-14 11:03:04 +08:00
ouyangxuhua b72cc82e4d 组织资源栏目添加文件标签功能 2015-12-14 10:59:32 +08:00
lizanle 85e2eab8c3 发送资源 2015-12-14 10:57:17 +08:00
huang 5ca8d4cd66 修改http链接自动换域名 2015-12-14 10:54:37 +08:00
lizanle c004b05991 资源库搜索 sql注入 2015-12-14 10:52:19 +08:00
lizanle f6867068f5 项目 帖子 更新时间 
资源 下载次数
用户 最后登陆时间
 2015-12-14 10:27:30 +08:00
ouyangxuhua 0602a03e12 组织资源类型的栏目，增加搜索功能 2015-12-14 10:26:34 +08:00
lizanle 9b86ec3044 更新时间 2015-12-14 10:07:55 +08:00
cxt eb8e9f32a3 作品列表的私有项目不可点击 2015-12-14 10:06:19 +08:00
guange 91b245ad2c lastname为空时也可以加,可以省掉查询extensions的语句 2015-12-12 18:06:59 +08:00
lizanle 7c114e1a13 Merge remote-tracking branch 'origin/szzh' into szzh 2015-12-11 19:34:29 +08:00
lizanle f028992a18 帖子搜索 2015-12-11 19:34:17 +08:00
cxt 7a0828a826 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-11 19:13:43 +08:00
cxt 502310425b 匿评成绩为空 2015-12-11 19:13:34 +08:00
huang a791c39b4b Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-11 18:12:25 +08:00
cxt dfd0c95f2a Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-11 18:11:48 +08:00
huang 616679e9c1 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-11 18:07:57 +08:00
cxt 42f0fc62e9 分组成员不能修改作品 2015-12-11 18:07:30 +08:00
cxt 1d2b6165ef 分组作业报500 2015-12-11 18:00:55 +08:00
huang 6b9a612594 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2015-12-11 17:58:37 +08:00
huang 0ac4821f14 修改密码导航栏错误 2015-12-11 17:56:26 +08:00
lizanle df1d1a4685 论坛上传资源没有保存成功 2015-12-11 17:54:07 +08:00
cxt 1674391e4b 若删除追加的附件，则“追加附件”字样及“追加时间”也应删除 2015-12-11 17:39:34 +08:00
ouyangxuhua c2d21b5a6b 隐藏组织栏目资源列表 2015-12-11 17:11:11 +08:00
cxt e5192c7b1a 记录学生作品的提交和编辑记录 2015-12-11 17:02:34 +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 be590497b9 组织文章设为首页后，跳转至首页 2015-12-11 16:58:00 +08:00
cxt 6c9a139450 编辑分组作业的作品报500 2015-12-11 16:36:19 +08:00
cxt ac77f0d40a 点击学号、班级也要弹出答题详情页面 2015-12-11 16:35:43 +08:00
ouyangxuhua e98338bf22 栏目增加资源类型，可以添加文件、删除文件、显示文件等 2015-12-11 16:30:50 +08:00
cxt d4bde8e73c 调整学生作品列表的样式 2015-12-11 16:05:18 +08:00
lizanle b178fb7f0a 消息提醒 病句 2015-12-11 15:56:37 +08:00
huang b981f3dcea 修复项目删除403问题 
课程回复的时候不显示删除按钮
 2015-12-11 15:39:38 +08:00
lizanle abc0598ed2 Merge remote-tracking branch 'origin/szzh' into szzh 2015-12-11 15:37:14 +08:00
lizanle 03318aac97 登录名不可修改要变成灰色 2015-12-11 15:36:59 +08:00
cxt c6470bc69b 提交作品选择分组成员时若某一个学生已加入到其他分组则不可选择 2015-12-11 15:31:15 +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
cxt a3715051b1 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-11 14:59:13 +08:00
cxt f880ccd749 分组作业 2015-12-11 14:57:09 +08:00
lizanle ec79ed04ee Merge branch 'szzh' into dev_zanle 2015-12-11 14:47:32 +08:00
lizanle b6607f7418 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-11 14:46:48 +08:00
huang f2b8335912 移出成员时，删除项目后没有关联删除而引起的400问题 2015-12-11 13:48:52 +08:00
huang fed989753a 修复林处账号不能查看消息的问题 2015-12-11 13:46:23 +08:00
huang 75fecc0402 项目删除功能 
项目删除权限
课程列表用户颜色
 2015-12-11 12:53:01 +08:00
huang 9c472b9358 课程成员列表乱的问题 2015-12-11 11:23:02 +08:00
huang 35c918cb40 Merge branch 'hjq_new_course' into develop 2015-12-11 11:02:09 +08:00
huang fbd1b2f541 用户留言重复提交问题 2015-12-11 10:53:14 +08:00
huang 01b21ceda1 项目留言重复提交问题 2015-12-11 09:52:17 +08:00
huang 1ba0dae3c4 修复课程留言重复提交问题 2015-12-11 09:42:19 +08:00
cxt ba5d72b315 管理员查看在线测验的权限 2015-12-11 09:18:12 +08:00
huang 670df76c70 注释掉项目邀请加入功能 2015-12-10 20:24:42 +08:00
huang 9710731a2c 课程配置添加登录名 2015-12-10 20:03:59 +08:00
huang c7b2c9e3af 课程删除功能 
admin中课程列表取消删除按钮
 2015-12-10 18:59:54 +08:00
huang a9510f4869 Merge branch 'dev_hjq' into develop 2015-12-10 17:29:52 +08:00
huang 4f7f4acb1f 课程删除 2015-12-10 17:26:03 +08:00
ouyangxuhua aab9594ac9 1.解决英文版下，组织成员列表编辑成员显示错误； 
2.解决在组织文章详情页面，删除文章报错的问题
 2015-12-10 17:22:59 +08:00
houxiang 87be2dd7fe modify the repositories_controller.rb conflict 2015-12-10 16:41:18 +08:00
huang fbba933a46 Merge branch 'hjq_new_course' of http://git.trustie.net/jacknudt/trustieforge into hjq_new_course 2015-12-10 16:09:42 +08:00
huang be940ee3aa Merge branch 'develop' into hjq_new_course 2015-12-10 16:09:36 +08:00
houxiang e9cfe007bb modify by hx 2015-12-10 15:59:31 +08:00
huang dbadbf8621 修改密码gitlab同步 2015-12-10 15:54:44 +08:00
ouyangxuhua 0a85fbf613 1.配置栏目列表，增加类型一列； 
2.暂时隐藏类型为“资源”的栏目的链接
 2015-12-10 15:53:05 +08:00
huang 74fe2607f3 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2015-12-10 10:58:34 +08:00
ouyangxuhua 1e652faec7 Merge branch 'develop' into dev_hjq 2015-12-10 10:55:59 +08:00
huang 4e0b442309 修改邮箱的时候同步到gitlab 2015-12-10 10:50:15 +08:00
lizanle 7f866a0b3a 课程被删除后不能被搜索 2015-12-10 10:00:14 +08:00
ouyangxuhua 2f7260cba2 1.在栏目表中增加field_type(类型)字段； 
2.在组织配置-》栏目，增加栏目类型。
 2015-12-09 17:24:59 +08:00
huang db582fd639 修改不同分支之间的显示最新提交状态 2015-12-09 17:08:03 +08:00
huang f2c1595d0d 1、同步没成功检测程序 
2、注册验证修改
 2015-12-09 16:57:12 +08:00
cxt 4e04df7a8a 分组作业的动态显示及关联项目 2015-12-09 16:33:48 +08:00
ouyangxuhua 78fb8b6254 1.编辑或者删除栏目的帖子返回对应页面 2015-12-09 16:19:52 +08:00
lizanle 2fbad38522 优化排序参数 
用于排序的字段最好不要分词
不然就是多值字段的排序会浪费大量的内存
 2015-12-09 12:57:25 +08:00
cxt f2f81d5243 作品列表的代码缩进 2015-12-09 10:52:56 +08:00
ouyangxuhua 333c0e41a0 1.栏目增加新建帖子功能； 
2.点击某栏目，显示相应的动态；
3.编辑栏目里的文章后，返回相应的栏目动态。
 2015-12-09 10:48:15 +08:00
cxt 53f9141cf1 分组作业动态 2015-12-09 10:29:54 +08:00
lizanle 6c02115f3f 不允许修改登录名 2015-12-09 10:17:30 +08:00
guange 3476731b83 将at js data整合到文件中 2015-12-09 09:59:13 +08:00
lizanle c1d82d6348 输入框 和 ke对齐 2015-12-09 09:39:07 +08:00
ouyangxuhua 09f0d0201e 组织增加栏目发帖功能 2015-12-09 09:23:22 +08:00
cxt a9f6e817b4 分组作业关联项目 2015-12-08 17:37:15 +08:00
cxt c26778b41c 分组作业关联项目 2015-12-08 17:36:35 +08:00
huang ac9f13c842 Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange 
Conflicts:
	app/views/repositories/show.html.erb
	db/schema.rb

处理冲突
 2015-12-08 17:13:50 +08:00
huang 916d99be82 课程删除功能 2015-12-08 16:45:26 +08:00
houxiang 56cb83ffba 版本库首页没有统计commit_count，具体的详情页在开始统计 2015-12-08 15:56:31 +08:00
lizanle 92bc3361fe 匿评失败消息改变 2015-12-08 15:33:17 +08:00
ouyangxuhua 1881e18742 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-12-08 15:31:17 +08:00
ouyangxuhua bb7bcf46a9 1.设置首页后，跳转至组织首页 2015-12-08 15:30:58 +08:00
huang 42f5b86d95 添加字段删除课程 2015-12-08 10:32:10 +08:00
huang 7c34122ff6 fork的时候如果用户没有同步，则自动同步 2015-12-08 09:46:29 +08:00
huang 068c305c06 Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course 
Conflicts:
	app/views/courses/member.html.erb
	app/views/courses/settings.html.erb
	app/views/repositories/show.html.erb
	db/schema.rb

处理冲突
 2015-12-08 09:10:21 +08:00
lizanle 5fcbde2ff1 资源库监听回车键 2015-12-07 17:29:14 +08:00
ouyangxuhua 8b14e7c549 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-07 17:19:52 +08:00
ouyangxuhua 5198f4dde4 Merge branch 'dev_hjq' into develop 2015-12-07 17:19:26 +08:00
ouyangxuhua 9d6b4783df 删除组织配置栏目的组织首页项 2015-12-07 17:18:46 +08:00
ouyangxuhua a8b7d1b81f 回复项目里的message,不增加项目动态及组织动态 2015-12-07 17:11:30 +08:00
huang 91fa3f6fab 解决项目样式冲突问题 2015-12-07 16:52:23 +08:00
lizanle ee661bb6d4 input光光标到最后的折中解决方案 2015-12-07 16:21:00 +08:00
ouyangxuhua e45ce0fb95 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-12-07 15:52:32 +08:00
lizanle 9e01f02a66 作业题目统一改为作业标题 
作业匿评截止消息改造
 2015-12-07 15:52:22 +08:00
ouyangxuhua 76db95aa03 1.组织页面中，退出后刷新组织页面； 
2.组织页面中，点击“个人主页”，打开新的页面；
3.组织页面页首部分，用户名不链接用户页面。
 2015-12-07 15:52:13 +08:00
lizanle ad2d9fa374 添加对帖子的全文搜索 2015-12-07 15:32:57 +08:00
cxt cb7ad682cf Merge branch 'develop' into cxt_course 2015-12-07 15:21:43 +08:00
cxt c8f4149206 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-07 15:18:43 +08:00
cxt 8e999ed9f0 作业动态的回复删除功能只在鼠标进入时显示 2015-12-07 15:18:32 +08:00
huang 5eb249515c 版本库显示样式 2015-12-07 15:12:30 +08:00
guange 57d05d147e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-12-07 15:06:15 +08:00
guange 71a5504017 去除at功能,合并 2015-12-07 15:05:51 +08:00
huang 9ff41c214b Merge branch 'develop' into dev_hjq 2015-12-07 14:40:25 +08:00
ouyangxuhua 9f30c7a44e 如果用户没有登陆，不能在组织页面中，增加项目或课程。 2015-12-07 14:37:35 +08:00
ouyangxuhua 7057a4cfea 组织页首增加退出功能 2015-12-07 14:31:08 +08:00
lizanle ef2ef7111c 添加对帖子的全文搜索 2015-12-07 14:31:05 +08:00
guange 1a2aff99be 调整显示的格式 2015-12-07 14:18:01 +08:00
guange 0c7db76371 tag没闭合的错误 2015-12-07 13:54:52 +08:00
ouyangxuhua c229104d78 修改编辑组织标题 2015-12-07 13:03:21 +08:00
ouyangxuhua 5034ddb4b6 修复组织的bug 2015-12-07 12:53:51 +08:00
cxt 79ce5c9ac5 匿评已结束时作业动态的作品按钮显示成“查看作品” 2015-12-07 11:31:37 +08:00
cxt 73e9a00a1a 作业动态添加回复的删除功能 2015-12-07 11:25:41 +08:00
cxt 0472a5ed0c Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-07 10:54:28 +08:00
cxt a62ecc10ad 作业动态设置评分后无法刷新 2015-12-07 10:54:18 +08:00
huang ab1c945a30 修改版本库库权限 
自己不能fork自己的项目
 2015-12-07 10:34:10 +08:00
Tim 75d79c6c47 问题跟踪样式调整 2015-12-07 10:14:39 +08:00
huang f67386e8a0 组织模块丢失代码还原 2015-12-07 10:06:51 +08:00
cxt b61a0a98e5 Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/student_work/new.html.erb
	app/views/users/_user_homework_form.html.erb
	db/schema.rb
	public/stylesheets/courses.css
 2015-12-07 09:47:18 +08:00
guange 3d2ac4b59f KE引用统一使用import_ke 2015-12-06 15:03:36 +08:00
guange af31946586 issue列表开启AT功能 2015-12-06 15:03:12 +08:00
huang bd3d0547f5 组织样式修改 2015-12-05 14:34:16 +08:00
ouyangxuhua 4c9d9dee35 组织首页样式 2015-12-05 13:27:58 +08:00
ouyangxuhua 108865968b Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-12-05 12:01:49 +08:00
ouyangxuhua 12c57e7e4b 将Jquery引入组织首页 2015-12-05 12:01:04 +08:00
huang 9d68fd7d28 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-12-05 11:39:50 +08:00
huang 9d7bc17115 Merge branch 'develop' into dev_hjq 2015-12-05 11:39:40 +08:00
ouyangxuhua 37a7abea53 组织首页 2015-12-05 11:31:20 +08:00
ouyangxuhua 01b82e59d8 实现组织首页功能 2015-12-05 11:30:05 +08:00
ouyangxuhua 5b0bdb5069 修改组织栏目的内容及样式 2015-12-04 18:19:35 +08:00
huang c7058e6bbf Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-04 17:45:18 +08:00
huang 4cb58211ad 邮件消息提示语修改 2015-12-04 17:44:46 +08:00
ouyangxuhua ab4d0e4678 组织界面增加分栏 2015-12-04 17:34:48 +08:00
huang 6fad26cabf 去死奥placebold 2015-12-04 17:32:56 +08:00
cxt 8b160b1c38 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-04 17:29:55 +08:00
cxt 19c34de643 编辑作品时弹出的作品确认框不提供重试的按钮 2015-12-04 17:29:39 +08:00
huang 120a7274d3 fork样式显示 2015-12-04 17:22:22 +08:00
huang c72cf55564 Merge branch 'develop' into szzh 2015-12-04 16:43:48 +08:00
huang 61d76e6744 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-04 16:42:55 +08:00
lizanle 4c00312f45 Merge branch 'szzh' into dev_zanle 2015-12-04 16:42:02 +08:00
huang 9716e99533 课程成员提交“修改角色” 2015-12-04 16:33:56 +08:00
huang 7daaa59010 Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange 2015-12-04 16:22:02 +08:00
huang b6edabed9c 修改角色 2015-12-04 16:21:48 +08:00
cxt 8fe53468e1 作品追加附件 2015-12-04 16:21:11 +08:00
Tim dfa9b4cf74 学生列表调整 2015-12-04 16:13:55 +08:00
huang 4a41039fa6 课程英雄榜改成课程活跃度 2015-12-04 15:58:56 +08:00
huang 4d0956dff1 Merge branch 'develop' into gitlab_guange 2015-12-04 15:54:56 +08:00
huang 9f73807e05 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 
Conflicts:
	db/schema.rb
处理冲突
 2015-12-04 15:54:18 +08:00
huang c1747ab217 fork重名，提交 2015-12-04 15:49:05 +08:00
lizanle dbfc4969e0 测验消息bug 2015-12-04 15:36:19 +08:00
lizanle e3c594a7ca Merge branch 'develop' into dev_zanle 2015-12-04 10:59:14 +08:00
ouyangxuhua 2855c0e409 修改项目动态，使其与课程动态及个人动态的样式一致，包括有回复框、过滤菜单、宽度、间距等 2015-12-04 10:59:09 +08:00
lizanle 6553559929 发送消息 2015-12-04 10:56:16 +08:00
huang 8f024bdf4d Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 
Conflicts:
	db/schema.rb
 2015-12-04 09:12:24 +08:00
huang 7fe3a02d81 Merge branch 'gitlab_guange' into develop 2015-12-04 09:11:22 +08:00
huang 89b8f7783d 添加forked_form的id 2015-12-04 08:57:29 +08:00
huang 5d18b14e73 Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course 2015-12-04 00:16:21 +08:00
huang 057d9a3337 0 2015-12-04 00:15:47 +08:00
huang 8d891a9faa fork权限 2015-12-03 20:57:09 +08:00
huang b91c65798d 课程成员添加设置 2015-12-03 20:44:29 +08:00
cxt 4e9e7543ba chrome浏览器点击保存测验头部信息无反应 2015-12-03 19:21:35 +08:00