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

1284 Commits

Author SHA1 Message Date
ouyangxuhua 66bf50098a 增加组织/个人屏蔽项目/课程动态功能 2016-01-08 14:12:55 +08:00
cxt 2d73933f4f 已经删除了的课程还显示在新建作业的发布课程列表中 2016-01-08 09:46:07 +08:00
huang e56382a899 tag云ajax更新后自动刷新 2016-01-07 17:15:19 +08:00
cxt 151c08ac5c 复制学期 2016-01-07 15:29:25 +08:00
huang d0a8b4bc18 项目资源云搜索 2016-01-06 18:07:35 +08:00
huang 0a1aa9e569 Merge branch 'develop' into hjq_new_course 
Conflicts:
	db/schema.rb
	public/stylesheets/public.css
 2016-01-06 09:27:00 +08:00
cxt f52dc37a76 作业动态添加作品评阅和作品提交消息 2016-01-05 11:29:30 +08:00
huang 81bb35ac49 项目资源库 资源列表 2016-01-05 10:01:56 +08:00
lizanle d26b51c982 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/controllers/organizations_controller.rb
	db/schema.rb
 2015-12-31 15:44:57 +08:00
ouyangxuhua 358510a2e6 解决组织配置资源栏目中，增加/删除栏目不能更新的问题 2015-12-31 14:55:41 +08:00
ouyangxuhua 806e4caf5a 1.增加隐藏组织栏目功能；2.未登录情况，隐藏部分内容。 2015-12-31 13:26:28 +08:00
lizanle be146a9421 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/controllers/organizations_controller.rb
	db/schema.rb
	public/stylesheets/courses.css
	public/stylesheets/public.css
 2015-12-31 11:11:38 +08:00
lizanle 1d0e6e1c5c 课程发送资源 以及 项目发送资源 2015-12-30 09:37:16 +08:00
lizanle 3b08adfc68 课程资源页面修改。 2015-12-27 23:24:21 +08:00
huang a92d33300b 里程碑 添加 “已解决”，区分已解决和已关闭 2015-12-24 17:18:52 +08:00
huang f7f03b2094 0 2015-12-24 16:10:41 +08:00
huang 8639609832 切换分支--暂时待处理 2015-12-24 15:42:05 +08:00
huang 055fac5e27 修改项目得分 2015-12-23 17:29:40 +08:00
huang 00711f1100 issue编辑、添加邮件中去掉token 2015-12-23 16:12:23 +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
huang 747493993b 上线测试 2015-12-18 19:57:08 +08:00
huang e673540323 还原提交次数 2015-12-18 18:51:29 +08:00
huang 4dda355d2e 测试版 2015-12-18 18:28:20 +08:00
guange e02b865fa6 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 17:09:01 +08:00
guange 57b1c0c7d8 at是否开启加入到配置 2015-12-18 17:02:50 +08:00
huang 8a53978d23 项目得分更新 2015-12-18 14:51:33 +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
cxt 0ed58d4898 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-17 19:07:17 +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
ouyangxuhua ef46191c80 Merge branch 'szzh' into dev_hjq 2015-12-17 17:42:48 +08:00
guange fc63dfcb7b 消息通知 2015-12-17 15:14:52 +08:00
ouyangxuhua de229c0f1c 组织资源栏目的文件可以被引用至当前组织下的资源栏目 2015-12-17 14:51:02 +08:00
cxt fa0f9c6751 分组作业的编辑，若分组作业已提交了作品则不可再编辑分组设置 2015-12-17 10:16:29 +08:00
huang bb23049f55 版本库提交次数封装 
提交页面样式修改
 2015-12-16 17:04:17 +08:00
lizanle ef2f142f62 论坛资源允许下载 2015-12-15 18:12:32 +08:00
ouyangxuhua af157a9c63 组织资源栏目增加标签功能 2015-12-15 17:30:24 +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
lizanle c5f903146d 博客资源下载问题 2015-12-14 11:19:43 +08:00
lizanle 14912078ee 博客资源允许下载 2015-12-14 11:03:04 +08:00
ouyangxuhua 0602a03e12 组织资源类型的栏目，增加搜索功能 2015-12-14 10:26: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 42f0fc62e9 分组成员不能修改作品 2015-12-11 18:07:30 +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 f880ccd749 分组作业 2015-12-11 14:57:09 +08:00
cxt 4e04df7a8a 分组作业的动态显示及关联项目 2015-12-09 16:33:48 +08:00
cxt 53f9141cf1 分组作业动态 2015-12-09 10:29:54 +08:00
guange 3476731b83 将at js data整合到文件中 2015-12-09 09:59:13 +08:00
cxt a9f6e817b4 分组作业关联项目 2015-12-08 17:37:15 +08:00
guange 1a2aff99be 调整显示的格式 2015-12-07 14:18:01 +08:00
cxt 79ce5c9ac5 匿评已结束时作业动态的作品按钮显示成“查看作品” 2015-12-07 11:31:37 +08:00
guange af31946586 issue列表开启AT功能 2015-12-06 15:03:12 +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
cxt 8fe53468e1 作品追加附件 2015-12-04 16:21:11 +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 501a8f905b Merge branch 'develop' into szzh 
Conflicts:
	db/schema.rb
	public/stylesheets/courses.css
 2015-11-27 14:56:30 +08:00
