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

4238 Commits

Author SHA1 Message Date
huang 0feb1280fd 名师更多列表 
及相关入口路由
 2016-05-13 14:23:36 +08:00
huang 7759670fa1 Merge branch 'yuanke' into develop 
Conflicts:
	Gemfile
	public/stylesheets/new_user.css
 2016-05-13 11:39:01 +08:00
huang f7a888ac3d 名师默认创建 2016-05-13 11:11:09 +08:00
huang 83ac35cc94 不同的组织定制是否允许设置名师榜 2016-05-13 10:29:22 +08:00
huang 37ee03374e 完成设置名师功能 2016-05-13 09:53:22 +08:00
yuanke 6237bcb6cd 加个gem 'certified' 2016-05-13 09:10:08 +08:00
yuanke a39702f962 图片自动上传，代码测试编译错误过长。 2016-05-13 08:38:28 +08:00
cxt 8af0459519 首页动态中不应出现已删除的课程动态 2016-05-12 16:56:50 +08:00
cxt 582c305a47 申请引用过的作业在课程删除后不应该在申请题库中显示 2016-05-12 16:29:39 +08:00
huang ad2f12c9d0 名师列表搜索功能 2016-05-12 15:02:23 +08:00
cxt b3782c5d0c 合并代码 2016-05-12 10:47:07 +08:00
cxt 7481d96166 Merge branch 'develop' into cxt_course 
Conflicts:
	app/controllers/admin_controller.rb
	config/routes.rb
	lib/redmine.rb
 2016-05-12 10:40:35 +08:00
cxt f4b8f2c794 学生追加附件发送消息 2016-05-12 10:29:43 +08:00
huang 922958e732 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-11 16:23:58 +08:00
huang 52c8593b09 组织教师列表sql优化 2016-05-11 16:20:55 +08:00
cxt d4a35b94f6 导出的作品成绩保存为数字格式 2016-05-11 14:51:49 +08:00
huang 43f06c0826 版本库ZIP下载 2016-05-11 13:44:15 +08:00
cxt 9bc8ccbb9e 教辅可只评语不评分 2016-05-11 09:18:55 +08:00
cxt 5baf467d13 作品评分不覆盖 2016-05-10 15:26:08 +08:00
yuanke 629591ad00 课程、项目列表更新时间取动态表中的 2016-05-10 12:55:42 +08:00
yuanke e502aa7c43 KE表格项目问题，自动上传图片做了一点 2016-05-10 12:51:42 +08:00
huang 99d9a28828 名师榜sql查询 2016-05-10 11:33:02 +08:00
cxt d303a06377 首页列表的排序 2016-05-10 11:32:20 +08:00
huang 6474444cc7 用户连接 id变成用户名 2016-05-10 09:00:59 +08:00
cxt f6d7df7393 管理员界面添加“分享作业申请”列表 2016-05-09 18:40:21 +08:00
huang fc36e4c01e 教师列表 2016-05-09 18:10:22 +08:00
cxt 1eb41478b2 课程动态和首页动态中的作业动态实现二级回复 2016-05-09 17:06:10 +08:00
cxt 644e097dc8 定时更新关联项目的作业更新时间 2016-05-09 16:16:03 +08:00
cxt 1b309d4bf0 时间的比较 2016-05-09 10:36:38 +08:00
cxt 7b84c994e0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-09 10:32:48 +08:00
cxt fc95d048a5 作业列表打不开 2016-05-09 10:32:41 +08:00
huang 18b70e9dd3 上线问题 2016-05-06 22:59:46 +08:00
cxt e03bc42c53 Merge branch 'cxt_course' into develop 
Conflicts:
	app/controllers/words_controller.rb
 2016-05-06 22:53:16 +08:00
cxt 2a55d8f0c3 作业的回复更新作业的updated_at字段 2016-05-06 22:23:05 +08:00
cxt 9526962c69 翻页时不更新作业动态 2016-05-06 22:06:24 +08:00
cxt b8f7672424 项目动态的更新时间更新到作业动态中 2016-05-06 22:02:45 +08:00
huang 00d0bc0ce1 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-06 22:02:22 +08:00
cxt b0f407aae5 去掉导出的作业成绩中的作品描述的html代码 2016-05-06 20:19:16 +08:00
huang 0a989daf31 Merge branch 'cxt_course' into develop 
Conflicts:
	app/helpers/application_helper.rb
	public/stylesheets/courses.css
	public/stylesheets/new_user.css
 2016-05-06 18:12:08 +08:00
