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

626 Commits

Author SHA1 Message Date
yuanke 0369716df7 调试 2016-08-12 15:35:12 +08:00
yuanke efc1c106a4 调试 2016-08-12 15:27:47 +08:00
yuanke e732a47f2f 调试 2016-08-12 15:02:40 +08:00
yuanke cfbbe3ab89 获取用户昵称修改 2016-08-12 14:56:48 +08:00
yuanke c307f7769f 调试 2016-08-12 14:13:53 +08:00
yuanke 5c42cdb39c 分享内容时改为用户信息授权方式 2016-08-12 10:40:36 +08:00
huang dcdc09d864 修改gitlab api接口 2016-08-09 15:02:15 +08:00
huang ecc6f5601e 接受请求后显示admin问题 2016-08-05 20:14:19 +08:00
cxt 3178700131 Merge branch 'cxt_course' into develop 2016-08-05 16:14:56 +08:00
huang 81ce93e88b Merge branch 'rep_quality' into develop 2016-08-05 15:28:39 +08:00
huang 5419103268 修改API(gitlab中创建所有pullrequest为Admin的问题) 2016-08-04 17:01:19 +08:00
huang 0a9224d036 每次请求提交的代码 2016-08-03 14:43:27 +08:00
huang be081f5c66 添加Api（提交内容，改动）及相关方法路由 2016-08-03 13:57:59 +08:00
cxt acc3ba121f 测试集的显示、新版分页 2016-08-03 13:46:59 +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
daiao 6bd9f47222 Merge branch 'dev_shcool' into develop 
Conflicts:
	db/schema.rb
 2016-07-28 20:02:57 +08:00
yuanke 283dc86a8b Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 
Conflicts:
	db/schema.rb
	public/assets/wechat/homework_detail.html
	public/javascripts/wechat/controllers/activity.js
 2016-07-28 15:23:12 +08:00
yuanke 6d594cfcbe git pull后重新commit 2016-07-28 15:11:04 +08:00
huang 29edd60ce6 Merge branch 'daiao_dev' into dev_shcool 2016-07-27 10:54:38 +08:00
guange 4bdb679352 将微信token缓存到rails体系里面 2016-07-26 18:27:27 +08:00
yuanke 1ae23bafe4 改回原来的 2016-07-26 10:12:49 +08:00
guange 6a871e2116 . 2016-07-25 17:09:14 +08:00
guange 9d2900d58f 解决没绑定用户不跳转到绑定页问题 2016-07-25 16:59:52 +08:00
guange e31fbe9b50 解决task报错，找不到uglifier的问题 2016-07-25 15:29:47 +08:00
huang 35172dab59 管理员界面单位申请框架 2016-07-25 10:59:08 +08:00
huang 9b97f7e472 解决用户主页关注和粉丝问题 2016-07-22 17:58:01 +08:00
huang 0e1a52726f Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/base_syllabus.html.erb
 2016-07-22 16:46:01 +08:00
huang 6fea64afe2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-22 10:35:44 +08:00
huang 537cc20e06 已repository_id为范围，version唯一性控制 2016-07-22 10:34:59 +08:00
huang 2381a78e1b 提交次数比较多的项目数据迁移 2016-07-22 10:23:12 +08:00
yuanke 1aba4394e9 Merge branch 'weixin_guange' into develop 2016-07-21 17:24:05 +08:00
guange 080b2ac2fa 兼容ruby2.3.1 2016-07-21 17:21:02 +08:00
huang 4e4ff4958f 修改changeset触发事件 2016-07-21 17:19:45 +08:00
huang 466a25c121 提交后更新项目动态表update时间 2016-07-21 17:02:50 +08:00
huang 3fb5322b03 版本库历史数据处理 2016-07-21 16:08:13 +08:00
cxt 71b5fe1273 Merge branch 'develop' into cxt_course 
Conflicts:
	app/controllers/issues_controller.rb
	app/views/issues/_issue_replies.html.erb
	app/views/issues/_issue_reply_ke_form.html.erb
	db/schema.rb
 2016-07-21 14:31:43 +08:00
yuanke f0840d0f31 Merge branch 'develop' into weixin_guange 2016-07-21 14:29:04 +08:00
huang f979e80f24 Gitlab数据清理及迁移，主要是历史数据 2016-07-20 17:05:55 +08:00
cxt 7853b8aa54 班级通知、项目新闻、帖子栏目通知的动态和详情页的二级回复， 二级回复代码的整合 2016-07-20 17:00:18 +08:00
huang 14e6db457b rake 2016-07-20 09:38:23 +08:00
huang 0c0dfbd093 changeset关联 2016-07-19 17:38:11 +08:00
huang cf04bb5ec6 迁移上线 2016-07-19 15:59:52 +08:00
huang 04fe06eff9 gitlab数据迁移 2016-07-19 09:39:47 +08:00
huang facf3ae8f8 提交次数写入动态中 2016-07-18 16:45:49 +08:00
yuanke f3d74fcd55 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-18 11:08:09 +08:00
guange 51692eadd6 改进上线流程 2016-07-17 00:49:35 +08:00
cxt c9e0143fe8 作业动态的时间 2016-07-15 19:36:46 +08:00
huang 87e1e0c4b1 rake任务，课程作业关联项目后获取最新版本库提交时间 2016-07-15 14:45:06 +08:00
huang 3485d48163 Merge branch 'develop' into rep_quality 
Conflicts:
	app/controllers/quality_analysis_controller.rb
 2016-07-14 14:08:03 +08:00
