Commit Graph

92 Commits

Author SHA1 Message Date
cxt e102815f60 个人主页 2016-10-19 18:03:59 +08:00
cxt caf5602389 课程大纲教师团队的管理 2016-09-23 09:22:47 +08:00
huang 5ad063b830 记录接受PR用户信息,并且唯一性判断 2016-08-10 16:27:41 +08:00
Tim 1fc617d5fa pull request页面删除 2016-08-01 16:57:55 +08:00
huang b718803bd9 修改控制器名称及控制器查询访问权限 2016-08-01 16:54:31 +08:00
huang 96b04f39b1 pull requests框架搭建(路由控制器、views) 2016-08-01 15:33:47 +08:00
daiao 9e788c9b6f 单位批准及消息框架搭建 2016-07-27 10:46:48 +08:00
huang 246923a335 版本库新增提交次数表,增加至项目动态 2016-07-21 16:09:07 +08:00
huang b90c90bc60 add model error_list 2016-07-07 14:22:48 +08:00
yuanke 397c4cc2a5 1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮 2016-06-30 16:08:36 +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 9e7cde6056 stable version for sonar 2016-06-22 11:25:59 +08:00
huang e3b6bd19e1 修改质量分支控制器名 2016-06-21 16:50:45 +08:00
huang d0791253d9 quality 2016-06-17 11:29:49 +08:00
cxt 6100abe0da 课程大纲 2016-06-14 10:38:11 +08:00
huang 658ea0cf1e 资源引用 结构搭建 数据创建 2016-05-18 14:49:13 +08:00
huang 9e0176bc55 Merge branch 'hjq_beidou' into develop
Conflicts:
	app/controllers/organizations_controller.rb
	app/helpers/organizations_helper.rb
	db/schema.rb
	public/images/homepage_icon.png
	public/stylesheets/new_user.css
2016-05-06 10:16:56 +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
huang 1685449381 二级目录框架及结构 2016-04-28 17:36:29 +08:00
huang 9fbf713709 完成组织二级域名 2016-04-27 17:02:44 +08:00
cxt 0222038899 缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息 2016-04-27 10:28:36 +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
huang 40b45ce1b4 版本库动态中统计改成从数据库获取 2016-04-15 12:24:54 +08:00
huang 79767f4bae 用户行为记录 2016-03-17 17:22:07 +08:00
luoquan 7d70e63f8d 代码重置 2016-03-11 10:18:10 +08:00
Tim 8feea07825 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	db/schema.rb
2016-01-14 15:59:50 +08:00
ouyangxuhua 6cfda615d6 1.解决一些bug;2.组织子目录功能实现 2016-01-13 15:17:13 +08:00
ouyangxuhua 5d9ce929d9 组织栏目子目录 2016-01-13 09:34:33 +08:00
ouyangxuhua 66bf50098a 增加组织/个人屏蔽项目/课程动态功能 2016-01-08 14:12:55 +08:00
lizanle be146a9421 Merge branch 'szzh' into dev_zanle
Conflicts:
	app/controllers/organizations_controller.rb
	db/schema.rb
	public/stylesheets/courses.css
	public/stylesheets/public.css
2015-12-31 11:11:38 +08:00
lizanle abb19422ff 发送资源到组织功能。同时个人资源库也要添加这个功能 2015-12-29 17:13:01 +08:00
Tim b0b4527ea1 Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq
Conflicts:
	public/stylesheets/org.css
2015-12-24 10:40:00 +08:00
ouyangxuhua 73d377d06d 组织资源栏目显示转发的帖子 2015-12-23 16:49:05 +08:00
ouyangxuhua 2220e0b7cc 增加帖子-组织栏目关联表 2015-12-22 15:48:41 +08:00
guange fc63dfcb7b 消息通知 2015-12-17 15:14:52 +08:00
cxt a9f6e817b4 分组作业关联项目 2015-12-08 17:37:15 +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
ouyangxuhua ab4d0e4678 组织界面增加分栏 2015-12-04 17:34:48 +08:00
cxt f90ff781ab 学生提交作品页面的合作成员弹窗 2015-12-03 09:17:36 +08:00
huang c8b1cae947 建立贡献榜表及相关关联
部分页面
按总分排序(英雄榜)
部分页面(未完成)
2015-11-25 15:16:33 +08:00
ouyangxuhua 71bf80c7a5 1.创建组织课程关联表,建立相应模型及控制器;
2.在课程设置中,添加加入组中功能;
3.解决添加项目后,组织列表的上一页和下一页链接问题。
2015-11-17 17:34:50 +08:00
ouyangxuhua a3443ba968 组织模块功能实现 2015-11-12 09:32:00 +08:00
ouyangxuhua eadab840b6 建立组织、成员表及模型控制器;
编写创建组织页面。
2015-11-03 11:19:38 +08:00
huang 4c61e7490b Merge branch 'develop' into gitlab_guange
Conflicts:
	db/schema.rb
2015-10-27 14:42:05 +08:00
lizanle 2a76461cd1 简单博客功能 2015-10-24 15:34:43 +08:00
huang 150ee3d28d Merge branch 'szzh' into gitlab_guange
Conflicts:
	db/schema.rb
2015-10-16 09:07:38 +08:00
cxt b9b7f6fa9e 个人主页留言动态的实现 2015-10-13 16:51:44 +08:00
huang 7c1bb8b9ed Merge branch 'szzh' into gitlab_guange
Conflicts:
	Gemfile
	app/models/user.rb
	db/schema.rb
	lib/trustie.rb

解决冲突
2015-10-10 16:09:05 +08:00