cxt 620cc83d4b "从题库选用作业"暂时只提供公共作业和我的作业 2016-05-06 17:56:56 +08:00
cxt 10d26f89d9 作业列表的二级回复 2016-05-06 17:36:28 +08:00
huang ae298f9b55 帖子详情页面添加编辑功能 2016-05-06 14:57:36 +08:00
huang a5be092c16 二级目录帖子列表中添加编辑功能 2016-05-06 14:42:13 +08:00
huang df1c70880a Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_homework_repository.html.erb
	public/stylesheets/new_user.css
 2016-05-06 12:22:43 +08:00
huang 572a051b04 Merge branch 'yuanke' into develop 
Conflicts:
	app/controllers/users_controller.rb
	app/views/blogs/_article.html.erb
	app/views/layouts/new_base_user.html.erb
 2016-05-06 11:35:27 +08:00
huang aefcb78926 新base 2016-05-06 10:28:21 +08:00
huang 6e7d20c410 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-06 10:17:18 +08:00
huang 9e0176bc55 Merge branch 'hjq_beidou' into develop 
Conflicts:
	app/controllers/organizations_controller.rb
	app/helpers/organizations_helper.rb
	db/schema.rb
	public/images/homepage_icon.png
	public/stylesheets/new_user.css
 2016-05-06 10:16:56 +08:00
huang 885b6f6092 隐藏掉“综合”选项，分页每页显示20个 2016-05-06 10:12:30 +08:00
cxt 0fafbffa49 项目的更新加到作业的最后更新时间中 2016-05-06 08:52:54 +08:00
huang d0db711449 编辑功能 2016-05-05 18:47:32 +08:00
huang 02d6186045 二级域名讨论帖子添加删除链接 2016-05-05 16:43:20 +08:00
huang e0c011948c 二级域名的隐藏和显示 2016-05-05 15:16:14 +08:00
yuanke b82a1c1162 讨论区计算回复数的一个BUG 2016-05-05 14:52:58 +08:00
guange 72f5f5b795 加入组织 2016-05-05 14:52:10 +08:00
huang 79cd36f297 二级域名排序 2016-05-05 14:39:27 +08:00
guange 17282083a6 merge 2016-05-05 14:07:37 +08:00
guange 88fd2cbfb6 Merge remote-tracking branch 'origin/develop' into guange_dev 2016-05-05 14:07:29 +08:00
guange dfdd301f2f sso同步登录功能完成 2016-05-05 14:06:47 +08:00
huang 6d28d0becd 二级域名的删除功能 2016-05-05 12:27:35 +08:00
huang 2920f21c95 二级域名编辑功能自动刷新 2016-05-05 11:28:28 +08:00
huang d86fec6f03 模式6没有内容的显示 2016-05-04 19:30:01 +08:00
huang 33bf4fafa6 模式4没有内容的显示情况 2016-05-04 19:12:53 +08:00
huang 04b2aee166 板块一没有图片的显示情况 2016-05-04 18:50:25 +08:00
guange df41f7328f json解析换成rails的 2016-05-04 17:25:24 +08:00
huang 2996daef71 二级域名局部刷新 2016-05-04 17:06:32 +08:00
guange eaad006d17 safe base64 2016-05-04 16:54:12 +08:00
cxt 06586f9e4b 导出作业成绩中添加作品描述的导出 2016-05-04 16:43:37 +08:00
guange e9834f108a 修改pwd 2016-05-04 16:35:39 +08:00
yuanke 9dc92fe817 列表优化 2016-05-04 16:28:40 +08:00
guange ff23df4f12 oss之前不用检验登录 2016-05-04 16:21:53 +08:00
cxt 6c184b9248 题库的分享请求 2016-05-04 16:17:37 +08:00
huang 8dfe95dfd1 配置页面新建二级域名样式 2016-05-04 15:50:53 +08:00
guange e8adcf8cc7 添加sso model 2016-05-04 15:40:18 +08:00
huang 8a14ce004f 以弹框模式显示二级目录 2016-05-04 15:05:54 +08:00
guange 0635c1e98b 添加单点登录controller 2016-05-04 14:05:46 +08:00
cxt 467af47386 私有题库的作业详情页面不显示 2016-05-04 11:13:52 +08:00
huang 578982faba subdomain 404跳转 2016-05-04 11:08:16 +08:00
yuanke 411ae6f89e 1.修改贴吧分页显示问题2列表优化 2016-05-04 11:03:08 +08:00
huang fd543828ac Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	app/controllers/sub_document_comments_controller.rb
	app/views/sub_document_comments/_show_newstyle.html.erb
	app/views/sub_document_comments/show.html.erb
 2016-05-04 09:46:26 +08:00
