 cxt
|
5870c3eaaf
|
子栏目讨论区列表的排序、作品内容的样式调整
|
2016-10-14 18:24:54 +08:00 |
|
cxt
|
2d7c7dc05d
|
左侧讨论区子栏目的样式修改
|
2016-10-14 17:13:26 +08:00 |
|
cxt
|
a1b70a7e91
|
Merge branch 'cxt_course' into develop
|
2016-10-14 16:18:12 +08:00 |
 huang
|
b9d87b1b29
|
Merge branch 'develop' into rep_quality
Conflicts:
public/stylesheets/css/project.css
|
2016-10-14 15:43:45 +08:00 |
|
huang
|
b408b6ef97
|
组织历史版本删除功能
|
2016-10-14 14:46:48 +08:00 |
|
huang
|
4646f20bba
|
项目版本库历史版本删除功能及弹框样式
|
2016-10-14 14:28:51 +08:00 |
|
cxt
|
12ad7c1612
|
班级讨论区增加二级子栏目
|
2016-10-14 14:28:19 +08:00 |
|
huang
|
db63a5514d
|
项目资源库历史版本更新及局部刷新
|
2016-10-14 13:45:47 +08:00 |
 yuanke
|
7dc0ba005e
|
Merge branch 'dev_shcool' into develop
Conflicts:
app/views/issues/index.html.erb
app/views/users/_course_newslist.html.erb
|
2016-10-13 14:37:37 +08:00 |
|
cxt
|
f56fc5a44d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-13 14:25:36 +08:00 |
|
cxt
|
252da9c3d3
|
Merge branch 'cs_optimize_txz' into develop
|
2016-10-13 14:24:01 +08:00 |
|
yuanke
|
1afa774fa9
|
Merge branch 'weixin_guange' into develop
|
2016-10-13 14:23:52 +08:00 |
|
cxt
|
5fb7da4681
|
Merge branch 'cxt_course' into develop
Conflicts:
public/stylesheets/css/public.css
|
2016-10-13 14:17:54 +08:00 |
|
cxt
|
39151c0e65
|
班级-多重角色的显示错误：当一个成员的身份是：助教和学生时，角色切换按钮显示的是“学生身份”和“教师身份” 正确的应该是“学生身份”和“助教身份”
|
2016-10-13 14:14:32 +08:00 |
|
huang
|
dd4d20011d
|
公共资源库显示优化
|
2016-10-13 09:43:53 +08:00 |
|
yuanke
|
5ac30fe09c
|
Merge branch 'cxt_replies' into weixin_guange
|
2016-10-13 08:49:20 +08:00 |
 Tim
|
8459779e6f
|
个人主页签名折行显示
|
2016-10-12 17:26:53 +08:00 |
 daiao
|
41ee915ece
|
数据为空时，帮助中心，问题和建议报500
|
2016-10-09 16:55:41 +08:00 |
|
huang
|
125a389448
|
数据为空的时候“帮助中心”500问题
|
2016-10-09 15:33:22 +08:00 |
|
yuanke
|
eb3a463166
|
Merge branch 'develop' into weixin_guange
|
2016-10-09 10:36:18 +08:00 |
|
yuanke
|
d407b5ab10
|
搜索中加入课程
|
2016-10-09 10:35:43 +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 |