Commit Graph

15344 Commits

Author SHA1 Message Date
cxt 6fdab3c613 Merge branch 'cxt_course' into develop 2016-07-22 18:20:41 +08:00
cxt 6c7925a7b4 样式调整 2016-07-22 18:20:11 +08:00
cxt 45fb2d0a3e Merge branch 'develop' into cxt_course 2016-07-22 17:14:28 +08:00
cxt 6d4835c6cc 样式调整 2016-07-22 17:13:40 +08:00
huang b71a19d53e Gemfile还原 2016-07-22 16:55:10 +08:00
cxt 808b553e43 班级动态只有10条,底部却显示“点击展开更多” 2016-07-22 16:50:32 +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 4d79f93079 Merge branch 'cs_optimize_txz' into develop 2016-07-22 16:43:17 +08:00
cxt 27fa113de1 组织动态报500 2016-07-22 16:40:28 +08:00
cxt 27afee03b2 编辑课程的英文名称时输入框不清空 2016-07-22 16:38:09 +08:00
cxt 02a5254943 课程大纲的回复展开更多无反应 2016-07-22 16:36:25 +08:00
huang 8dbdebe02e 修改动态问题 2016-07-22 16:35:03 +08:00
huang 160b05ae89 组织匿名数据处理 2016-07-22 16:03:33 +08:00
cxt 6b1116dfd1 课程的回复和名称的编辑 2016-07-22 16:00:56 +08:00
huang 19734c1aa4 组织匿名用户问题 2016-07-22 15:39:15 +08:00
cxt 9422e2886c 新版班级主页 2016-07-22 15:32:37 +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 5d61d52890 Merge branch 'rep_quality' into develop 2016-07-22 10:35:29 +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
cxt 1e28ff880d 新版课程大纲 2016-07-22 10:20:28 +08:00
huang ff8cad5cf2 项目动态中添加提交动态 2016-07-21 18:08:13 +08:00
yuanke fccd8d463c Merge branch 'weixin_guange' into develop 2016-07-21 17:53:42 +08:00
yuanke d975067e13 微信正式版配置 2016-07-21 17:52:52 +08:00
yuanke 6eb6c36416 Merge branch 'weixin_guange' into develop 2016-07-21 17:38:03 +08:00
yuanke 178222858c Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-21 17:37:18 +08:00
yuanke 16fef58885 发送班级界面不显示没班级的课程 2016-07-21 17:37:03 +08:00
txz b638f9aea6 tab页issue标题改为问题 2016-07-21 17:33:20 +08:00
yuanke 1aba4394e9 Merge branch 'weixin_guange' into develop 2016-07-21 17:24:05 +08:00
txz 19781ded4e 输入框padding调整 2016-07-21 17:22:03 +08:00
guange c5fec1dcdf Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-21 17:21:17 +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
txz 8fd915bf1a issue标题改为问题 2016-07-21 17:18:09 +08:00
huang 466a25c121 提交后更新项目动态表update时间 2016-07-21 17:02:50 +08:00
yuanke 0622978920 微信新用户注册后返回公众号 2016-07-21 16:59:47 +08:00
yuanke 9ababc5aa4 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-21 16:50:32 +08:00
yuanke 5a8f1b3d83 绑定成功后返回公众号 2016-07-21 16:50:15 +08:00
txz 00c3e880e6 微信详情页面返回定位js 2016-07-21 16:21:00 +08:00
huang 472eb4736e 修改数据类型 2016-07-21 16:17:40 +08:00
huang 246923a335 版本库新增提交次数表,增加至项目动态 2016-07-21 16:09:07 +08:00
huang 3fb5322b03 版本库历史数据处理 2016-07-21 16:08:13 +08:00
txz 4a58777bb9 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-21 15:56:31 +08:00
txz 0a0f8aefac 微信加入班级弹框css兼容;app页面meta标签修改 2016-07-21 15:56:27 +08:00
yuanke 86731c34d5 单个课程作业不显示的BUG修改,加入班级时如果班级已被删除需要提示! 2016-07-21 15:21:09 +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
cxt 60bbe89c0d 博客的自动保存 2016-07-21 14:05:15 +08:00
yuanke 92ffbcfce6 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-21 14:03:16 +08:00
yuanke 7cd505ea4b 博客详情动态加入二级回复的展开功能一级一级回复的更多功能。 2016-07-21 14:03:04 +08:00