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

2262 Commits

Author SHA1 Message Date
daiao fb62d4f1b2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/css/project.css
 2016-12-09 20:00:07 +08:00
黄井泉 b8eee2b131 Merge branch 'cxt_course' into 'develop' 
本周上线任务



See merge request !50
 2016-12-09 16:43:00 +08:00
cxt 0b217b9998 基于项目的分做作业，关联项目列表需要增加“更换项目”的功能 2016-12-09 16:39:24 +08:00
黄井泉 74a20dddc1 Merge branch 'dev_newproject' into 'develop' 
Issue和commit关联功能



See merge request !49
 2016-12-09 14:17:06 +08:00
huang d67fc1c3be Merge branch 'guange_dev' into develop 2016-12-09 09:42:42 +08:00
guange 9b155c9573 mini profiler只在dev下生效 2016-12-09 09:40:39 +08:00
huang 2a5bb6dcb8 Merge branch 'guange_dev' into develop 
Conflicts:
	Gemfile
 2016-12-09 09:35:12 +08:00
cxt abdbfd87b0 班级的邀请码增加“停用”和“启用”功能，停用的邀请码不允许用户主动加入班级 2016-12-08 13:40:11 +08:00
huang a1a96e4667 issue编辑优化，性能简单优化 2016-12-08 09:55:41 +08:00
huang 12b73f54d3 commit issue关联提供删除功能，局部刷新 2016-12-07 15:39:48 +08:00
cxt 27d800a94a 新版首页架构 2016-12-07 15:15:00 +08:00
huang 33a4186e69 完成issue和commit关联创建。去重，及相关局部刷新 2016-12-06 17:37:07 +08:00
huang 6ebaa1c90a Merge branch 'develop' into dev_newproject 2016-12-05 11:12:52 +08:00
guange d351827ba2 at功能实现 2016-12-04 19:20:02 +08:00
cxt 2fd4cb9064 班级作业增加设置选项：成绩公开范围 2016-12-02 13:30:49 +08:00
guange 38215dad77 mini profiler开关 2016-12-02 09:30:07 +08:00
guange 3054b21871 [deprecated] I18n.enforce_available_locales will default to true in the future. If you really want to skip validation of your locale you can set I18n.enforce_available_locales = false to avoid this message. 2016-12-02 09:29:04 +08:00
huang bbc8d11f80 项目issue关联commit(未完成) 2016-12-01 14:21:40 +08:00
huang 1299be5384 pullrequest（井泉修改） 2016-11-29 18:22:43 +08:00
huang 6d14353ef7 commit_diff 2016-11-28 15:25:26 +08:00
huang 21b13e33ce pull request的时候各种异常类型打印 2016-11-25 19:05:37 +08:00
huang 8393679c9c 项目关注车成员列表结构梳理 2016-11-25 17:08:11 +08:00
cxt 785f027a63 Merge branch 'cxt_course' into develop 2016-11-25 14:56:24 +08:00
cxt 8743460134 动态与详情的回复叠层调整 2016-11-25 09:59:03 +08:00
huang 30a0347cd6 项目头部修改，及其成员列表，关注列表新版样式（未完） 2016-11-24 17:40:33 +08:00
huang 67a9d04a64 版本库添加删除功能 2016-11-23 17:14:49 +08:00
cxt 4388b7625e 首页班级列表的归档 2016-11-21 16:58:25 +08:00
huang a58a3c0655 项目成员新弹框ajax局部刷新 2016-11-18 19:00:44 +08:00
daiao 290a301cee Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/css/common.css
 2016-11-18 15:48:40 +08:00
cxt 1fcb1db27c 课程大纲下的班级归档 2016-11-18 15:34:53 +08:00
cxt 1ad0c1cbff 测验列表 2016-11-17 09:06:44 +08:00
daiao e956d20d6e 我的issue部分功能 2016-11-16 16:57:02 +08:00
cxt 2dc717df0c Merge branch 'develop' into cxt_course 2016-11-15 16:57:33 +08:00
cxt 9f79408e32 导入试卷 2016-11-15 16:57:07 +08:00
huang 0adde560ba 我的issue路由修改及查询修改 2016-11-15 14:30:01 +08:00
daiao c927a6fecc Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-15 13:21:37 +08:00
daiao ffe86c7ec9 项目配置删除按钮新版弹框 2016-11-15 13:21:27 +08:00
huang 5f21b63c41 我的issue框架搭建 2016-11-15 10:47:07 +08:00
cxt cb5ca96bb5 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_course_homework.html.erb
	db/schema.rb
 2016-11-11 16:53:20 +08:00
