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

2128 Commits

Author SHA1 Message Date
cxt cecf917764 从题库选用作业时增加提示：“您选中的题是“我收到的作业”，不能选用” 2016-08-03 15:00:16 +08:00
yuanke a34272027e 微信菜单及项目班级审核修改 2016-08-03 14:55:54 +08:00
huang be081f5c66 添加Api（提交内容，改动）及相关方法路由 2016-08-03 13:57:59 +08:00
yuanke 4ab2427827 微信项目及课程申请审核相关功能 2016-08-03 09:37:24 +08:00
guange a1d3bbbfa9 解决ruby2.3执行sql出错的bug 2016-08-01 19:17:16 +08:00
guange fc38ef6a3f 增加了一个查看服务器内网ip的middleware，利于以后分析问题，headers为X-Response-Ip 2016-08-01 19:16:51 +08:00
huang 3660f8cbce gitlab相关方法的封装 2016-08-01 17:38:37 +08:00
huang b718803bd9 修改控制器名称及控制器查询访问权限 2016-08-01 16:54:31 +08:00
huang 96b04f39b1 pull requests框架搭建（路由控制器、views） 2016-08-01 15:33:47 +08:00
daiao 911a769670 Merge branch 'develop' into dev_shcool 
Conflicts:
	app/models/applied_message.rb
 2016-07-29 22:05:56 +08:00
daiao 5b93d40f67 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/assets/wechat/app.html
	public/assets/wechat/new_project.html
	public/javascripts/wechat/directives/ellipsis.js
	public/stylesheets/weui/weixin.css
 2016-07-29 22:03:45 +08:00
daiao 39478eb4e4 Merge branch 'dev_shcool' of https://git.trustie.net/jacknudt/trustieforge into dev_shcool 
Conflicts:
	app/views/admin/applied_schools.html.erb
	app/views/admin/has_applied_schools.html.erb
 2016-07-29 21:50:19 +08:00
huang 847cae6d41 Merge branch 'develop' into rep_quality 
Conflicts:
	app/models/applied_message.rb
	db/schema.rb
 2016-07-29 21:39:00 +08:00
yuanke 1f47eb5ea8 单位申请列表修改 2016-07-29 21:19:09 +08:00
daiao 3251890c91 Merge branch 'rep_quality' into dev_shcool 
Conflicts:
	app/models/applied_message.rb
	db/schema.rb
 2016-07-29 20:52:18 +08:00
daiao 430a93e4b2 单位名称列表功能代码 2016-07-29 20:48:36 +08:00
cxt e3d538c3fa Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/_course_base_info.html.erb
	db/schema.rb
 2016-07-29 19:39:42 +08:00
cxt 72977886c7 Merge branch 'cs_optimize_txz' into cxt_course 
Conflicts:
	app/views/layouts/_course_base_info.html.erb
 2016-07-29 19:37:15 +08:00
cxt 335b82c046 加入班级的弹框 2016-07-29 19:19:58 +08:00
daiao 5b30036639 单位名称列表功能 2016-07-29 16:11:26 +08:00
huang c07677ef99 项目邀请框架 拒绝消息 2016-07-29 14:49:37 +08:00
cxt a1a2b3dd33 Merge branch 'rep_quality' into cxt_course 
Conflicts:
	db/schema.rb
 2016-07-29 14:36:18 +08:00
cxt 848c56d54e 班级主页身份切换、成员管理页面的多重身份 2016-07-29 14:34:42 +08:00
daiao 6bd9f47222 Merge branch 'dev_shcool' into develop 
Conflicts:
	db/schema.rb
 2016-07-28 20:02:57 +08:00
daiao 50ec127c5b 单位名称列表功能 2016-07-28 20:01:22 +08:00
yuanke 14d0a91b0b 修改下微信菜单 2016-07-28 19:05:52 +08:00
yuanke 1489ab015a 微信模版消息标题加上句号 2016-07-28 17:55:37 +08:00
yuanke 93844e757c 微信：角色配置后返回角色界面、修改开发为开放、创建项目发送消息项目名称修改 2016-07-28 17:26:57 +08:00
yuanke 20d9e613b6 正式、测试版配置 2016-07-28 15:39:27 +08:00
yuanke 6d594cfcbe git pull后重新commit 2016-07-28 15:11:04 +08:00
yuanke cf65e6748b 微信项目相关功能开发，班级角色功能等 2016-07-28 14:49:45 +08:00
huang 4a9eec0cce 完成项目邀请及公共弹框的封装 2016-07-28 14:42:36 +08:00
huang c6bc5c9cb8 Merge branch 'dev_shcool' into rep_quality 
Conflicts:
	db/schema.rb
 2016-07-28 10:19:37 +08:00
