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

629 Commits

Author SHA1 Message Date
huang faf5e89cc2 Merge branch 'weixin_guange' into develop 
Conflicts:
	1234567
	app/views/blogs/_article.html.erb
	db/schema.rb
 2016-05-19 16:04:27 +08:00
txz e2f3ba8e7d 微信问题修改 2016-05-19 15:20:46 +08:00
txz 278ee66368 系统冲突 2016-05-19 13:47:08 +08:00
txz 1b3bc38f8e 拖代码改动 2016-05-19 13:44:03 +08:00
cxt 90a9472e30 删除空数据 2016-05-13 20:07:43 +08:00
cxt 77d713a390 合并两个相同的作业 2016-05-11 14:28:13 +08:00
cxt 320c3881ef 多次点击发送按钮不应新建多个作业 2016-05-11 10:48:04 +08:00
txz ec3a077b22 微信意见反馈按钮文字错误 2016-05-10 14:48:40 +08:00
guange e8adcf8cc7 添加sso model 2016-05-04 15:40:18 +08:00
cxt a9cb556a20 题库的切换报500 2016-04-29 19:21:54 +08:00
cxt d7789b7739 迁移文件 2016-04-29 16:48:11 +08:00
cxt f62b6c4c31 提交 2016-04-29 16:45:15 +08:00
cxt 341927506a Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-04-29 15:58:05 +08:00
cxt 53bf0dcd7a 题库加入所有私有作业、并可通过提交申请来导入私有作业 2016-04-29 15:46:26 +08:00
cxt 4a5a602a6e 迁移 2016-04-28 14:46:27 +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 54a8e6871c 问答区列表修改 2016-04-28 11:31:31 +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
cxt 451b53f3cc qianyi 2016-04-28 10:09:45 +08:00
cxt d244e22066 rake 2016-04-28 10:08:09 +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
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
Tim 53e6b41d93 北斗登录效果调整 2016-04-26 10:02:16 +08:00
cxt 76b37d7670 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-04-21 10:02:16 +08:00
cxt 26b1aee90d 修改周海芳老师四个作业的截止日期和学生得分 2016-04-21 10:01:12 +08:00
yuanke 8f62cccfd6 Merge branch 'yuanke' into develop 
Conflicts:
	db/schema.rb
 2016-04-20 16:14:26 +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
cxt 0fa16251e7 删除学生提交的多分作品 2016-04-18 15:57:15 +08:00
txz 73b89cdde5 微信边框，回复点赞样式更改 2016-04-18 11:19:13 +08:00
huang 40b45ce1b4 版本库动态中统计改成从数据库获取 2016-04-15 12:24:54 +08:00
yuanke a8dce5e520 代码查重功能增加,管理员界面增加代码测试列表. 2016-04-14 11:29:22 +08:00
cxt fcddaf403c 删除博客为空的数据 2016-04-08 15:59:23 +08:00
txz feb0014bf8 作业详情页面 2016-04-06 11:29:50 +08:00
huang c408185b40 Merge branch 'develop_new' of http://git.trustie.net/jacknudt/trustieforge into develop_new 
Conflicts:
	db/schema.rb
 2016-04-05 11:25:25 +08:00
cxt 6a8a82e85a 删除周海芳老师2882作业的学生匿评 2016-04-05 11:23:50 +08:00
huang c431658333 setting中后台编辑 2016-03-31 16:19:59 +08:00
huang c6f6030e10 组织新样式 2016-03-31 15:25:02 +08:00
Tim 77e11fe0fe 微信最新动态修改 2016-03-30 17:47:44 +08:00
Yiang Gan 4de598873f 动态和作业的api 2016-03-30 10:32:45 +08:00
huang b8463fcca5 北斗 2016-03-28 16:51:58 +08:00
huang 5fd3e7d3a2 动态表添加索引 2016-03-25 11:13:42 +08:00
huang a9ef2c28e2 项目创建类型迁移 2016-03-24 13:57:52 +08:00
huang e77a891bc6 消息查询语句优化，添加索引 2016-03-21 16:36:25 +08:00
huang 79767f4bae 用户行为记录 2016-03-17 17:22:07 +08:00