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

4449 Commits

Author SHA1 Message Date
cxt e19efc1c8a 博客的二级回复 2016-07-14 14:44:47 +08:00
cxt ded8f48d34 博客的二级回复 2016-07-13 15:20:39 +08:00
cxt 16cf8a56a1 管理员和老师可看到课程下的所有班级 2016-07-13 09:34:36 +08:00
huang 22745edb9b Merge branch 'rep_quality' into develop 2016-07-11 17:02:25 +08:00
huang 8b5a2ac1cb message 500 2016-07-11 16:59:37 +08:00
cxt b4e6561e50 Merge branch 'cxt_course' into develop 2016-07-11 15:16:27 +08:00
cxt d71e10c8ac Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-11 15:16:04 +08:00
cxt 0b4db97756 班级动态 2016-07-11 15:15:38 +08:00
cxt 5d9bde3c95 课程发送资源到课程 2016-07-11 15:10:55 +08:00
cxt 834e72b0f8 未配置班级列表报500，全部班级列表添加状态列表明班级是否已删除 2016-07-11 14:43:22 +08:00
huang 1283690250 Merge branch 'rep_quality' into develop 2016-07-11 11:34:07 +08:00
huang 831006f3c6 css for sqale_index 2016-07-11 10:57:46 +08:00
huang cb148c3b9c fixed 500 2016-07-11 10:48:44 +08:00
guange 99a27766be . 2016-07-09 10:34:05 +08:00
guange 09a97fc9d8 . 2016-07-09 10:23:49 +08:00
guange 8279d9385c 区分是课程邀请，还是意见反馈 2016-07-09 10:13:05 +08:00
huang f77bad34ad 缩短时间 2016-07-08 21:29:47 +08:00
huang 8785264e07 Merge branch 'rep_quality' into develop 2016-07-08 20:39:43 +08:00
huang 62cb7d4568 add css 2016-07-08 20:35:21 +08:00
cxt 320db4ddd9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	.access_token
 2016-07-08 20:01:55 +08:00
guange 7c98e0f392 merge 2016-07-08 20:00:49 +08:00
cxt 1a15c0f567 新建班级发布作业报500 2016-07-08 19:25:26 +08:00
cxt 6115b7fa4d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-08 18:23:05 +08:00
cxt 3362ebe321 线下作业 2016-07-08 18:22:59 +08:00
huang 011b7ef4d4 Merge branch 'rep_quality' into develop 2016-07-08 16:59:05 +08:00
huang 5a40174910 change show data's method 2016-07-08 16:19:33 +08:00
cxt c224f97905 样式调整、线下作业的作品评分、导出作业成绩报500 2016-07-08 15:02:50 +08:00
huang 040b6d4b9d Merge branch 'rep_quality' into develop 2016-07-08 14:26:40 +08:00
huang b22882aead some data for css 2016-07-08 14:22:20 +08:00
cxt cc4b24cdb9 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-07-08 13:18:46 +08:00
cxt 13bae8f8a5 线下作业 2016-07-08 13:17:14 +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
huang e588321ada Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-08 11:31:02 +08:00
huang 61e2e427fd Merge branch 'rep_quality' into develop 2016-07-08 11:30:53 +08:00
huang 406d636aac add error system 2016-07-08 11:27:03 +08:00
yuanke 06f7594680 Merge branch 'yuanke' into develop 2016-07-08 09:15:55 +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
huang 92b6171c36 sonar error puts 2016-07-07 11:08:29 +08:00
yuanke a732efa6c6 1.组织动态中去掉设为首页的文章动态 2.个人主页动态中去掉设为首页的博客动态并将 最上面的博客显示回复内容及可回复 2016-07-07 10:42:51 +08:00
cxt a99b03ff76 管理员界面增加配置课程 2016-07-07 09:02:41 +08:00
huang 88f8752490 添加权限 2016-07-06 16:37:19 +08:00
huang 2f8079e85c 版本 库存 2016-07-06 16:07:17 +08:00
huang f50c4a879b modified total commits 2016-07-05 17:35:56 +08:00
cxt c5840d75da Merge branch 'daiao_dev' into cxt_course 
Conflicts:
	db/schema.rb
 2016-07-05 16:49:50 +08:00
cxt 83617f8475 我的资源--》课程资源下不应出现已删除课程的资源 2016-07-05 16:48:20 +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
yuanke da19bbd3a0 优化了下修改资料界面的代码 2016-07-05 09:02:34 +08:00