Commit Graph

1921 Commits

Author SHA1 Message Date
huang 125a389448 数据为空的时候“帮助中心”500问题 2016-10-09 15:33:22 +08:00
huang 30e6bd6d0e 超级管理员看他人的项目列表500问题 2016-10-08 16:04:35 +08:00
huang 23d5d57f5c admin“隐藏项目”顶部显示“公共贴吧” 2016-10-08 10:49:50 +08:00
huang 351ca6d074 Merge branch 'rep_quality' into develop
Conflicts:
	app/views/layouts/_logined_header.html.erb
2016-10-08 10:41:05 +08:00
huang d29fb00c30 解决用户首页项目列表500问题 2016-10-08 10:29:01 +08:00
cxt b5782bae39 班级左侧导航的“分班” 2016-09-30 17:12:40 +08:00
Tim 7d3847656b 分班名称过长折行显示问题;分班编辑按钮定位;分班icon css 2016-09-30 17:01:55 +08:00
cxt b28579a3a3 Merge branch 'cxt_course' into develop 2016-09-30 14:49:57 +08:00
cxt 7b51812ebb 头像处添加“我的课程”快捷入口 2016-09-30 13:20:35 +08:00
Tim c245d2fecd 页面头部贴吧交流改为帮助中心 2016-09-29 15:49:53 +08:00
Tim 858348298b 项目加载慢时,有白色块显示bug修复 2016-09-29 14:24:42 +08:00
daiao a6114796b7 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-28 16:52:17 +08:00
huang a95e8aece4 隐藏项目信息的时候显示公共贴吧 2016-09-28 13:39:35 +08:00
huang d656d3e94c 项目评分为0 的时候显示 2016-09-27 19:43:11 +08:00
huang cc30093e5c 关注、添加成员样式一致 2016-09-27 09:21:41 +08:00
huang e7344b6540 项目访问数一致问题 2016-09-27 09:13:40 +08:00
huang db54d6e0d9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	public/stylesheets/css/project.css
2016-09-26 22:21:45 +08:00
cxt 2d321859fc Merge branch 'cxt_course' into develop 2016-09-23 18:34:57 +08:00
cxt e1ce5d2305 教师团队的删除判断、“增加教师”链接跳转时展开添加成员 2016-09-23 18:34:03 +08:00
cxt 398a6f1da7 Merge branch 'cxt_course' into develop 2016-09-23 16:50:45 +08:00
Tim 13f3ffec9f 侧导航调整 2016-09-23 16:47:12 +08:00
Tim 86a3ce185d 个人主页侧导航宽度限制更改,提示框效果及js实现 2016-09-23 14:17:23 +08:00
huang 751665089c 完成项目base搭建 2016-09-23 11:28:00 +08:00
huang 61f99137fc 去掉项目模式及数据迁移 2016-09-23 10:53:45 +08:00
huang a8acb4a6cb 项目base功能添加 2016-09-23 10:36:47 +08:00
huang 5c54368518 项目新版base 2016-09-23 09:29:31 +08:00
cxt caf5602389 课程大纲教师团队的管理 2016-09-23 09:22:47 +08:00
Tim d83441fe7c 反馈框提交文字大小调整 2016-09-21 14:58:48 +08:00
Tim 25b2418730 完善资料界面问题反馈框样式更新 2016-09-21 14:33:46 +08:00
huang 7ed7129ace 甘特图和日历显示及CSS架构 2016-09-19 14:23:33 +08:00
Tim 7b9ba6a1f7 问题反馈样式调整 2016-09-14 20:46:23 +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
daiao 5a25eb324b Merge branch 'dev_shcool' into develop 2016-09-14 15:13:31 +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 3e38b09219 修复:项目动态附件,组织列表,贴吧列表交流,贴吧吧主,贴吧发帖人,贴吧最后回复,详情页面问题跟踪,项目动态的指派的地方的用户改为显示用户姓名 2016-09-14 10:42:30 +08:00
Tim 135a2b21f5 新问题反馈样式更新 2016-09-13 18:53:00 +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 59ebadd406 Merge branch 'cxt_course' into develop
Conflicts:
	app/views/layouts/_user_courses.html.erb
2016-09-09 17:25:51 +08:00
Tim 3d68e8963a 侧导航课程和班级超长时,省略号显示 2016-09-09 17:11:51 +08:00
cxt d44aea1ce1 左侧班级列表的黑点改成灰色 2016-09-09 16:44:22 +08:00
cxt 0437920438 Merge branch 'dev_shcool' into develop 2016-09-09 15:58:15 +08:00
cxt 547e786a10 “全部”添加链接 2016-09-09 15:54:51 +08:00
Tim 862bbd1a1f 班级名称前增加课程名,一系列更改 2016-09-09 15:49:31 +08:00
daiao 96dfa4281d 修复:强制修改页面,左侧编辑个人资料可用 2016-09-09 15:03:46 +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