huang 7413298aad 项目邀请码申请及弹框 2016-07-28 10:18:35 +08:00
huang 29edd60ce6 Merge branch 'daiao_dev' into dev_shcool 2016-07-27 10:54:38 +08:00
daiao 9e788c9b6f 单位批准及消息框架搭建 2016-07-27 10:46:48 +08:00
cxt 1f8fa1c70a 班级动态去掉“>” 2016-07-26 17:16:42 +08:00
cxt feb45a07bf 课程列表分为我创建的课程和我加入的课程 2016-07-26 16:45:36 +08:00
huang 463c09f02c 项目邀请弹框 2016-07-26 08:55:07 +08:00
daiao 5883b451ca 在管理员界面添加单位名称列表 2016-07-25 18:31:28 +08:00
guange 652e56dec4 忽略wechat.yml 2016-07-25 18:16:47 +08:00
guange 6a871e2116 . 2016-07-25 17:09:14 +08:00
yuanke b9b9a867f4 项目 2016-07-25 15:20:01 +08:00
huang 84d1adbf25 生成邀请码 2016-07-25 14:36:52 +08:00
cxt 0564ddb6ea 课程大纲的回复 2016-07-25 13:56:26 +08:00
huang 35172dab59 管理员界面单位申请框架 2016-07-25 10:59:08 +08:00
daiao 9ff728f080 Merge branch 'develop' into daiao_dev 
Conflicts:
	app/views/layouts/_syllabus_base_info.html.erb
 2016-07-25 10:03:50 +08:00
huang 0e1a52726f Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/base_syllabus.html.erb
 2016-07-22 16:46:01 +08:00
cxt 9422e2886c 新版班级主页 2016-07-22 15:32:37 +08:00
yuanke d975067e13 微信正式版配置 2016-07-21 17:52:52 +08:00
cxt 71b5fe1273 Merge branch 'develop' into cxt_course 
Conflicts:
	app/controllers/issues_controller.rb
	app/views/issues/_issue_replies.html.erb
	app/views/issues/_issue_reply_ke_form.html.erb
	db/schema.rb
 2016-07-21 14:31:43 +08:00
daiao b7cf7a2468 Merge branch 'develop' into daiao_dev 2016-07-21 09:55:47 +08:00
cxt 7853b8aa54 班级通知、项目新闻、帖子栏目通知的动态和详情页的二级回复， 二级回复代码的整合 2016-07-20 17:00:18 +08:00
daiao 03d6afd1c4 优化上周动态获取代码 2016-07-18 15:52:04 +08:00
yuanke b2f9839d13 微信：测试版菜单 2016-07-18 14:43:54 +08:00
yuanke fea8d56d8d 修改为测试版配置 2016-07-18 14:28:45 +08:00
yuanke ff13d2e572 微信增加作业发送，修改发送的权限，修改菜单 2016-07-18 14:24:59 +08:00
yuanke f3d74fcd55 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-18 11:08:09 +08:00
guange cd69149d3a Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-18 11:09:53 +08:00
yuanke 51918e1340 Merge branch 'develop' into weixin_guange 2016-07-18 08:34:42 +08:00
guange 51692eadd6 改进上线流程 2016-07-17 00:49:35 +08:00
yuanke 7fe3f9fe71 配置改为测试版 2016-07-15 20:30:50 +08:00
yuanke cb060e518e 正式版配置 2016-07-15 20:25:08 +08:00
yuanke 6ae57ef23a Merge branch 'weixin_guange' into develop 2016-07-15 19:53:33 +08:00
yuanke 552f1a2709 正式版配置 2016-07-15 19:47:33 +08:00
yuanke 0a1ecd65e8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-07-15 16:31:42 +08:00
cxt 1c967ce569 Merge branch 'rep_quality' into develop 
Conflicts:
	app/views/users/_user_message_system.html.erb
	app/views/users/_user_message_userfeedaback.html.erb
 2016-07-15 15:53:32 +08:00