huang 36b1649fbd Merge branch 'szzh' into gitlab_guange 
Conflicts:
	db/schema.rb
 2015-11-27 14:49:49 +08:00
huang 1cc6e305ed 完成新功能模块开发： 
1、如果没有成绩则不显示
2、工具框展开没有则不显示
 2015-11-27 13:52:40 +08:00
Gan Yi.ang ee85cc35ed Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange 2015-11-27 11:27:03 +08:00
Gan Yi.ang 1115d54d9a 非trustie用户changesets_latest_coimmit 2015-11-27 11:25:16 +08:00
huang 042b197767 课程英雄榜界面调整 
动作触发的时候更新总分
更换迁移顺序
 2015-11-27 10:49:41 +08:00
cxt 1f2675020b 学生答题未完成时可保存试卷 2015-11-27 10:15:25 +08:00
huang 8c83bbfff3 课程英雄榜数据 2015-11-27 00:48:08 +08:00
huang 061a1f602a 效果实现 2015-11-26 21:17:04 +08:00
huang aca7684414 课程英雄榜 
各模块动作 触发加分
 2015-11-26 18:22:03 +08:00
lizanle 4efb660214 全站搜索 2015-11-26 09:57:53 +08:00
huang c8b1cae947 建立贡献榜表及相关关联 
部分页面
按总分排序（英雄榜）
部分页面（未完成）
 2015-11-25 15:16:33 +08:00
huang 85515befc4 实现工具栏数字大于0显示，小于0隐藏 2015-11-24 17:29:57 +08:00
huang 55ff5f4931 Merge branch 'develop' into gitlab_guange 
Conflicts:
	app/views/projects/settings/_join_org.html.erb
	db/schema.rb
处理冲突
 2015-11-24 09:55:26 +08:00
huang dd148fb7c5 Merge branch 'szzh' into sw_new_course 
Conflicts:
	db/schema.rb
 2015-11-20 20:25:17 +08:00
huang bb726e3475 提交答案验证 2015-11-20 18:21:31 +08:00
cxt eee63b2495 提交前验证数据不为空 2015-11-20 17:25:03 +08:00
huang db46e5e4af 问卷得分统计 2015-11-20 15:13:53 +08:00
huang 3deebf2006 show 2015-11-20 11:08:47 +08:00
huang 21694daa59 多选顺序按小到大排序 2015-11-20 10:05:34 +08:00
huang 08c7eb8d40 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-19 21:21:26 +08:00
huang 81e2827277 解决参数为空的bug 2015-11-19 21:21:02 +08:00
cxt 9aee23507c 学生答题页面、答题结果页面、老师的试卷页面 2015-11-19 21:19:18 +08:00
huang 8cf22767f9 新建问答题 2015-11-18 19:58:00 +08:00
huang 1606e9ddab 0 2015-11-18 18:28:17 +08:00
cxt d83e2e36ae Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-18 16:51:58 +08:00
huang cd2d947cb2 多项选择标准答案 2015-11-18 16:06:34 +08:00
cxt f850a71b59 测验 2015-11-18 15:30:39 +08:00
huang 935b1f9f9e 大写小写问题 2015-11-18 14:50:03 +08:00
huang de17ffa605 区分答案大小写 2015-11-18 14:31:35 +08:00
huang 3efae6bde2 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-18 14:06:38 +08:00
huang 8965775004 show方法修改 2015-11-18 14:06:21 +08:00
cxt 0405d4eee6 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-18 14:05:47 +08:00
cxt 249b15751d 新建多选题 2015-11-18 14:05:29 +08:00
huang 7f5fa7fb6f Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	app/helpers/exercise_helper.rb

解决冲突
 2015-11-18 14:03:17 +08:00
huang deb0f151c4 单选数字转换 2015-11-18 13:55:42 +08:00