huang e766adf087 add delete to qa 2016-07-12 16:23:30 +08:00
cxt 66c40ba139 动态的更新时间 2016-07-12 09:41:00 +08:00
cxt 5d9bde3c95 课程发送资源到课程 2016-07-11 15:10:55 +08:00
huang 6b8b20e127 logger to puts 2016-07-08 19:45:15 +08:00
huang b0aa3c18c3 Merge branch 'rep_quality' into develop 2016-07-08 14:43:29 +08:00
huang 8916cc7730 update homeworkcommon time 2016-07-08 14:40:21 +08:00
cxt cc4b24cdb9 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-07-08 13:18:46 +08:00
cxt 13bae8f8a5 线下作业 2016-07-08 13:17:14 +08:00
huang ef8b127225 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
	public/javascripts/application.js
 2016-07-08 11:33:51 +08:00
cxt a99b03ff76 管理员界面增加配置课程 2016-07-07 09:02:41 +08:00
huang f50c4a879b modified total commits 2016-07-05 17:35:56 +08:00
huang 74ee3205bd 淘宝源 2016-06-02 15:47:17 +08:00
cxt 7b7f9cf8f2 删除wechat无用代码 2016-05-24 19:52:51 +08:00
huang 4857769c49 Merge branch 'yuanke' into develop 2016-05-19 16:11:06 +08:00
huang fe54a19940 Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke 
Conflicts:
	app/views/blogs/_article.html.erb
	app/views/users/_project_boardlist.html.erb
	public/stylesheets/new_user.css
 2016-05-19 16:10:18 +08:00
txz 1b3bc38f8e 拖代码改动 2016-05-19 13:44:03 +08:00
yuanke 708cb35fd2 增加一个弹框的通用接口pop_up_box 2016-05-16 16:57:18 +08:00
huang 33a3b22430 Merge branch 'hjq_beidou' into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/org2.css
 2016-05-13 15:12:26 +08:00
huang 7759670fa1 Merge branch 'yuanke' into develop 
Conflicts:
	Gemfile
	public/stylesheets/new_user.css
 2016-05-13 11:39:01 +08:00
yuanke a39702f962 图片自动上传，代码测试编译错误过长。 2016-05-13 08:38:28 +08:00
cxt 7481d96166 Merge branch 'develop' into cxt_course 
Conflicts:
	app/controllers/admin_controller.rb
	config/routes.rb
	lib/redmine.rb
 2016-05-12 10:40:35 +08:00
huang 922958e732 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-11 16:23:58 +08:00
yuanke 5180fdab39 图片自动上传修改 2016-05-11 14:04:31 +08:00
huang 43f06c0826 版本库ZIP下载 2016-05-11 13:44:15 +08:00
yuanke 135e02504e 图片自动上传 2016-05-11 11:40:01 +08:00
yuanke e502aa7c43 KE表格项目问题，自动上传图片做了一点 2016-05-10 12:51:42 +08:00
cxt f6d7df7393 管理员界面添加“分享作业申请”列表 2016-05-09 18:40:21 +08:00
cxt 644e097dc8 定时更新关联项目的作业更新时间 2016-05-09 16:16:03 +08:00
huang 0a989daf31 Merge branch 'cxt_course' into develop 
Conflicts:
	app/helpers/application_helper.rb
	public/stylesheets/courses.css
	public/stylesheets/new_user.css
 2016-05-06 18:12:08 +08:00
cxt 10d26f89d9 作业列表的二级回复 2016-05-06 17:36:28 +08:00
huang df1c70880a Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_homework_repository.html.erb
	public/stylesheets/new_user.css
 2016-05-06 12:22:43 +08:00
cxt 0fafbffa49 项目的更新加到作业的最后更新时间中 2016-05-06 08:52:54 +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
guange cc9825e6a2 将wechat放到项目里面 2016-04-26 10:50:54 +08:00
guange 744c04b54a 修改gem源 2016-04-24 22:20:29 +08:00
huang ab8c1a0bad Merge branch 'hjq_beidou' into develop 2016-04-21 16:21:39 +08:00
huang cb2033c80f 去掉rake中输出 2016-04-21 16:20:29 +08:00
huang 81f8559c48 gitlab版本库成员同步任务 2016-04-21 16:04:00 +08:00
huang adc17c5038 代码优化 
文件目录动态获取接口
文件目录显示样式
 2016-04-19 09:34:55 +08:00
huang 7259d607dc Merge branch 'hjq_beidou' into develop 2016-04-18 15:38:11 +08:00
huang 41aa81f966 rake 任务：同步文件数 2016-04-18 14:44:29 +08:00
yuanke f1090d45ad Merge branch 'cxt_course' into yuanke 
Conflicts:
	db/schema.rb
 2016-04-15 14:13:44 +08:00
cxt d948536a10 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-14 12:33:15 +08:00
yuanke ef4b256313 Merge branch 'yuanke' into develop 
Conflicts:
	app/models/homework_common.rb
	config/locales/zh.yml
	db/schema.rb
 2016-04-14 11:32:35 +08:00
yuanke a8dce5e520 代码查重功能增加,管理员界面增加代码测试列表. 2016-04-14 11:29:22 +08:00
huang f7cb451feb gitlab版本库添加提交信息统计接口 2016-04-13 14:36:43 +08:00
huang 2162d7d4b8 组织banner上传功能 2016-04-06 10:40:38 +08:00
alan 1f0f7708c6 fix pagination bug 2016-03-30 15:09:06 +08:00
alan 03d855f5d5 修改资源区分页问题 2016-03-29 15:46:13 +08:00
alan 395fb8fae6 修改pagination,资源区bug 2016-03-28 22:37:01 +08:00