cxt 07b97c8eb9 学生列表增加删除功能、删除学生时删除其对应的作品 2016-11-11 13:58:07 +08:00
huang 431ff8b31c 甘特图配置及issue导出指派人为空的问题 2016-11-09 10:40:59 +08:00
daiao ac60940c34 1.项目头部样式调整 2016-11-08 16:18:59 +08:00
huang a3dfd03e81 项目顶端框架搭建及权限判断 2016-11-08 10:23:02 +08:00
cxt 78ca68b5e3 Merge branch 'cxt_course' into develop 
Conflicts:
	public/stylesheets/css/moduel.css
	public/stylesheets/css/public.css
 2016-11-04 16:15:56 +08:00
huang fb2f1b3859 点击导出添加提醒 2016-11-03 15:42:40 +08:00
huang ef43488861 admin添加导出用户所有代码提交量 2016-11-03 15:35:09 +08:00
cxt ec45ee89d9 已截止的分组作业：组长可编辑成员 2016-11-01 15:59:00 +08:00
yuanke 93ed72fb59 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-10-28 15:57:53 +08:00
huang 03b8d081ce 一些细节的修改 2016-10-28 09:43:30 +08:00
cxt cc2ef93808 多选题的上限 2016-10-27 18:25:47 +08:00
huang 3ef90a3c62 Merge branch 'dev_newproject' into develop 
Conflicts:
	db/schema.rb
 2016-10-27 17:33:28 +08:00
Tim c58fb36f44 在线测验单选、多选、填空题显示调整 2016-10-27 14:31:14 +08:00
huang 05b206a7cf 收藏者列表 2016-10-27 12:39:44 +08:00
huang 5c31a5379e 里程碑添加删除功能 2016-10-26 18:39:14 +08:00
huang b93b4ca3f3 quality analisis css of list 2016-10-25 17:27:38 +08:00
daiao e3f0f222e6 新版Issue新建页面 2016-10-25 09:28:09 +08:00
yuanke bb5d957ec5 Merge branch 'cxt_course' into develop 2016-10-21 17:46:29 +08:00
cxt 3d29eb2be0 分班批量添加学生、小班页面 2016-10-21 17:34:02 +08:00
huang 6481978def Merge branch 'rep_quality' into develop 2016-10-21 14:20:32 +08:00
yuanke 8e35158fe9 增加统计功能 2016-10-21 14:06:45 +08:00
cxt f085b79999 个人主页的调整 2016-10-20 10:50:59 +08:00
cxt dff47b586e 主页宽度调整、主页配置菜单调整 2016-10-20 09:26:01 +08:00
cxt 6109a1602b Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-10-19 18:11:02 +08:00
cxt e102815f60 个人主页 2016-10-19 18:03:59 +08:00
huang 97172ed76f 版本库异步加载 2016-10-19 15:18:26 +08:00
huang cff887a2be 删除项目的时候删除版本库功能 2016-10-19 11:23:15 +08:00
daiao 32c5d7a13b Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-18 15:19:34 +08:00
daiao bdbd2e9cf7 项目配置组织与里程碑界面 2016-10-18 15:17:36 +08:00
huang fce6c407c8 Merge branch 'rep_quality' into dev_newproject 
Conflicts:
	app/controllers/projects_controller.rb
	app/views/layouts/base_projects.html.erb
	app/views/projects/settings/_new_edit.html.erb
	public/stylesheets/css/project.css
 2016-10-19 11:27:49 +08:00
huang 207273839b Merge branch 'dev_newrep' into dev_newproject 
Conflicts:
	app/controllers/projects_controller.rb
	app/views/projects/settings/_new_repositories.html.erb
 2016-10-19 08:53:38 +08:00
cxt 8648ea605f 问卷导出的统计结果：“其他”选项要标出来，多行主观题要对各小题标识出来 2016-10-18 11:14:29 +08:00
cxt a289a2cee0 班级问卷：新建时只保存并设置学生可查看统计列表，再到问卷列表中去发布，但实际学生不能查看统计结果 2016-10-15 15:16:21 +08:00
huang 5532ec3b86 Merge branch 'develop' into dev_newproject 
Conflicts:
	app/views/issues/index.html.erb
	app/views/layouts/base_projects.html.erb
	public/stylesheets/css/project.css
 2016-10-15 10:53:01 +08:00
