Commit Graph

16399 Commits

Author SHA1 Message Date
yuanke 4ea468eacb Merge branch 'weixin_guange' into develop 2016-09-12 17:44:04 +08:00
yuanke 168a47fabb 微信通知显示被删除修改 2016-09-12 17:34:55 +08:00
yuanke 7c9f5a4f2d 微信通知已被删除加上日志 2016-09-12 16:40:31 +08:00
cxt 3f497bafd4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-09 18:02:55 +08:00
cxt 61836dbe93 组织动态报500 2016-09-09 18:02:47 +08:00
Tim b9fec966c7 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-09 17:58:32 +08:00
Tim 1fe8b35fc9 课程名称,班级名称过长时,省略号显示 2016-09-09 17:58:21 +08:00
Tim 34a1bb0b49 侧导航课程,班级名称过长显示效果 2016-09-09 17:54:54 +08:00
huang ddb369928f 消息列表问题 2016-09-09 17:44:41 +08:00
huang 7fd73348a6 消息404问题 2016-09-09 17:41:09 +08:00
huang 59ebadd406 Merge branch 'cxt_course' into develop
Conflicts:
	app/views/layouts/_user_courses.html.erb
2016-09-09 17:25:51 +08:00
daiao 67757b90c8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-09 17:25:27 +08:00
daiao 75908f976c Merge branch 'dev_shcool' into develop 2016-09-09 17:23:45 +08:00
huang aff9c38737 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-09 17:22:53 +08:00
huang 121537bfcb 消息404问题 2016-09-09 17:22:38 +08:00
daiao f9a905a344 issue详情页面回复,点击附件直接下载(应该是预览) 2016-09-09 17:22:10 +08:00
Tim 3d68e8963a 侧导航课程和班级超长时,省略号显示 2016-09-09 17:11:51 +08:00
yuanke fa61895e66 Merge branch 'weixin_guange' into develop 2016-09-09 17:11:26 +08:00
yuanke fc01558e55 修改管理课程文字提示 2016-09-09 17:09:02 +08:00
Tim 09985350ad Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-09-09 16:48:53 +08:00
Tim 8c95141460 侧导航箭头显示 2016-09-09 16:48:43 +08:00
cxt af1aa2cac4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-09 16:44:28 +08:00
cxt d44aea1ce1 左侧班级列表的黑点改成灰色 2016-09-09 16:44:22 +08:00
huang 502bd9f451 里程碑样式过长问题 2016-09-09 16:37:24 +08:00
huang 3a6237a6e4 修复里程碑样式问题 2016-09-09 16:32:15 +08:00
yuanke 80ab8801ce Merge branch 'weixin_guange' into develop 2016-09-09 16:05:32 +08:00
daiao 70fc7761da Merge branch 'dev_shcool' into develop 2016-09-09 16:03:13 +08:00
daiao 2307c0c3c0 项目列表,添加“公开"字样 2016-09-09 16:00:51 +08:00
cxt 5d83c66949 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	db/schema.rb
2016-09-09 15:58:42 +08:00
huang 7899bfe985 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	app/views/issues/_form.html.erb
	db/schema.rb
2016-09-09 16:00:05 +08:00
huang 25b347b379 Merge branch 'rep_quality' into develop 2016-09-09 15:59:02 +08:00
cxt 0437920438 Merge branch 'dev_shcool' into develop 2016-09-09 15:58:15 +08:00
huang 00e6549bec 解决issue详情性能N+1问题 2016-09-09 15:56:40 +08:00
cxt bc2e9f2231 Merge branch 'cxt_course' into develop 2016-09-09 15:55:54 +08:00
cxt 547e786a10 “全部”添加链接 2016-09-09 15:54:51 +08:00
Tim f6efefd38d Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-09-09 15:50:05 +08:00
Tim 862bbd1a1f 班级名称前增加课程名,一系列更改 2016-09-09 15:49:31 +08:00
cxt 724ae058db 班级左侧添加“分班”入口 2016-09-09 15:49:24 +08:00
yuanke 564da2ed72 微信课件下载修改 2016-09-09 15:36:15 +08:00
cxt 355f0580cb 作业状态的api 2016-09-09 15:28:32 +08:00
daiao de769454a7 修复公共贴吧:回复非汉字类型内容超出边框的问题 2016-09-09 15:16:08 +08:00
yuanke 9997de0d96 微信课件下载不需要登录 2016-09-09 15:14:24 +08:00
daiao 96dfa4281d 修复:强制修改页面,左侧编辑个人资料可用 2016-09-09 15:03:46 +08:00
yuanke 5f77c97c9d 课件下载功能 2016-09-09 15:01:46 +08:00
daiao 33c6514cde Merge branch 'develop' into dev_shcool 2016-09-09 14:45:46 +08:00
daiao 89f3e0ee0d 项目iuss:编辑issue时,弹出空白弹框的问题 2016-09-09 14:43:47 +08:00
huang 4900ff5492 里程碑中添加 完成者姓名 2016-09-09 14:36:03 +08:00
daiao 19d925d592 项目列表中公开项目无法点击 2016-09-09 14:22:47 +08:00
daiao 4959910ebe ucloud无法发布新issue 2016-09-09 14:20:56 +08:00
Tim b796ac3b53 Merge branch 'develop' into cxt_course
Conflicts:
	app/views/exercise/_student_table.html.erb
	db/schema.rb
2016-09-09 13:30:10 +08:00