cxt b7e6725e1f 管理员界面的课程名称双击可点击 2016-07-15 14:48:39 +08:00
guange 0e415fffff merge 2016-07-15 14:48:10 +08:00
guange 8c2ae92d31 加入性能分析 2016-07-15 14:45:01 +08:00
huang 3485d48163 Merge branch 'develop' into rep_quality 
Conflicts:
	app/controllers/quality_analysis_controller.rb
 2016-07-14 14:08:03 +08:00
yuanke 3c426c8d15 微信中英文逗号修改 2016-07-14 09:52:02 +08:00
daiao dcc37ef847 增加作品查看界面中，班级查询条件下，增加暂无分班的查询条件 2016-07-13 16:58:31 +08:00
yuanke 3700f437cb 测试版微信配置 2016-07-13 09:45:30 +08:00
yuanke 824f9d9174 新增创建班级的模版消息 2016-07-12 17:00:01 +08:00
huang e766adf087 add delete to qa 2016-07-12 16:23:30 +08:00
guange f5b4bc3e43 merge 2016-07-09 09:23:19 +08:00
guange 0984c389ae 菜单配置 2016-07-09 09:20:00 +08:00
yuanke c33bb4709c 微信正式版配置 2016-07-08 21:01:10 +08:00
yuanke e5c3f1d261 微信配置修改 2016-07-08 20:33:23 +08:00
yuanke 931ff62331 Merge branch 'weixin_guange' into develop 2016-07-08 20:17:41 +08:00
yuanke caecd45fba 测试版微信配置文件 2016-07-08 20:16:42 +08:00
guange 7c98e0f392 merge 2016-07-08 20:00:49 +08:00
huang ef8b127225 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
	public/javascripts/application.js
 2016-07-08 11:33:51 +08:00
cxt 37dd447fcb Merge branch 'daiao_dev' into cxt_course 
Conflicts:
	app/views/admin/courses.html.erb
	public/stylesheets/new_user.css
 2016-07-07 15:14:11 +08:00
cxt da7509f64c 课程大纲的优化 2016-07-07 15:04:57 +08:00
huang b90c90bc60 add model error_list 2016-07-07 14:22:48 +08:00
cxt a99b03ff76 管理员界面增加配置课程 2016-07-07 09:02:41 +08:00
cxt c5840d75da Merge branch 'daiao_dev' into cxt_course 
Conflicts:
	db/schema.rb
 2016-07-05 16:49:50 +08:00
daiao cc72ca8473 Merge branch 'develop' into daiao_dev 
Conflicts:
	db/schema.rb
 2016-07-05 15:44:47 +08:00
cxt 5f41e191b1 在线测验的提示信息 2016-07-05 10:06:46 +08:00
guange 3c295ba5a1 merge 2016-07-04 10:54:03 +08:00
guange 2c13184d9d 修改js引用 2016-07-04 10:52:32 +08:00
huang 67cad6fc25 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-01 17:54:38 +08:00
huang 374a905d1e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-01 17:53:47 +08:00
huang e74a2ba275 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-07-01 17:53:29 +08:00
cxt e834d09469 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-07-01 17:52:29 +08:00
yuanke a7ecfba23b Merge branch 'yuanke_org' into develop 2016-07-01 17:52:23 +08:00
txz 25e77497e7 consloe pring 2016-07-01 17:50:08 +08:00
cxt 5a1090c0e1 bug修复 2016-07-01 17:27:34 +08:00
cxt 0ff8f0a774 课程大纲的删除和课程大纲描述的删除 2016-07-01 16:25:52 +08:00
yuanke 89e42ac776 将姓氏改为姓名 2016-07-01 16:10:48 +08:00
yuanke 8db5852a61 激活邮箱界面显示邮箱，激活邮箱界面留言太长不能留言解决 2016-07-01 15:49:25 +08:00
cxt 18d677c5eb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/courses.css
 2016-07-01 11:31:51 +08:00
cxt bdaa9983e3 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-07-01 11:30:24 +08:00
cxt 2c1e0f534c 课程大纲 2016-07-01 11:11:53 +08:00
yuanke dfd381fc99 Merge branch 'yuanke_org' into develop 
Conflicts:
	db/schema.rb
 2016-07-01 09:31:19 +08:00