huang 80bf13c516 资源库删除历史版本功能 2016-10-14 19:21:41 +08:00
cxt a1b70a7e91 Merge branch 'cxt_course' into develop 2016-10-14 16:18:12 +08:00
huang 333c9c6db0 项目历史版本一键删除功能 2016-10-14 15:01:22 +08:00
cxt 12ad7c1612 班级讨论区增加二级子栏目 2016-10-14 14:28:19 +08:00
huang edf2a059e8 Merge branch 'develop' into rep_quality 2016-10-13 09:00:35 +08:00
huang 10778fabc9 新版版本库界面代码整理 2016-10-12 17:02:51 +08:00
huang 57d1397597 版本库界面优化（未完） 2016-10-12 10:45:14 +08:00
huang 3c15c4f315 版本库权限，及项目收藏用户列表 2016-10-11 10:03:00 +08:00
huang e9a1582b71 项目添加收藏功能 2016-10-11 09:30:45 +08:00
huang bd29a637b6 新版项目 2016-10-09 17:24:37 +08:00
huang 2e94fbee81 项目、课程、组织资源描述过长不能提交的问题 2016-10-09 15:09:18 +08:00
daiao b259f92381 一级帖子栏目默认展示5个，点击可进入详情页面， 2016-10-09 09:02:12 +08:00
huang b573563a52 Merge branch 'rep_quality' into develop 2016-09-28 10:59:55 +08:00
daiao b22b444a7b 修改issue开始时间与结束时间判断，并将导出excel的作者改为发布人 2016-09-28 10:58:31 +08:00
huang d647f7153a 新建里程碑术语 2016-09-27 20:01:23 +08:00
huang 70d58ea28e 版本库导出代码统计功能 2016-09-27 15:10:52 +08:00
daiao 1c33e6481f 问题issue列表及其动态的目标版本改为里程碑， 2016-09-27 10:48:39 +08:00
huang b1496e1874 项目邀请码去掉冒号 2016-09-27 09:15:19 +08:00
huang db54d6e0d9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/css/project.css
 2016-09-26 22:21:45 +08:00
huang 3ace67f706 版本库库代码统计导出excel功能 2016-09-26 16:17:21 +08:00
huang a8acb4a6cb 项目base功能添加 2016-09-23 10:36:47 +08:00
cxt caf5602389 课程大纲教师团队的管理 2016-09-23 09:22:47 +08:00
Tim c718cb2144 新建issue时，增加评审，来源，实际工时选项 2016-09-21 15:27:32 +08:00
huang 2ae7dd0087 项目issue导出excel功能 2016-09-21 10:18:40 +08:00
huang 4d97dd3889 去掉项目module中dts测试工具 2016-09-19 17:22:30 +08:00
huang 8e6a88f7d8 项目日历功能 2016-09-19 16:19:59 +08:00
Tim 135a2b21f5 新问题反馈样式更新 2016-09-13 18:53:00 +08:00
daiao ed448f0087 Merge branch 'develop' into dev_shcool 
Conflicts:
	db/schema.rb
 2016-09-09 09:31:17 +08:00
yuanke 5b8ecf6657 微信头像刷新修改 2016-09-08 18:50:09 +08:00
yuanke 18fbf305c1 微信上传头像大小限制为1M 2016-09-07 16:16:53 +08:00
yuanke c9c63eeb85 微信修改资料后台代码 2016-09-06 14:41:22 +08:00
daiao 3dc0e8407a Merge branch 'develop' into dev_shcool 
Conflicts:
	app/views/organizations/_org_member_list.html.erb
	app/views/organizations/setting.html.erb
	app/views/users/_project_news.html.erb
 2016-09-05 13:47:39 +08:00
yuanke 10017d2c69 微信增加解除绑定功能 2016-09-05 11:02:34 +08:00
daiao 27ad94eac2 组织配置界面，成员列表分页 2016-09-02 13:25:01 +08:00
yuanke 11ed1ea345 Merge branch 'weixin_guange' into develop 2016-09-01 14:11:20 +08:00
yuanke 8a6ad89973 issue指向改变才发微信消息，增加微信动态里来源链接，@增加微信消息，菜单去掉加入班级和项目等 2016-08-30 14:08:10 +08:00
cxt 6eb518c465 Merge branch 'cxt_course' into develop 
Conflicts:
	app/helpers/application_helper.rb
	app/views/at/show.json.erb
	app/views/layouts/new_base_user.html.erb
 2016-08-26 16:23:07 +08:00