huang 557e731343 模式二添加回复功能，模式一回复超过三行则隐藏 2016-05-04 09:45:02 +08:00
cxt 70910c5238 “我的作业”中不应出现已删除课程的作业 2016-05-04 09:40:18 +08:00
Tim 399f757811 0 2016-05-04 09:01:51 +08:00
huang 39dd62580a 完成2级目录详情页面 2016-05-03 20:08:40 +08:00
huang a9059c4c2e 帖子添加编辑删除功能 2016-05-03 19:32:38 +08:00
huang 48002eb247 二级目录讨论区添加帖子回复功能 2016-05-03 19:03:28 +08:00
huang 4489bc13d7 课程列表按创建时间排序 2016-05-03 18:17:03 +08:00
yuanke 8b672cc7c3 项目、课程列表增加更新时间 2016-05-03 17:57:24 +08:00
huang 5e8ff06140 Merge branch 'yuanke' into develop 2016-05-03 17:15:46 +08:00
huang a602a6aa63 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_course_message.html.erb
 2016-05-03 17:12:38 +08:00
huang 5fb5a2e8bc 二级域名帖子列表两种形式区分 2016-05-03 16:49:13 +08:00
yuanke 96e7c9d134 新闻排序时间改为更新时间 2016-05-03 16:34:31 +08:00
cxt c49627913b 更改评分设置中的教师优先，评分未更新 2016-05-03 15:12:56 +08:00
yuanke d5805e8103 课程、项目列表不显示已删除的 2016-05-03 11:24:16 +08:00
cxt 6b1137980e 挂起的作业编辑截止日期后报500 2016-05-03 10:58:49 +08:00
cxt 39c2365338 已拒绝的私有作业不可引用 2016-05-03 10:15:09 +08:00
cxt 3f7a391214 课程和项目的排序 2016-04-29 20:45:14 +08:00
yuanke b199a6b8b2 列表人气排序修改 2016-04-29 19:24:20 +08:00
cxt 0bb6d42c80 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-29 19:22:08 +08:00
cxt a9cb556a20 题库的切换报500 2016-04-29 19:21:54 +08:00
cxt b0988dc950 Merge branch 'cxt_course' into develop 2016-04-29 17:57:32 +08:00
cxt 389b75f7ab 申请引用私有作业时发送消息 2016-04-29 17:55:57 +08:00
huang 253189ea7a 帖子列表中添加分页 2016-04-29 16:33:10 +08:00
huang f6c3e89454 二级目录帖子详细页面 2016-04-29 16:14:08 +08:00
cxt 341927506a Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-04-29 15:58:05 +08:00
yuanke 1353c27f64 Merge branch 'yuanke' into develop 
Conflicts:
	app/helpers/application_helper.rb
 2016-04-29 15:54:37 +08:00
yuanke f8abd46ae9 列表修改 2016-04-29 15:52:44 +08:00
cxt 53bf0dcd7a 题库加入所有私有作业、并可通过提交申请来导入私有作业 2016-04-29 15:46:26 +08:00
huang 2b4f16e5f1 二级目录新界面的帖子列表页面 2016-04-29 14:46:40 +08:00
yuanke 1da8288fe7 列表显示修改 2016-04-29 13:42:58 +08:00
huang d8480ea3c6 二级目录内容页面 2016-04-29 11:33:56 +08:00
huang 1685449381 二级目录框架及结构 2016-04-28 17:36:29 +08:00
yuanke f185c59e90 Merge branch 'yuanke' into develop 2016-04-28 14:33:30 +08:00
yuanke 2cb9f0cd05 组织还原 2016-04-28 14:31:40 +08:00
yuanke b3fdc45a04 Merge branch 'yuanke' into develop 
Conflicts:
	app/controllers/student_work_controller.rb
	config/locales/zh.yml
	db/schema.rb
 2016-04-28 12:38:06 +08:00
yuanke dc53b86a4e Merge branch 'cxt_course' into yuanke 
Conflicts:
	app/controllers/student_work_controller.rb
	db/schema.rb
 2016-04-28 10:49:05 +08:00
yuanke 647e6a7f92 Merge branch 'yuanke' into develop 
Conflicts:
	app/views/layouts/new_base_user.html.erb
	config/locales/zh.yml
	db/schema.rb
 2016-04-28 10:45:57 +08:00
huang 9fbf713709 完成组织二级域名 2016-04-27 17:02:44 +08:00
cxt 3aa891acf6 Merge branch 'cxt_course' into develop 
Conflicts:
	app/controllers/student_work_controller.rb
	app/views/praise_tread/_praise.html.erb
	db/schema.rb
 2016-04-27 16:27:55 +08:00
