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

592 Commits

Author SHA1 Message Date
huang 803bd9819a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/css/public.css
 2016-08-26 17:55:51 +08:00
huang a434942b6d Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-26 15:14:07 +08:00
huang 60a76e64a5 贡献列表 2016-08-26 15:13:07 +08:00
cxt b8dc444cc7 普通作业和编程作业在题库发送后，编辑并进行发布，没有自动创建作品列表 
复制班级功能里，勾选“作业”，同上

对应方法：在作业的发布时间点（不用考虑作业是通过何种途径生成的），除了发布作业外，应该为该作业自动创建完整的作品列表（分组作业除外）
 2016-08-23 10:17:08 +08:00
yuanke 9446760258 Merge branch 'weixin_guange' into develop 
Conflicts:
	db/schema.rb
 2016-08-14 09:56:17 +08:00
yuanke 7c222373dc 修改获取用户关注公众号结果 2016-08-14 09:55:02 +08:00
yuanke 8ab003d5ee 分享页提交回复未关注公众号会跳到二维码界面 2016-08-14 09:38:47 +08:00
guange b6bec5f9a7 wechat的access_token被复盖了 2016-08-13 21:51:55 +08:00
huang 966722b920 关闭和打开的时候显示root问题 2016-08-13 16:43:00 +08:00
guange 817fdad21d . 2016-08-13 16:24:37 +08:00
guange 70d58ccf85 恢复授权页 2016-08-13 15:24:52 +08:00
yuanke 88e23dca80 微信回复自动注册及获取微信昵称修改 2016-08-12 18:19:21 +08:00
yuanke 2ff83aff81 调试 2016-08-12 17:30:48 +08:00
yuanke bd12ea169d 调试 2016-08-12 16:58:48 +08:00
yuanke be0dd6c110 调试 2016-08-12 15:50:00 +08:00
yuanke 5b208202a0 调试 2016-08-12 15:38:17 +08:00
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