Commit Graph

17005 Commits

Author SHA1 Message Date
Tim 49a823fa5a Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-22 17:39:54 +08:00
huang f8fd3d79a0 issue列表 新查询的导出excel功能 2016-09-22 17:40:58 +08:00
Tim e6657ae422 甘特图样式调整 2016-09-22 17:39:45 +08:00
huang 0976f084f0 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-22 17:12:02 +08:00
huang 92b48ea218 甘特图 2016-09-22 17:11:36 +08:00
Tim cda32cdda9 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-22 17:10:34 +08:00
Tim a0772332da 项目侧导航快捷按钮样式更改 2016-09-22 17:04:45 +08:00
yuanke f7b9122031 Merge branch 'weixin_guange' into develop 2016-09-22 16:19:29 +08:00
yuanke 61c2f8fdd6 修改增加分班名称过长问题 2016-09-22 16:17:23 +08:00
daiao d0ae48bbf1 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-22 16:13:45 +08:00
daiao aacac0aa02 里程碑相关样式修改 2016-09-22 16:12:32 +08:00
yuanke 69007eeee4 Merge branch 'weixin_guange' into develop 2016-09-22 15:57:25 +08:00
Tim 0431d28fd1 分班管理样式调整 2016-09-22 15:35:43 +08:00
Tim 8a46d66e5c Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
Conflicts:
	public/assets/wechat/edit_class_group.html
	public/assets/wechat/join_classgroup.html
2016-09-22 15:29:28 +08:00
Tim b965e270e2 分班管理页面增加课程名,课程名与班级名之间点号同时显示,图标圆形显示 2016-09-22 15:27:16 +08:00
huang de0f49f850 ISSUE列表添加新的分页 2016-09-22 14:38:45 +08:00
yuanke 0716d4fa38 默认图片不显示 2016-09-22 14:29:00 +08:00
Tim 024d898dd3 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-22 14:25:31 +08:00
Tim dac9502f1f 资源库来源title显示带html代码bug修复 2016-09-22 14:25:09 +08:00
yuanke cc6029c136 Merge branch 'weixin_guange' into develop 2016-09-22 14:17:11 +08:00
yuanke 40d98887e9 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-09-22 14:04:17 +08:00
yuanke a169ad087b 加入分班时选择暂无返回班级列表刷新 2016-09-22 14:03:59 +08:00
Tim 0b1a22d9aa 分班管理样式更改 2016-09-22 13:56:57 +08:00
huang 775655b854 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-22 13:42:24 +08:00
yuanke 0a9d288880 Merge branch 'weixin_guange' into develop 2016-09-22 13:41:52 +08:00
huang 80105181ce issue中我的issue,指派给我的issue和全部issue js实现 2016-09-22 13:41:46 +08:00
yuanke 11132d3459 修改加入班级时选择分班后跳入页面 2016-09-22 10:49:53 +08:00
yuanke 72190a3639 去掉调试 2016-09-22 10:47:02 +08:00
yuanke eeef2e78f3 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-09-22 09:56:55 +08:00
yuanke 1798b8a086 微信班级logobug修改 2016-09-22 09:56:46 +08:00
Tim ab72bf5f08 分班管理界面調整 2016-09-22 09:48:37 +08:00
daiao c37c880eb2 里程碑加入导出excel功能 2016-09-22 08:40:41 +08:00
Tim c718cb2144 新建issue时,增加评审,来源,实际工时选项 2016-09-21 15:27:32 +08:00
Tim d83441fe7c 反馈框提交文字大小调整 2016-09-21 14:58:48 +08:00
Tim 25b2418730 完善资料界面问题反馈框样式更新 2016-09-21 14:33:46 +08:00
cxt d1c284c953 作业详情页 2016-09-21 10:34:38 +08:00
daiao ba57dbb284 Merge branch 'develop' into dev_shcool
Conflicts:
	app/views/users/_course_newslist.html.erb
2016-09-21 10:22:28 +08:00
huang 2ae7dd0087 项目issue导出excel功能 2016-09-21 10:18:40 +08:00
Tim fec493b287 Merge branch 'develop' into cs_optimize_txz 2016-09-21 09:44:59 +08:00
Tim e4f6852d1b 我的作业页面,按钮字体大小统一,作品数宽度增加 2016-09-21 09:44:02 +08:00
yuanke bda68495c9 . 2016-09-20 15:19:06 +08:00
yuanke 930acd382c 微信图片点击调试 2016-09-20 15:14:48 +08:00
yuanke 4e29242579 调试 2016-09-20 15:11:00 +08:00
yuanke 9b4e146577 . 2016-09-20 15:00:22 +08:00
yuanke 8bb1323612 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
Conflicts:
	public/assets/wechat/edit_userinfo.html
2016-09-20 14:59:40 +08:00
yuanke 8b771a183c 微信分班功能 2016-09-20 14:58:37 +08:00
Tim 2856cd06d5 微信图片内容点击可放大 2016-09-20 14:42:36 +08:00
huang 4d97dd3889 去掉项目module中dts测试工具 2016-09-19 17:22:30 +08:00
cxt ba4a1c64d9 作业动态的重构 2016-09-19 17:14:14 +08:00
huang 8e6a88f7d8 项目日历功能 2016-09-19 16:19:59 +08:00