txz db1ad932c6 Function : update jenkins job 2016-07-01 09:31:05 +08:00
yuanke 5cc40408ee 修改KE单倍行距显示的时候不一致的BUG 2016-06-30 16:30:02 +08:00
yuanke 397c4cc2a5 1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮 2016-06-30 16:08:36 +08:00
cxt ebb697a49f 班级列表、课程大纲的编辑、回复、课程列表 2016-06-30 10:44:11 +08:00
Your Name 5c83414828 update 2016-06-30 10:17:53 +08:00
huang 2105d2bbdb Merge branch 'develop' into rep_quality 
Conflicts:
	app/views/repositories/show.html.erb
	db/migrate/20160624103411_add_name_to_quality_analyses.rb
	db/schema.rb
 2016-06-29 14:18:17 +08:00
Your Name 3390a2d05f 500 2016-06-29 11:10:19 +08:00
cxt e066445036 课程大纲的显示和编辑 2016-06-29 10:45:56 +08:00
yuanke 376ec39035 Merge branch 'develop' into yuanke_org 2016-06-29 08:48:07 +08:00
cxt 383483de26 课程大纲的左侧栏base，新建课程大纲、新建班级的调整 2016-06-28 15:13:04 +08:00
guange 5477c794ba Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-27 16:03:55 +08:00
yuanke ab99645148 Merge branch 'yuanke' into develop 2016-06-27 15:52:01 +08:00
yuanke 5c2ac3e02f 修改删除组织成员跨域的BUG 2016-06-27 15:47:06 +08:00
guange 05f09c4595 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-27 11:09:31 +08:00
guange c501af70ba . 2016-06-27 11:09:25 +08:00
huang 46cde061a6 Merge branch 'rep_quality' into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/project.css
	public/stylesheets/public.css
 2016-06-24 19:17:26 +08:00
guange b5bfe40693 . 2016-06-24 17:35:55 +08:00
guange 084b545be9 修改为正式版 2016-06-24 17:14:58 +08:00
guange 2c2e1892e5 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-24 16:53:58 +08:00
guange 16a9f017b6 error 2016-06-24 15:28:44 +08:00
yuanke 86a5eccae6 组织设置中添加成员BUG解决 2016-06-24 14:16:39 +08:00
yuanke 64d87b7398 修改组织添加成员的BUG 2016-06-24 13:50:28 +08:00
yuanke e818b5fb07 旧的注册页面去掉 2016-06-24 11:22:43 +08:00
cxt bd3277681c 分组作业的作业成绩导出、学生列表的导出 2016-06-24 10:50:40 +08:00
cxt e457593416 作品列表--导出作业成绩：excel中增加缺评扣分、迟交扣分情况 2016-06-23 17:34:46 +08:00
yuanke b68e227531 没激活的帐号界面 2016-06-22 14:04:47 +08:00
guange 13273d02de 修正了安全问题，不暴露openid 2016-06-22 12:11:34 +08:00
huang e3b6bd19e1 修改质量分支控制器名 2016-06-21 16:50:45 +08:00
huang 36e47fa8b1 代码质量分析，弹框参数传递 2016-06-20 14:21:40 +08:00
huang 88b838a89a Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-06-17 11:33:48 +08:00
huang 35ee17c4ca Merge branch 'yuanke' into develop 2016-06-17 11:32:50 +08:00
huang d0791253d9 quality 2016-06-17 11:29:49 +08:00
huang fea21fe7cd Merge branch 'develop' into rep_quality 2016-06-17 10:36:09 +08:00
yuanke 70a762220a 组织、项目的资源文件增加描述修改及上传文件时候添加描述，并且所有操作对超级管理员开放 2016-06-16 16:55:25 +08:00
huang 6707868915 登录页面新样式 2016-06-16 15:52:54 +08:00
yuanke 2781605670 课程资源描述增加可编辑 2016-06-16 14:04:12 +08:00
cxt c50d307e89 分组作业添加成员后再次打开，数据未保存 2016-06-14 17:36:12 +08:00
huang c6bd5e6d31 饼状图 2016-06-14 09:57:53 +08:00
huang 0c25e3b13d 版本库质量分析 ssh链接 2016-06-13 15:21:29 +08:00
cxt 3a8a61e404 在精品课程列表增加“取消精品”列、在全部课程列表增加“开课学期”列，并支持排序 2016-06-13 11:10:28 +08:00
guange d3d31ca3a2 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-12 17:18:34 +08:00
guange 1cb63055cb api可以通过openid来认证 2016-06-12 17:18:05 +08:00
guange cbc4f2f6fd 菜单更新 2016-06-12 15:05:45 +08:00