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

490 Commits

Author SHA1 Message Date
houxiang 3e57237969 修改了整个提交记录总数，运用了黄总的修改的gitlab API by 侯翔 2015-12-21 16:21:39 +08:00
houxiang e8511a6210 modify the gemfile conflict by hx 2015-12-21 16:00:35 +08:00
huang dae6e68623 renwu 2015-12-18 20:46:17 +08:00
cxt c6e7c8860d dd 2015-12-18 15:45:23 +08:00
lizanle 70f93741d6 issue图标问题 2015-12-18 14:38:04 +08:00
lizanle 5d47afdc43 issue 删除回复的权限问题 2015-12-18 09:46:28 +08:00
guange d703f75c98 merge 2015-12-18 09:23:52 +08:00
guange eb97f7dfb2 merge 2015-12-18 09:20:51 +08:00
huang b87943ff1d Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	db/schema.rb
处理冲突
 2015-12-18 09:17:18 +08:00
cxt 0ed58d4898 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-17 19:07:17 +08:00
lizanle 5f8c04e3a0 Merge branch 'szzh' into dev_zanle 2015-12-17 18:17:38 +08:00
huang 721a007779 删除 由于course、project一张表而引起的历史数据异常问题 2015-12-17 13:22:41 +08:00
lizanle 71f6a637e0 帖子按时间倒排 2015-12-16 17:26:19 +08:00
guange c0de5d55de 加入了issue的at消息提醒 2015-12-16 16:37:00 +08:00
cxt 5cf88a287b 分组作业提示语的修改 2015-12-16 11:37:59 +08:00
huang 06e5784436 解决英雄榜两个用户同时存在的but 2015-12-16 10:00:10 +08:00
ouyangxuhua 0602a03e12 组织资源类型的栏目，增加搜索功能 2015-12-14 10:26:34 +08:00
cxt bb2f49439e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2015-12-11 15:00:35 +08:00
cxt 27ed6df9d6 Merge branch 'szzh' into develop 2015-12-11 14:59:52 +08:00
huang fed989753a 修复林处账号不能查看消息的问题 2015-12-11 13:46:23 +08:00
huang 9710731a2c 课程配置添加登录名 2015-12-10 20:03:59 +08:00
huang fbba933a46 Merge branch 'hjq_new_course' of http://git.trustie.net/jacknudt/trustieforge into hjq_new_course 2015-12-10 16:09:42 +08:00
huang be940ee3aa Merge branch 'develop' into hjq_new_course 2015-12-10 16:09:36 +08:00
lizanle 433059e1bc schema 2015-12-10 10:12:54 +08:00
cxt a9f6e817b4 分组作业关联项目 2015-12-08 17:37:15 +08:00
huang ac9f13c842 Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange 
Conflicts:
	app/views/repositories/show.html.erb
	db/schema.rb

处理冲突
 2015-12-08 17:13:50 +08:00
houxiang 56cb83ffba 版本库首页没有统计commit_count，具体的详情页在开始统计 2015-12-08 15:56:31 +08:00
huang 42f5b86d95 添加字段删除课程 2015-12-08 10:32:10 +08:00
huang 068c305c06 Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course 
Conflicts:
	app/views/courses/member.html.erb
	app/views/courses/settings.html.erb
	app/views/repositories/show.html.erb
	db/schema.rb

处理冲突
 2015-12-08 09:10:21 +08:00
cxt b61a0a98e5 Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/student_work/new.html.erb
	app/views/users/_user_homework_form.html.erb
	db/schema.rb
	public/stylesheets/courses.css
 2015-12-07 09:47:18 +08:00
huang bd3d0547f5 组织样式修改 2015-12-05 14:34:16 +08:00
lizanle 4c00312f45 Merge branch 'szzh' into dev_zanle 2015-12-04 16:42:02 +08:00
lizanle 0a5a33c2de schema 2015-12-04 16:36:03 +08:00
huang c1747ab217 fork重名，提交 2015-12-04 15:49:05 +08:00
huang 8f024bdf4d Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 
Conflicts:
	db/schema.rb
 2015-12-04 09:12:24 +08:00
huang 89b8f7783d 添加forked_form的id 2015-12-04 08:57:29 +08:00
cxt fd51b02e16 添加修订附件 2015-12-03 18:33:08 +08:00
cxt 77e96af78f 还原分组作业 2015-12-03 10:41:27 +08:00
cxt f90ff781ab 学生提交作品页面的合作成员弹窗 2015-12-03 09:17:36 +08:00
cxt fee438cc0b Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-11-30 16:27:39 +08:00
cxt ebeaac5798 作业匿评的结束状态未更新 2015-11-30 16:27:26 +08:00
huang 364c9a3a9e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
合并
 2015-11-30 14:35:37 +08:00
huang 39b87aaaac 为student_work表添加索引 
为homework_comments添加索引
大幅提高查询速度
 2015-11-30 13:09:13 +08:00
lizanle d266237590 kaminari分页添加上一页下一页 2015-11-30 11:08:08 +08:00
lizanle 96290ad975 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/models/attachment.rb
	db/schema.rb
 2015-11-27 18:47:19 +08:00
lizanle 582cd6f5d4 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/models/attachment.rb
	db/schema.rb
 2015-11-27 18:47:02 +08:00
lizanle 487c6bad09 schema.rb 2015-11-27 18:08:38 +08:00
huang f91918145d 0 2015-11-27 18:00:26 +08:00
huang 634e11d0ec 0 2015-11-27 17:15:51 +08:00
huang b130b52a23 修改迁移 2015-11-27 16:55:45 +08:00