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

17986 Commits

Author SHA1 Message Date
huang 1e415624fc Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-12 10:55:36 +08:00
huang 6e67e4a5c7 0 2016-12-12 10:55:19 +08:00
huang 4ea8bbb64a Revert "部分项目404问题" 
This reverts commit 818e63386c.
 2016-12-12 10:50:21 +08:00
huang 8dbe2b76ee Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-12 10:28:36 +08:00
huang 5445ae3f22 conflict 2016-12-12 10:28:20 +08:00
huang 7a106cdc9c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/users/_new_user_message.html.erb
	app/views/users/_no_data.html.erb
	app/views/users/course_community.html.erb
	app/views/users/course_community.js.erb
	app/views/users/project_community.html.erb
	app/views/users/project_community.js.erb
	public/stylesheets/css/user.css
 2016-12-12 10:11:12 +08:00
huang fcc300dab7 提交撤回 2016-12-12 10:08:40 +08:00
daiao 1fd6ccf3ff Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-12 10:00:51 +08:00
daiao 0f328d36e1 代码改进 2016-12-12 10:00:05 +08:00
黄井泉 255b8db9a4 Merge branch 'dev_newproject' into 'develop' 
部分项目404问题



See merge request !55
 2016-12-09 22:01:23 +08:00
huang 818e63386c 部分项目404问题 2016-12-09 21:58:47 +08:00
黄井泉 ad1f1f3fec Merge branch 'dev_newproject' into 'develop' 
issue新建的时候commit权限



See merge request !54
 2016-12-09 21:03:20 +08:00
daiao 6cec329ce3 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-09 21:01:39 +08:00
huang 90c8ee2d69 issue新建的时候commit关联权限 2016-12-09 21:00:55 +08:00
黄井泉 f3385cb0b4 Merge branch 'dev_newproject' into 'develop' 
issue详情删除commit权限



See merge request !53
 2016-12-09 20:41:41 +08:00
huang b85cad8c7f issue详情删除权限 2016-12-09 20:40:30 +08:00
daiao 66b46bf7b2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-09 20:30:14 +08:00
黄井泉 47e09e644e Merge branch 'dev_newproject' into 'develop' 
Commit的分页及一些修改



See merge request !52
 2016-12-09 20:27:59 +08:00
huang 85ef1108c9 翻页及commit详情 2016-12-09 20:26:32 +08:00
huang 9d0a941926 issue commit的一些改进 2016-12-09 20:06:10 +08:00
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
daiao 92bc7aa813 个人首页的7个tab 2016-12-09 19:32:00 +08:00
cxt 6903639699 微信缺陷@页面的按钮样式调整 2016-12-09 19:28:20 +08:00
huang 5970fc608b 项目简介字体调整 2016-12-09 17:37:39 +08:00
huang 50a4db24ec 组织二级域名对一些关键做限制 2016-12-09 17:26:36 +08:00
huang 41b6c64af3 Merge branch 'guange_dev' into develop 2016-12-09 16:53:18 +08:00
guange 34b14b4e51 微信bug修改 2016-12-09 16:52:01 +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
cxt b0559788db 班级作业的左侧“班级活跃度”、“班级英雄榜”“班级推荐”修改文字 2016-12-09 10:12:05 +08:00
cxt 67d23a2161 多级回复的显示调整 2016-12-09 10:01:53 +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
huang d98b1e17cc Gitlab提供搜索接口，commit 关联提供搜索功能及局部刷新 2016-12-08 16:36:11 +08:00
cxt 92871ff925 弹框样式调整、作业截止后附件不能删除 2016-12-08 16:24:17 +08:00
cxt 9ca4001c8c 追加附件的调整 2016-12-08 15:29:51 +08:00
daiao 1875b6ecf7 个人首页的项目社区 2016-12-08 14:14:52 +08:00
cxt abdbfd87b0 班级的邀请码增加“停用”和“启用”功能，停用的邀请码不允许用户主动加入班级 2016-12-08 13:40:11 +08:00
huang 0785c71308 issue和commit关联的一些修改和调整 2016-12-08 11:26:37 +08:00
daiao 224c0b686c 个人首页的课程社区 2016-12-08 09:59:22 +08:00
huang a1a96e4667 issue编辑优化，性能简单优化 2016-12-08 09:55:41 +08:00
huang 122946804d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-12-08 09:36:36 +08:00
huang c84d17bd6a 用户邮箱没注册时候显示用户邮箱方法封装 2016-12-08 09:36:01 +08:00
huang 8ba747e195 版本库diff页面（Issue和commit关联） 2016-12-08 09:16:14 +08:00
cxt c24f9b8c3b 作业的小齿轮菜单增加“启用匿评”的选项，同时更新“禁用匿评”的提示信息、禁用匿评的作业截止后也可以编辑“是否启用匿评” 2016-12-07 17:23:52 +08:00
cxt c088af4ea8 成绩仅对自己可见：作业的匿评，评分者自己也看不到成绩了 2016-12-07 15:57:51 +08:00
huang 64b8c0c3f3 issue edit方法优化 2016-12-07 15:47:57 +08:00
huang 12b73f54d3 commit issue关联提供删除功能，局部刷新 2016-12-07 15:39:48 +08:00