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 |
huang
|
dcbeea6dff
|
版本库可见权限优化
|
2016-10-14 09:01:25 +08:00 |
daiao
|
2324ad31e2
|
Merge branch 'develop' into dev_newproject
Conflicts:
app/views/issues/index.html.erb
public/stylesheets/css/common.css
public/stylesheets/css/project.css
|
2016-10-13 17:00:53 +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
|
e2ee75d8c1
|
项目宽版架构优化(主要是model及与课程等模块的分离)
|
2016-10-13 10:52:48 +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
|
4093847017
|
Merge branch 'develop' into dev_newproject
|
2016-10-12 16:29:14 +08:00 |
huang
|
227965aafe
|
新版base完成
|
2016-10-11 10:16:17 +08:00 |
huang
|
3c15c4f315
|
版本库权限,及项目收藏用户列表
|
2016-10-11 10:03:00 +08:00 |
huang
|
188db13c33
|
项目导航权限判断
|
2016-10-11 09:31:17 +08:00 |
huang
|
17743457e1
|
项目menu导航
|
2016-10-10 10:41:41 +08:00 |
huang
|
bd29a637b6
|
新版项目
|
2016-10-09 17:24:37 +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 |
daiao
|
984b540a63
|
游客身份,进入具体的班级和项目各功能入口的调整
|
2016-09-19 10:01:22 +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 |
cxt
|
b3f738ee5d
|
与班级相关平台班级名称规范调整
|
2016-09-09 10:23:18 +08:00 |
daiao
|
ed448f0087
|
Merge branch 'develop' into dev_shcool
Conflicts:
db/schema.rb
|
2016-09-09 09:31:17 +08:00 |
cxt
|
d8e04e7923
|
暂时隐藏“复制班级”
|
2016-09-08 14:04:40 +08:00 |
cxt
|
ab0863c9fb
|
平台的邀请码提示
|
2016-09-08 13:59:48 +08:00 |
cxt
|
252851b4ad
|
课程导航的修改
|
2016-09-05 16:36:43 +08:00 |
cxt
|
573eb13283
|
课程导航中的用户是创建该课程的老师,课程链接应跳到该用户的课程列表
|
2016-09-05 13:52:42 +08:00 |
daiao
|
3dc0e8407a
|
Merge branch 'develop' into dev_shcool
Conflicts:
app/views/organizations/_org_member_list.html.erb
app/views/organizations/setting.html.erb
app/views/users/_project_news.html.erb
|
2016-09-05 13:47:39 +08:00 |
Tim
|
9ec6074260
|
将头部帮助中心改为贴吧交流
|
2016-09-05 13:18:35 +08:00 |
cxt
|
01ca94bc98
|
未读消息弹框
|
2016-09-02 16:21:58 +08:00 |
daiao
|
9a3603c778
|
1.基本资料页面,身份为从业者时,直接点确定报提示问题
2.强制修改基本资料,修改资料按键错误
|
2016-09-02 16:11:14 +08:00 |
cxt
|
b588495847
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-02 15:26:23 +08:00 |
cxt
|
aaefd8b4aa
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_news_replies.html.erb
|
2016-09-02 15:24:55 +08:00 |
huang
|
58176456e1
|
Merge branch 'develop' into rep_quality
|
2016-09-02 15:23:00 +08:00 |
Tim
|
0d7e9d4f9b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-02 14:45:11 +08:00 |
Tim
|
396664d4e7
|
课程右侧增加下间距
|
2016-09-02 14:45:01 +08:00 |
cxt
|
e70334ea16
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-02 14:43:07 +08:00 |
cxt
|
51ef4a96e6
|
课程导航添加链接
|
2016-09-02 14:42:59 +08:00 |
Tim
|
d0a2ea02f2
|
学生列表名字学号过长省略号显示;课程教师团队名称过长省略号显示
|
2016-09-02 14:27:49 +08:00 |
Tim
|
0974153364
|
课程加入路径显示
|
2016-09-02 13:49:08 +08:00 |
huang
|
fa25a78f62
|
项目资源库 添加私有资源提示及局部过滤刷新
|
2016-09-02 11:27:35 +08:00 |
Tim
|
d080f0bb16
|
Merge branch 'cs_optimize_txz' into develop
|
2016-09-01 14:34:56 +08:00 |
Tim
|
27a2da8b7b
|
意见反馈增加二维码
|
2016-09-01 13:56:13 +08:00 |
cxt
|
5676f0b82f
|
项目类消息为空导致消息列表报500
|
2016-08-31 17:14:32 +08:00 |
daiao
|
548a263f0f
|
1.修复项目新闻发送至其他项目后,位于讨论区下的bug
2.资料未完善情况下,“修改资料”可操作
3.组织成员列表增加分页功能(配置成员页面分页为完成)
4.修复回复表情显示不对
|
2016-08-31 17:09:02 +08:00 |
cxt
|
7efdda5b45
|
班级老师也可以点击班级logo进行编辑
|
2016-08-31 17:01:31 +08:00 |
huang
|
2df6047b03
|
隐藏项目信息之 新用户注册但是未完善资料页面修改
|
2016-08-31 15:14:55 +08:00 |
cxt
|
9b3e1e0275
|
Merge branch 'develop' into cxt_course
|
2016-08-31 15:02:13 +08:00 |
cxt
|
8494d71e8e
|
“课程名称”不显示,英文名称为空时不显示“课程英文名称”
|
2016-08-31 14:33:29 +08:00 |
cxt
|
a8575f2a15
|
暂时隐藏个人名片
|
2016-08-31 14:08:19 +08:00 |
huang
|
4320fbf945
|
Merge branch 'dev_blankdatabase' into develop
|
2016-08-31 10:30:46 +08:00 |
huang
|
936198a8bd
|
隐藏非项目信息
|
2016-08-31 10:30:23 +08:00 |
cxt
|
f803a23298
|
组织头像编辑的小笔调整
|
2016-08-29 16:49:54 +08:00 |
cxt
|
60fb21d2fc
|
班级主页的样式调整
|
2016-08-29 16:30:37 +08:00 |
cxt
|
45f0234ff7
|
组织logo点击可编辑
|
2016-08-29 16:19:06 +08:00 |
cxt
|
acb18ca4c6
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-29 15:40:26 +08:00 |
cxt
|
15ba4a6136
|
头像调整
|
2016-08-29 15:38:58 +08:00 |
cxt
|
3c5afb2b4f
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-08-29 15:35:04 +08:00 |
Tim
|
a8d551105b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-29 15:28:45 +08:00 |
Tim
|
64b7aedd1c
|
footer部分logo与链接替换更新
|
2016-08-29 15:28:32 +08:00 |
cxt
|
cbcf414e63
|
班级主页的访问计数
|
2016-08-29 14:44:33 +08:00 |
cxt
|
547fb8a1a5
|
未登录用户访问个人主页时的头像显示
|
2016-08-29 14:41:01 +08:00 |
cxt
|
313bc8573d
|
首页访问计数失效
|
2016-08-29 14:01:40 +08:00 |
huang
|
8c4f943f83
|
注释掉资源提示
|
2016-08-26 19:33:18 +08:00 |
huang
|
803bd9819a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
public/stylesheets/css/public.css
|
2016-08-26 17:55:51 +08:00 |
huang
|
420a17a7e4
|
资源提示统计数字及权限修改
|
2016-08-26 17:34:17 +08:00 |
cxt
|
f25a90cccd
|
项目的非创建者管理员也可编辑项目头像
|
2016-08-26 17:33:04 +08:00 |
cxt
|
148aa9cda9
|
首页头像调整
|
2016-08-26 16:42:29 +08:00 |
cxt
|
6eb518c465
|
Merge branch 'cxt_course' into develop
Conflicts:
app/helpers/application_helper.rb
app/views/at/show.json.erb
app/views/layouts/new_base_user.html.erb
|
2016-08-26 16:23:07 +08:00 |
yuanke
|
21df119c59
|
Merge branch 'weixin_guange' into develop
|
2016-08-26 16:19:50 +08:00 |
yuanke
|
a66ecf6c28
|
修改图片地址
|
2016-08-26 16:18:57 +08:00 |
cxt
|
0d05d04d2c
|
头像编辑的样式调整
|
2016-08-26 14:44:32 +08:00 |
cxt
|
62e28f638c
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/layouts/_course_base_info.html.erb
app/views/layouts/base_projects.html.erb
app/views/layouts/new_base_user.html.erb
|
2016-08-26 14:33:18 +08:00 |
cxt
|
774b5eca89
|
课程和项目的头像点击可编辑
|
2016-08-26 14:31:14 +08:00 |
Tim
|
a8f30fe85f
|
个人主页,课程,项目头像、logo增加编辑按钮
|
2016-08-26 11:31:54 +08:00 |
cxt
|
f4b5a5cf4e
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-08-26 09:23:33 +08:00 |
Tim
|
fbad4ecd8a
|
班级页面logo及行间距调整;测导航数字大小背景调整
|
2016-08-25 17:52:19 +08:00 |
cxt
|
b33136c59b
|
班级问答区改成讨论区
|
2016-08-25 15:59:09 +08:00 |
daiao
|
a466fdd64e
|
强制修改基本资料:申请单位点击确定后,进入主页面;提问按钮不可用
|
2016-08-25 15:29:04 +08:00 |
cxt
|
60beb2abab
|
首页左侧班级和项目列表的收藏功能
|
2016-08-25 11:30:47 +08:00 |
cxt
|
56b74b755b
|
取消收藏
|
2016-08-24 17:30:30 +08:00 |
cxt
|
7d89f69981
|
班级和项目收藏夹
|
2016-08-24 15:58:23 +08:00 |
daiao
|
8b0c0925dd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-08-24 14:52:10 +08:00 |
cxt
|
6af43070c7
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-08-24 13:56:53 +08:00 |
Tim
|
57ecffc130
|
班级新增收藏功能
|
2016-08-24 10:28:09 +08:00 |
cxt
|
5d5bd88c88
|
个人主页:用户不应有修改他人头像的权限
|
2016-08-24 09:30:57 +08:00 |
daiao
|
7e34062435
|
Merge branch 'dev_shcool' into develop
|
2016-08-23 09:43:38 +08:00 |
cxt
|
572ad5a162
|
个人主页的课程和项目展开出现重复数据
|
2016-08-22 10:49:46 +08:00 |
cxt
|
1374444ec1
|
左侧项目列表的展开
|
2016-08-13 17:04:09 +08:00 |
Tim
|
f67336fbe5
|
课程信息单词折行
|
2016-08-13 16:27:29 +08:00 |
cxt
|
35260f2f6d
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-08-13 15:36:48 +08:00 |
daiao
|
4a9967674a
|
1. 强制编辑基本资料,在删除单位时给出消息通知
2. 单位名称申请提示一直显示
3. 申请单位的消息通知显示申请人头像,并连接到申请人主页
|
2016-08-13 14:29:33 +08:00 |
cxt
|
bae0562b97
|
适用专业和先修课程的换行显示
|
2016-08-11 10:32:57 +08:00 |
Tim
|
83323e7d18
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-10 17:19:42 +08:00 |
Tim
|
ba7f9ed735
|
班级、项目侧导航文字缩小
|
2016-08-10 17:19:32 +08:00 |
cxt
|
8de8035441
|
班级首页顶部加上主讲老师的链接
|
2016-08-09 16:17:58 +08:00 |
cxt
|
65f6b0fc70
|
新建课程报500
|
2016-08-09 15:50:23 +08:00 |
cxt
|
4a527dc84e
|
Merge branch 'cs_optimize_txz' into develop
|
2016-08-09 15:25:01 +08:00 |
cxt
|
547aae0743
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-09 10:40:25 +08:00 |
cxt
|
40dc9b761f
|
未配置课程的班级报404
|
2016-08-09 10:39:12 +08:00 |
daiao
|
e89d7398aa
|
申请管理消息通知
|
2016-08-05 19:02:05 +08:00 |
Tim
|
d4f08f6498
|
课程logo替换,邀请码样式更改,班级路径显示主讲教师
|
2016-08-05 17:30:13 +08:00 |
cxt
|
aaaeb4b8da
|
子域名申请消息报错
|
2016-08-05 16:51:51 +08:00 |
cxt
|
e7e873e0df
|
Merge branch 'dev_shcool' into develop
Conflicts:
app/helpers/users_helper.rb
|
2016-08-05 16:32:10 +08:00 |
cxt
|
fb5a969fd3
|
消息弹窗
|
2016-08-05 16:30:08 +08:00 |
cxt
|
3178700131
|
Merge branch 'cxt_course' into develop
|
2016-08-05 16:14:56 +08:00 |
daiao
|
7fbca5f260
|
单位审查消息及其BUG修复
|
2016-08-05 16:14:26 +08:00 |
cxt
|
0d86a28c54
|
我的作业
|
2016-08-05 16:12:53 +08:00 |
huang
|
dd768c2913
|
Merge branch 'cs_optimize_txz' into develop
Conflicts:
public/stylesheets/css/common.css
|
2016-08-05 15:30:03 +08:00 |
Tim
|
56452d69f4
|
侧导航字体大小,颜色更改
|
2016-08-05 14:11:35 +08:00 |
cxt
|
b7c05fed4a
|
首页样式和js调整
|
2016-08-04 16:33:51 +08:00 |
cxt
|
6c7b53f7d4
|
首页左侧栏
|
2016-08-04 11:05:34 +08:00 |
cxt
|
acc3ba121f
|
测试集的显示、新版分页
|
2016-08-03 13:46:59 +08:00 |
cxt
|
718b13e6c1
|
新版题库
|
2016-08-03 11:12:55 +08:00 |
huang
|
7658844a28
|
鼠标经过弹框消息提示
|
2016-08-02 14:53:33 +08:00 |
daiao
|
911a769670
|
Merge branch 'develop' into dev_shcool
Conflicts:
app/models/applied_message.rb
|
2016-07-29 22:05:56 +08:00 |
cxt
|
98a2ebd682
|
Merge branch 'cxt_course' into develop
|
2016-07-29 21:54:33 +08:00 |
cxt
|
a41fbdb985
|
课程大纲报500
|
2016-07-29 21:50:44 +08:00 |
huang
|
847cae6d41
|
Merge branch 'develop' into rep_quality
Conflicts:
app/models/applied_message.rb
db/schema.rb
|
2016-07-29 21:39:00 +08:00 |
daiao
|
3251890c91
|
Merge branch 'rep_quality' into dev_shcool
Conflicts:
app/models/applied_message.rb
db/schema.rb
|
2016-07-29 20:52:18 +08:00 |
daiao
|
430a93e4b2
|
单位名称列表功能代码
|
2016-07-29 20:48:36 +08:00 |
cxt
|
02bee33ad2
|
身份切换加提示
|
2016-07-29 20:33:35 +08:00 |
huang
|
0bf9b5c6e6
|
消息红点记录 个人主页添加加入项目入口
|
2016-07-29 20:31:24 +08:00 |
huang
|
153efb7eda
|
局部刷新
|
2016-07-29 19:42:21 +08:00 |
cxt
|
e3d538c3fa
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/_course_base_info.html.erb
db/schema.rb
|
2016-07-29 19:39:42 +08:00 |
cxt
|
72977886c7
|
Merge branch 'cs_optimize_txz' into cxt_course
Conflicts:
app/views/layouts/_course_base_info.html.erb
|
2016-07-29 19:37:15 +08:00 |
cxt
|
5a8d2407e2
|
放开新建课程、新建班级的权限
|
2016-07-29 19:28:50 +08:00 |
cxt
|
335b82c046
|
加入班级的弹框
|
2016-07-29 19:19:58 +08:00 |
cxt
|
a1a2b3dd33
|
Merge branch 'rep_quality' into cxt_course
Conflicts:
db/schema.rb
|
2016-07-29 14:36:18 +08:00 |
cxt
|
848c56d54e
|
班级主页身份切换、成员管理页面的多重身份
|
2016-07-29 14:34:42 +08:00 |
huang
|
a8fa4a55e3
|
项目申请消息发送
|
2016-07-28 16:22:33 +08:00 |
cxt
|
e275cd9aa0
|
邀请码
|
2016-07-27 17:18:26 +08:00 |
cxt
|
e2546cdcb7
|
邀请码的提示
|
2016-07-27 17:14:06 +08:00 |
cxt
|
2fea69359d
|
非本课程成员无法看到邀请码
|
2016-07-27 16:47:47 +08:00 |
Tim
|
52475099dc
|
博客设为主页后,文字整个容器宽度显示;班级配置图标菜单css冲突处理;大纲样式冲突处理
|
2016-07-27 14:36:46 +08:00 |
cxt
|
a1149c1104
|
班级列表的公开私有
|
2016-07-27 14:07:16 +08:00 |
cxt
|
aafe0aa4ae
|
删除班级留言时左侧导航栏的样式问题
|
2016-07-27 10:20:27 +08:00 |
cxt
|
04207609cb
|
未配置课程的班级打开报500
|
2016-07-26 16:54:34 +08:00 |
huang
|
774650c819
|
项目邀请码直接数据库读取,权限修改
|
2016-07-25 15:22:34 +08:00 |
cxt
|
812481d5fa
|
非班级成员邀请码显示为*****
|
2016-07-25 14:49:08 +08:00 |
huang
|
84d1adbf25
|
生成邀请码
|
2016-07-25 14:36:52 +08:00 |
cxt
|
0564ddb6ea
|
课程大纲的回复
|
2016-07-25 13:56:26 +08:00 |
cxt
|
6c7925a7b4
|
样式调整
|
2016-07-22 18:20:11 +08:00 |
cxt
|
45fb2d0a3e
|
Merge branch 'develop' into cxt_course
|
2016-07-22 17:14:28 +08:00 |
cxt
|
6d4835c6cc
|
样式调整
|
2016-07-22 17:13:40 +08:00 |