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

1120 Commits

Author SHA1 Message Date
huang facf3ae8f8 提交次数写入动态中 2016-07-18 16:45:49 +08:00
cxt 7725db9c69 题库报500 2016-07-15 17:38:32 +08:00
cxt f7942e4d3c Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke 
Conflicts:
	db/schema.rb
 2016-07-15 15:55:41 +08:00
guange 8279d9385c 区分是课程邀请，还是意见反馈 2016-07-09 10:13:05 +08:00
guange 7c98e0f392 merge 2016-07-08 20:00:49 +08:00
guange 5c0468f8fd 二维码过期改为一个月有效期 2016-07-08 17:18:09 +08:00
cxt c224f97905 样式调整、线下作业的作品评分、导出作业成绩报500 2016-07-08 15:02:50 +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
txz ed39b4b4f1 动态：创建班级；学生进入资源也显示课件；已有班级和新增班级颜色区分 2016-07-08 11:29:33 +08:00
daiao 87d99a1908 数据迁移 2016-07-07 15:10:08 +08:00
huang b90c90bc60 add model error_list 2016-07-07 14:22:48 +08:00
daiao cc72ca8473 Merge branch 'develop' into daiao_dev 
Conflicts:
	db/schema.rb
 2016-07-05 15:44:47 +08:00
daiao 261f440b3d 迁移 2016-07-05 09:07:09 +08:00
guange 60367415fa 新建课程功能完成 2016-07-04 16:19:05 +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 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 a50e15b2ab Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/users/_user_syllabus_list.html.erb
	db/schema.rb
 2016-07-01 11:15:03 +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
Tim 10f52f110f 课程大纲列表点击展开收起，配置按钮链接跳转实现 2016-06-30 16:12:25 +08:00
yuanke 397c4cc2a5 1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮 2016-06-30 16:08:36 +08:00
cxt 4314f6e36a Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	db/schema.rb
 2016-06-30 15:37:16 +08:00
cxt ebb697a49f 班级列表、课程大纲的编辑、回复、课程列表 2016-06-30 10:44:11 +08:00
Tim 590b879f02 追加附件弹框不固定bug修复 2016-06-29 16:54:12 +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
cxt 383483de26 课程大纲的左侧栏base，新建课程大纲、新建班级的调整 2016-06-28 15:13:04 +08:00
Your Name e5b93ac7ed modified main method 2016-06-27 18:13:46 +08:00
huang 5aa79defbe 迁移问题 2016-06-24 19:27:15 +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
Your Name 537f152562 0 2016-06-24 18:47:54 +08:00
cxt afc8fad7fd 通过邀请码加入课程 2016-06-24 16:12:24 +08:00
guange da09983f9e Merge branch 'weixin_guange' into cxt_course 2016-06-24 15:34:32 +08:00
Your Name 06fe02890f index for sonar result 2016-06-24 14:59:17 +08:00
guange d348981721 加入邀请码 2016-06-24 13:29:36 +08:00
Your Name ce6e6116b5 get data from sonar API 2016-06-22 17:09:54 +08:00
Your Name 9e7cde6056 stable version for sonar 2016-06-22 11:25:59 +08:00
Your Name d5631defb5 added xml to jenkins and added some gems 2016-06-20 17:53:56 +08:00
huang 88b838a89a Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-06-17 11:33:48 +08:00
guange 8fd4d518b2 添加邀请码 2016-06-15 13:44:28 +08:00
cxt 6100abe0da 课程大纲 2016-06-14 10:38:11 +08:00
guange d3d31ca3a2 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-12 17:18:34 +08:00
txz 719774f159 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-06-12 14:52:29 +08:00
txz b57f6fbc65 微信回复框增加padding 2016-06-12 14:52:24 +08:00
huang 78b445a7ae 组织历史数据迁移 模式术语修改， 配置页面域名长度问题 2016-06-12 13:36:35 +08:00
huang 4ea12a6dc5 删除匿名用户数据迁移 2016-06-06 14:55:13 +08:00
huang 27a9170318 组织添加设为精品项目，热门课程 2016-06-01 17:38:41 +08:00
huang 91ae3d8b39 Merge branch 'develop' into hjq_beidou 
Conflicts:
	db/schema.rb
 2016-05-31 18:38:05 +08:00