cxt b33136c59b 班级问答区改成讨论区 2016-08-25 15:59:09 +08:00
cxt 60beb2abab 首页左侧班级和项目列表的收藏功能 2016-08-25 11:30:47 +08:00
yuanke 4932b9fad8 班级留言不显示 2016-08-25 10:55:22 +08:00
cxt 56b74b755b 取消收藏 2016-08-24 17:30:30 +08:00
yuanke e0957113d8 项目issue模版消息提醒 2016-08-24 11:28:50 +08:00
yuanke bd3911c072 . 2016-08-24 11:22:34 +08:00
yuanke f8dfe85156 项目issue增加模版消息 2016-08-24 11:03:38 +08:00
yuanke 9446760258 Merge branch 'weixin_guange' into develop 
Conflicts:
	db/schema.rb
 2016-08-14 09:56:17 +08:00
Tim f67336fbe5 课程信息单词折行 2016-08-13 16:27:29 +08:00
cxt 2759d562ac 首页项目列表 2016-08-13 15:35:03 +08:00
yuanke 4e6c58ae37 动态点提交如果没绑定则自动创建一个帐号绑定，然后注册的时候将已绑定的用户信息修改为注册的信息 2016-08-11 17:22:48 +08:00
yuanke ea926395c3 Merge branch 'develop' into weixin_guange 2016-08-11 11:19:52 +08:00
yuanke a1dfdae58d 修改班级通知模版消息的跳转 2016-08-11 10:54:14 +08:00
yuanke 7c5240b386 微信 没登录动态回复会跳到绑定登录界面，私有内容需要是成员才能回复 2016-08-11 09:58:45 +08:00
yuanke 57737ff15d 微信细节优化 2016-08-10 16:08:30 +08:00
huang 87c5f50545 PULL request 评论创建及局部刷新 2016-08-09 14:51:48 +08:00
huang 6319a1bac6 PR添加评论定义 2016-08-09 10:53:44 +08:00
yuanke 2b7ff3c76b 修改各个页面验证绑定登录的方式。 2016-08-09 09:23:06 +08:00
huang 518d6bacbe 添加关闭pull request功能 2016-08-08 15:23:55 +08:00
cxt 3178700131 Merge branch 'cxt_course' into develop 2016-08-05 16:14:56 +08:00
cxt 0d86a28c54 我的作业 2016-08-05 16:12:53 +08:00
huang 81ce93e88b Merge branch 'rep_quality' into develop 2016-08-05 15:28:39 +08:00
huang 515649beb6 接受PR局部刷新及跳转 2016-08-04 15:07:15 +08:00
yuanke ee019cd364 修改测试版微信加入项目审核通知 2016-08-04 14:47:39 +08:00
cxt cecf917764 从题库选用作业时增加提示：“您选中的题是“我收到的作业”，不能选用” 2016-08-03 15:00:16 +08:00
yuanke a34272027e 微信菜单及项目班级审核修改 2016-08-03 14:55:54 +08:00
huang be081f5c66 添加Api（提交内容，改动）及相关方法路由 2016-08-03 13:57:59 +08:00
yuanke 4ab2427827 微信项目及课程申请审核相关功能 2016-08-03 09:37:24 +08:00
guange a1d3bbbfa9 解决ruby2.3执行sql出错的bug 2016-08-01 19:17:16 +08:00
guange fc38ef6a3f 增加了一个查看服务器内网ip的middleware，利于以后分析问题，headers为X-Response-Ip 2016-08-01 19:16:51 +08:00
huang 3660f8cbce gitlab相关方法的封装 2016-08-01 17:38:37 +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 911a769670 Merge branch 'develop' into dev_shcool 
Conflicts:
	app/models/applied_message.rb
 2016-07-29 22:05:56 +08:00
daiao 5b93d40f67 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/assets/wechat/app.html
	public/assets/wechat/new_project.html
	public/javascripts/wechat/directives/ellipsis.js
	public/stylesheets/weui/weixin.css
 2016-07-29 22:03:45 +08:00
daiao 39478eb4e4 Merge branch 'dev_shcool' of https://git.trustie.net/jacknudt/trustieforge into dev_shcool 
Conflicts:
	app/views/admin/applied_schools.html.erb
	app/views/admin/has_applied_schools.html.erb
 2016-07-29 21:50:19 +08:00
huang 847cae6d41 Merge branch 'develop' into rep_quality 
Conflicts:
	app/models/applied_message.rb
	db/schema.rb
 2016-07-29 21:39:00 +08:00
yuanke 1f47eb5ea8 单位申请列表修改 2016-07-29 21:19:09 +08:00
daiao 3251890c91 Merge branch 'rep_quality' into dev_shcool 
Conflicts:
	app/models/applied_message.rb
	db/schema.rb
 2016-07-29 20:52:18 +08:00
daiao 430a93e4b2 单位名称列表功能代码 2016-07-29 20:48:36 +08:00