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

1973 Commits

Author SHA1 Message Date
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
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