Commit Graph

13434 Commits

Author SHA1 Message Date
huang f7cb451feb gitlab版本库添加提交信息统计接口 2016-04-13 14:36:43 +08:00
Tim deda05b048 作业下拉选择 2016-04-13 14:23:24 +08:00
cxt 4d581d07b8 作业发布默认选中禁用匿评 2016-04-13 14:14:41 +08:00
cxt fcd1684658 作业列表按更新时间排序 作业列表左上角添加作业的下拉列表 2016-04-13 11:20:38 +08:00
cxt 7fcd229f85 分组作业--作品列表中:点击关联的项目跳转至该项目主页 2016-04-13 10:09:54 +08:00
cxt 59f49f586b 上线测试版 2016-04-12 16:32:53 +08:00
cxt a6f4b7f505 测试版 2016-04-12 16:23:52 +08:00
huang 04849659de 版本库统计 2016-04-12 16:00:54 +08:00
cxt 5a3b68816a 冲突 2016-04-12 15:57:18 +08:00
cxt e420be8ee9 Merge branch 'weixin_guange' into develop
Conflicts:
	app/models/blog_comment.rb
2016-04-12 15:56:08 +08:00
txz 38c182d76a 作业发布者真名为空时,显示昵称 2016-04-12 15:51:18 +08:00
cxt 70afbb3323 姓名的判断、 2016-04-12 15:46:56 +08:00
cxt 1882cd8f4f 用户姓名不显示 2016-04-12 15:42:59 +08:00
cxt cb7834fa97 解决冲突 2016-04-12 15:14:55 +08:00
cxt 2898805aa7 回复的模板消息 2016-04-12 15:12:40 +08:00
txz efca9c5d17 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-12 14:56:24 +08:00
txz 3665597153 详情页面排版调整 2016-04-12 14:56:17 +08:00
huang dc0b7defa1 版本库show页面简化及注释 2016-04-12 11:10:30 +08:00
cxt 00d79f2ed0 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-12 11:00:56 +08:00
cxt 275895f805 模板消息的重构 2016-04-12 11:00:47 +08:00
txz a6fcb072c0 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-11 15:11:12 +08:00
txz f82ad97a68 详情页面回复框宽度问题 2016-04-11 15:11:01 +08:00
guange 055ba00de5 绑定成功后关闭页面 2016-04-09 23:20:24 +08:00
guange 7c5d62b8a8 头像url不显示 2016-04-09 23:16:22 +08:00
guange 18f5f08bb7 Merge branch 'weixin_guange' into develop 2016-04-09 22:48:40 +08:00
guange 73ad787e23 修改到正式版 2016-04-09 22:48:10 +08:00
cxt 5e3e2e64a9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-09 18:35:07 +08:00
cxt 40dba4d463 Merge branch 'develop_new' into develop 2016-04-09 18:34:51 +08:00
guange beec2b3246 merge 2016-04-09 18:17:07 +08:00
guange cadb5f3f15 更换服务器至test.course.trustie.net 2016-04-09 18:15:54 +08:00
huang a2a3d6b6b9 Merge remote-tracking branch 'remotes/origin/weixin_guange' into develop
Conflicts:
	app/models/blog_comment.rb
2016-04-09 17:01:20 +08:00
cxt c041f742c1 缺陷和留言的回复 2016-04-09 16:21:13 +08:00
guange 2d41d0a2f6 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-09 16:02:24 +08:00
cxt 007fee95bd 作业和留言回复的模板消息 2016-04-09 14:41:45 +08:00
cxt 3f365e75b5 讨论区的模板消息 2016-04-09 14:13:59 +08:00
cxt b6adaf61db Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-09 13:29:34 +08:00
cxt 930d95f8b5 私有动态不显示的问题 2016-04-09 13:29:26 +08:00
guange 96dfeead0f Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 21:46:56 +08:00
txz 02a5e7752d 微信环境切换 2016-04-08 21:46:41 +08:00
huang ab34fec172 资源导入的时候记数没有自动增加问题 2016-04-08 21:30:59 +08:00
huang 3f3048a51b 组织私有课程、项目关联提示 2016-04-08 21:04:06 +08:00
cxt 281fcf315f 点击模板消息页面为空 2016-04-08 21:01:15 +08:00
huang f951d22d56 发布博客500问题 2016-04-08 20:53:30 +08:00
huang cd9ad535f5 1、修改默认图片
2、作品弹框问题
2016-04-08 20:44:09 +08:00
guange 9ae030ed9e Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-04-08 20:02:40 +08:00
guange 3ff19364dc merge 2016-04-08 20:02:19 +08:00
cxt 845b1cdab8 模板 2016-04-08 19:54:33 +08:00
cxt 6f1878f120 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 18:52:42 +08:00
cxt 440ba27fa4 回复 2016-04-08 18:52:26 +08:00
txz 0262e3b8ab 回复长单词显示问题 2016-04-08 18:46:46 +08:00