cxt 766026e3cf 教师评分为最终评分 2016-04-27 16:21:35 +08:00
yuanke c357971e8a 课程列表、项目列表等修改 2016-04-27 16:02:52 +08:00
yuanke 4258790453 Merge branch 'hjq_beidou' into yuanke_1 
Conflicts:
	db/schema.rb
	public/stylesheets/project.css
 2016-04-27 14:30:28 +08:00
yuanke dac717bd97 列表左边菜单收缩 2016-04-27 14:12:56 +08:00
cxt 78c7db1150 Merge branch 'weixin_guange' into develop 2016-04-27 10:36:24 +08:00
cxt 0222038899 缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息 2016-04-27 10:28:36 +08:00
yuanke 23f48b7189 项目列表、项目讨论区列表 2016-04-27 09:54:49 +08:00
yuanke 43c1120b19 课程问答区 项目讨论区列表 2016-04-26 15:10:47 +08:00
cxt 49a7e2ce1d 关注和绑定登录后发送欢迎消息 2016-04-26 09:03:01 +08:00
yuanke bb80cad1e3 Merge branch 'yuanke' into yuanke_1 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-04-25 14:03:27 +08:00
yuanke d34b3780c8 课程列表修改 2016-04-25 10:44:46 +08:00
huang c1437bb75b 北斗界面 2016-04-24 14:39:33 +08:00
yuanke f6d09e0554 配置中增加一个 隐藏课程信息的功能 2016-04-24 14:23:08 +08:00
yuanke c8eaf293e7 课程列表 2016-04-24 10:49:33 +08:00
yuanke 81cd30cbda Merge branch 'cxt_course' into yuanke_1 
Conflicts:
	db/schema.rb
 2016-04-23 13:22:28 +08:00
yuanke a4d250e168 博客列表 2016-04-23 13:20:49 +08:00
cxt 379859db67 评分设置 2016-04-22 17:33:49 +08:00
cxt 5695bcdda9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-22 16:33:04 +08:00
cxt e2b18b3f48 作业编辑报500 2016-04-22 16:32:59 +08:00
huang eb0e88d805 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-22 14:21:07 +08:00
yuanke 5c5d212193 博客列表 2016-04-22 13:52:33 +08:00
huang 17b5832df0 Merge branch 'hjq_beidou' into develop 2016-04-22 12:45:05 +08:00
cxt da73d2b004 Merge branch 'cxt_course' into develop 2016-04-22 12:40:20 +08:00
cxt 9b4c275869 作品动态添加追加附件功能 2016-04-22 11:27:30 +08:00
huang aaeec3ab6c 版本库show页面代码简化封装 2016-04-22 10:58:41 +08:00
cxt 4448cb0891 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-21 17:02:04 +08:00
cxt 16348654a5 启用匿评和禁用匿评时修改评分设置 2016-04-21 17:00:30 +08:00
huang cccc2a7eb7 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-21 16:21:49 +08:00
huang ab8c1a0bad Merge branch 'hjq_beidou' into develop 2016-04-21 16:21:39 +08:00
yuanke eddea2eabd Merge branch 'yuanke' into yuanke_1 2016-04-21 14:01:54 +08:00
huang 42076a137d 项目统计添加判断 2016-04-21 11:19:21 +08:00
yuanke 5a5afd6d24 Merge branch 'yuanke' into develop 2016-04-21 11:17:30 +08:00
yuanke d538d1967b 解决管理员界面代码测试列表404的问题 2016-04-21 11:16:32 +08:00
cxt 7a90c0ea10 评分设置修改多项时不应发多条模板消息 2016-04-21 10:51:43 +08:00
yuanke 85055f2a84 博客列表修改 2016-04-21 09:39:21 +08:00
yuanke 8f62cccfd6 Merge branch 'yuanke' into develop 
Conflicts:
	db/schema.rb
 2016-04-20 16:14:26 +08:00
yuanke ff177557c8 修改代码测试列表报500 2016-04-20 16:13:06 +08:00
yuanke 29115bca3a 博客列表修改 2016-04-20 16:12:20 +08:00
yuanke 4182bb5fe7 111 2016-04-20 14:39:38 +08:00
yuanke c6174406fb 数据库语句使用rails已有的 2016-04-20 10:39:07 +08:00
yuanke dc3837da76 Merge branch 'cxt_course' into yuanke 
Conflicts:
	db/schema.rb
 2016-04-20 09:59:37 +08:00
yuanke bc59ce0b60 Merge branch 'yuanke' into develop 
Conflicts:
	db/schema.rb
 2016-04-20 09:55:29 +08:00
