Commit Graph

3461 Commits

Author SHA1 Message Date
huang 867434531d pull request 列表页面添加分页 2016-08-09 15:28:06 +08:00
huang 87c5f50545 PULL request 评论创建及局部刷新 2016-08-09 14:51:48 +08:00
Tim 5dd6244a34 pull request添加留言 2016-08-09 10:45:14 +08:00
Tim cd30f94d72 题库发送预览弹框位置及可拖拽js更新 2016-08-05 18:01:11 +08:00
cxt e7e873e0df Merge branch 'dev_shcool' into develop
Conflicts:
	app/helpers/users_helper.rb
2016-08-05 16:32:10 +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 dd768c2913 Merge branch 'cs_optimize_txz' into develop
Conflicts:
	public/stylesheets/css/common.css
2016-08-05 15:30:03 +08:00
huang 81ce93e88b Merge branch 'rep_quality' into develop 2016-08-05 15:28:39 +08:00
Tim be5e74897a 项目弹框位置调整 2016-08-05 15:26:15 +08:00
Tim 82644bcd81 加入班级、项目弹框可拖拽 2016-08-05 14:36:01 +08:00
Tim 56452d69f4 侧导航字体大小,颜色更改 2016-08-05 14:11:35 +08:00
huang b86b2299a7 fork分支选择 js 2016-08-05 11:10:39 +08:00
huang b297446778 select选择框 2016-08-05 10:42:06 +08:00
yuanke 491b6fcb72 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-04 18:10:47 +08:00
yuanke bb46aa4745 微信点击已审批模版消息进入界面显示修改 2016-08-04 18:09:54 +08:00
Tim 1335dc1b76 提示文字取消粗体 2016-08-04 17:27:53 +08:00
Tim 28a29fa724 拖拽删除 2016-08-04 16:50:33 +08:00
yuanke d5df45e8fb 项目动态点入详情后返回需回到点入的项目动态处 2016-08-04 16:35:07 +08:00
cxt b7c05fed4a 首页样式和js调整 2016-08-04 16:33:51 +08:00
yuanke 55afb84aef 模版消息标题加上句号,审核模版消息再次点击显示修改 2016-08-04 15:32:25 +08:00
yuanke e4a414e550 微信菜单跳入加入项目和班级界面点取消要能返回公众号界面 2016-08-04 14:37:04 +08:00
yuanke 12a9c95c01 微信项目及班级邀请码相关BUG修改 2016-08-04 14:07:35 +08:00
Tim b8a40862ce 改变行代码格式化,不折行 2016-08-04 14:04:55 +08:00
yuanke 3c2ab32121 微信动态分享修改 2016-08-04 11:17:50 +08:00
cxt 6c7b53f7d4 首页左侧栏 2016-08-04 11:05:34 +08:00
yuanke 4bae4527a2 微信分享URL修改 2016-08-04 10:48:13 +08:00
yuanke aaa1c01eed 微信动态分享图片修改 2016-08-04 10:47:35 +08:00
yuanke c0579de57d 微信分享内容修改 2016-08-04 10:00:55 +08:00
yuanke 13d59be389 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-04 09:09:50 +08:00
yuanke 17c98eb9fe 微信分享修改 2016-08-04 09:08:18 +08:00
Tim 7b6675ed6a Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
Conflicts:
	public/assets/wechat/join_project.html
2016-08-03 16:41:15 +08:00
Tim 950b18c250 加入班级提示 2016-08-03 16:39:22 +08:00
yuanke 29e707a88d 微信加入项目修改、二级回复三个回复时多了个边框BUG修改等 2016-08-03 16:31:33 +08:00
Tim a5fe620452 题库翻页居中对齐 2016-08-03 14:57:02 +08:00
yuanke a34272027e 微信菜单及项目班级审核修改 2016-08-03 14:55:54 +08:00
cxt acc3ba121f 测试集的显示、新版分页 2016-08-03 13:46:59 +08:00
cxt 718b13e6c1 新版题库 2016-08-03 11:12:55 +08:00
Tim e7fa38e52c pull request show页面 2016-08-03 11:00:31 +08:00
yuanke 6ee6cdf28f 微信项目加入审核修改 2016-08-03 10:56:55 +08:00
daiao 5f969c6593 单位审核相关Bug修复 2016-08-03 10:36:03 +08:00
yuanke 65719add19 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-03 09:37:36 +08:00
yuanke 4ab2427827 微信项目及课程申请审核相关功能 2016-08-03 09:37:24 +08:00
guange 6f2b84570f 去除调试模式 2016-08-02 17:48:51 +08:00
guange 56d6f4b9bc 定制分享内容 2016-08-02 17:36:59 +08:00
guange 2a67ec5407 配置登录页菜单 2016-08-02 17:27:40 +08:00
yuanke 614e877e6e 微信项目和班级加入修改 2016-08-02 15:50:15 +08:00
Tim 3e95b070d0 合并请求代码 2016-08-02 15:00:05 +08:00
Tim 9af8757ceb 项目合并请求 2016-08-02 10:03:42 +08:00
Tim be36755d95 代码合并页面 2016-08-01 16:53:33 +08:00