Commit Graph

10069 Commits

Author SHA1 Message Date
huang 29b2a257c7 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-23 09:29:38 +08:00
huang 5c54368518 项目新版base 2016-09-23 09:29:31 +08:00
daiao e16b5b2f5d issue界面功能调整 2016-09-23 09:27:34 +08:00
cxt caf5602389 课程大纲教师团队的管理 2016-09-23 09:22:47 +08:00
daiao 1da7b79cfb Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-23 09:05:37 +08:00
daiao b300c85227 issue界面功能调整 2016-09-23 09:05:26 +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
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
huang de0f49f850 ISSUE列表添加新的分页 2016-09-22 14:38:45 +08:00
Tim dac9502f1f 资源库来源title显示带html代码bug修复 2016-09-22 14:25:09 +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
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
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 8b771a183c 微信分班功能 2016-09-20 14:58:37 +08:00
cxt ba4a1c64d9 作业动态的重构 2016-09-19 17:14:14 +08:00
huang 8e6a88f7d8 项目日历功能 2016-09-19 16:19:59 +08:00
Tim 8d2636e3e6 甘特图css样式引用 2016-09-19 15:43:40 +08:00
huang 7ed7129ace 甘特图和日历显示及CSS架构 2016-09-19 14:23:33 +08:00
huang 728e1333fc issue author为空处理 2016-09-18 15:58:55 +08:00
huang 924db06cbf 项目版本库隐藏代码统计 2016-09-18 15:55:22 +08:00
cxt fc630b9322 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-18 15:11:20 +08:00
cxt 19721e20c5 Merge branch 'cxt_course' into develop 2016-09-18 15:11:11 +08:00
cxt f50663158a 新建班级页面的提示调整 2016-09-18 15:07:22 +08:00
cxt 3f7935bf85 班级/项目帖子锁定回复的,已有回复的二级回复按钮未屏蔽 2016-09-18 14:39:03 +08:00
huang 8aba516d1e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-18 14:21:02 +08:00
liguangye 53bdeed1e4 解决铃铛404问题 2016-09-18 14:20:08 +08:00
cxt b468134e3e Merge branch 'cxt_course' into develop 2016-09-14 21:19:01 +08:00
cxt 0d12acd42a 样式修改 2016-09-14 21:11:20 +08:00
cxt abdc08c7af 提交作品时左侧导航栏对应班级的导航栏 2016-09-14 20:58:15 +08:00
Tim b6389a22f3 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-14 20:46:35 +08:00
Tim 7b9ba6a1f7 问题反馈样式调整 2016-09-14 20:46:23 +08:00
daiao 912a840d70 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-14 20:32:27 +08:00
huang a593fa9239 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-14 20:33:41 +08:00
huang 54df8307a8 issue 500问题 2016-09-14 20:33:25 +08:00
daiao c4ed5b0e83 点击帮助中心,弹无效弹框 2016-09-14 20:32:12 +08:00
cxt f880ab1c14 样式调整 2016-09-14 20:02:43 +08:00
Tim caae04e77e 组员评分样式调整 2016-09-14 19:57:17 +08:00
cxt 1bd93904af Merge branch 'cxt_course' into develop 2016-09-14 19:47:24 +08:00
Tim 9064cf1aa2 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-09-14 19:44:56 +08:00
Tim e8cca255a0 分组作业点击展开效果 2016-09-14 19:44:46 +08:00
cxt 020018fd31 分组作业的作品列表样式修改 2016-09-14 19:31:14 +08:00
huang 7210eefe1d 1156项目讨论区异常问题 2016-09-14 18:51:32 +08:00
cxt 6f4618fffb 分组作业可对组员单独评分 2016-09-14 17:38:57 +08:00
huang 7ea2163bce Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-14 17:36:33 +08:00
huang 9f5e257890 作品列表搜索问题 2016-09-14 17:36:20 +08:00
daiao cd59a8d597 Merge branch 'dev_shcool' into develop 2016-09-14 17:28:27 +08:00
daiao bac1dc7779 Isuue详情页面附件上传者由登录名修改为姓名 2016-09-14 17:27:21 +08:00
daiao 4e6205e026 Merge branch 'dev_shcool' into develop 2016-09-14 17:11:12 +08:00
daiao 431f5ae492 修复帮助中心弹无效弹框 2016-09-14 17:09:26 +08:00
Tim 237d6f7d2e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-14 16:50:56 +08:00
Tim 7cd2a98f11 侧导航课程、班级名称长度控制;箭头替换;tip显示更改 2016-09-14 16:50:46 +08:00
cxt e4efc8c302 作业编辑 2016-09-14 16:45:10 +08:00
huang aeaf99f79e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-14 16:26:51 +08:00
daiao bad170ce22 Merge branch 'dev_shcool' into develop 2016-09-14 16:12:44 +08:00
daiao 5d8ed8c054 修改发送附件人名样式的问题 2016-09-14 16:07:43 +08:00
huang 89de36ec65 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-14 15:24:02 +08:00
daiao 5a25eb324b Merge branch 'dev_shcool' into develop 2016-09-14 15:13:31 +08:00
huang 054dae7acb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-14 15:13:03 +08:00
daiao e508cba951 1.游客进入班级,资源出现了两个入口 2016-09-14 15:10:26 +08:00
Tim ffedecab7a 新问题反馈样式;侧导航课程、班级名称长度js控制 2016-09-14 15:05:08 +08:00
daiao 41ab10410f 1. PullRequest后面加入请求数目 2016-09-14 13:15:00 +08:00
daiao 3e38b09219 修复:项目动态附件,组织列表,贴吧列表交流,贴吧吧主,贴吧发帖人,贴吧最后回复,详情页面问题跟踪,项目动态的指派的地方的用户改为显示用户姓名 2016-09-14 10:42:30 +08:00
Tim 0444904904 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-14 08:59:25 +08:00
Tim 135a2b21f5 新问题反馈样式更新 2016-09-13 18:53:00 +08:00
daiao f0d150ec47 点击首页底部的“帮助中心”,弹无效弹框 2016-09-13 17:05:42 +08:00
huang 235554a104 新闻首页优化 2016-09-13 16:34:40 +08:00
cxt 9002844188 新版发布作业 2016-09-13 16:18:57 +08:00
huang 390f68aad6 作品列表页面性能提升(主要是数据库查询减少,建立相关索引) 2016-09-13 14:57:45 +08:00
daiao 8626692367 项目issue:编辑issue后点击确定按钮,却还是返回的编辑模式 2016-09-13 14:47:05 +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
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
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