yuanke 0f5fe51f97 1.管理员界面代码测试列表的修改 
2.代码查重按钮位置
3.查重结果样式
 2016-04-20 09:51:51 +08:00
huang ade19af9f2 未登录附件不能下载问题 2016-04-19 10:55:17 +08:00
huang 200307ec9f 组织模块访问统计修改 2016-04-19 09:18:58 +08:00
yuanke 8c5497ac45 Merge branch 'yuanke' into develop 2016-04-15 19:21:11 +08:00
yuanke fcfd17c8c9 修改代码评测的一个BUG 2016-04-15 19:20:24 +08:00
yuanke 5aba3fb11b 修改查重有时候失败的问题 2016-04-15 18:48:39 +08:00
cxt 51478bd232 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-15 17:21:07 +08:00
cxt b07c3947d6 Merge branch 'cxt_course' into develop 2016-04-15 17:20:55 +08:00
yuanke 3dbedcdcbf Merge branch 'yuanke' into develop 
Conflicts:
	db/schema.rb
 2016-04-15 17:08:51 +08:00
yuanke 764dffd95e 动态里面加上代码查重 2016-04-15 17:07:38 +08:00
cxt eeecc5ad08 禁用匿评的作业点击评分设置时不应出现缺评扣分的选项 2016-04-15 17:06:45 +08:00
huang 16bba76f61 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-15 16:52:15 +08:00
huang 6027b6d0f5 Merge branch 'hjq_beidou' into develop 
Conflicts:
	db/schema.rb
 2016-04-15 16:51:37 +08:00
huang 5e5f677bab 动态中显示默认分支的统计 2016-04-15 16:50:39 +08:00
huang a21200ab14 动态中添加分支 2016-04-15 15:53:29 +08:00
cxt 9fdd229b2c Merge branch 'cxt_course' into develop 2016-04-15 15:45:54 +08:00
huang 4a8d572cb1 项目动态中版本库统计样式 2016-04-15 15:38:08 +08:00
cxt 7f3fcb7d01 精品课程列表中的全部课程可点击动态数排序 2016-04-15 14:54:17 +08:00
yuanke f1090d45ad Merge branch 'cxt_course' into yuanke 
Conflicts:
	db/schema.rb
 2016-04-15 14:13:44 +08:00
huang 40b45ce1b4 版本库动态中统计改成从数据库获取 2016-04-15 12:24:54 +08:00
cxt 36e8b05f9c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-15 11:32:38 +08:00
cxt bca0a4bf39 Merge branch 'cxt_course' into develop 2016-04-15 11:32:24 +08:00
yuanke e58f1ab94b Merge branch 'yuanke' into develop 2016-04-15 11:29:40 +08:00
yuanke 998106b37b 修改代码查重的一些弹框显示效果等问题 2016-04-15 11:28:20 +08:00
cxt 143f3f8f9a 管理员界面增加精品课程的设置 2016-04-15 11:26:56 +08:00
cxt 3b4f6f4846 添加分班和修改分班名称时刷新学生列表 2016-04-14 17:24:56 +08:00
cxt 2d4f724e33 导出的学生列表作品排序按作业发布时间升序排列 2016-04-14 15:01:18 +08:00
cxt d91d2bfa17 作业下拉列表显示全部作业 2016-04-14 14:45:42 +08:00
huang fddf03d80c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-14 13:44:14 +08:00
huang 7d8715e82b Merge branch 'hjq_beidou' into develop 2016-04-14 13:43:58 +08:00
huang 2a00c4ddd7 版本库统计show权限统计 2016-04-14 13:39:19 +08:00
cxt d948536a10 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-14 12:33:15 +08:00
cxt e5b07c6c12 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-04-14 12:33:11 +08:00
cxt 19861ba8c6 超级管理员的组织可关联所有公开课程和项目 2016-04-14 12:30:33 +08:00
yuanke ef4b256313 Merge branch 'yuanke' into develop 
Conflicts:
	app/models/homework_common.rb
	config/locales/zh.yml
	db/schema.rb
 2016-04-14 11:32:35 +08:00
cxt 5e1284605f Merge branch 'hjq_beidou' into cxt_course 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-04-14 11:29:26 +08:00
yuanke a8dce5e520 代码查重功能增加,管理员界面增加代码测试列表. 2016-04-14 11:29:22 +08:00
huang c87611dfec 动态中添加版本库统计 2016-04-14 11:18:17 +08:00
huang acf4e15f09 统计数左侧刷新 2016-04-14 10:26:25 +08:00