cxt
|
2275a0ecae
|
首页、课程社区、项目社区的点击展开更多
|
2016-12-17 09:38:32 +08:00 |
黄井泉
|
353073c82a
|
Merge branch 'develop' into 'develop'
个人主页功能
个人主页功能
See merge request !67
|
2016-12-16 20:57:21 +08:00 |
daiao
|
0c8774416e
|
个人主页样式调整
|
2016-12-16 20:50:48 +08:00 |
cxt
|
d8f098c6f4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/users/_user_message_course.html.erb
|
2016-12-16 16:56:21 +08:00 |
daiao
|
1ff1ed3c54
|
个人主页
|
2016-12-16 14:03:01 +08:00 |
cxt
|
710c06e41a
|
匿评成绩的申诉功能
|
2016-12-16 11:01:58 +08:00 |
cxt
|
23e1f2b3bd
|
作业匿评期间,小铃铛消息、作业动态以及作品详情的回复显示,暴露了评阅人或匿评对象的信息
|
2016-12-14 13:37:52 +08:00 |
daiao
|
54687793ec
|
铃铛样式重新排版
|
2016-12-13 17:22:30 +08:00 |
cxt
|
ec476cbd74
|
班级头部的调整
|
2016-12-13 16:16:32 +08:00 |
daiao
|
fb62d4f1b2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/css/project.css
|
2016-12-09 20:00:07 +08:00 |
daiao
|
92bc7aa813
|
个人首页的7个tab
|
2016-12-09 19:32:00 +08:00 |
cxt
|
b0559788db
|
班级作业的左侧“班级活跃度”、“班级英雄榜”“班级推荐”修改文字
|
2016-12-09 10:12:05 +08:00 |
cxt
|
abdbfd87b0
|
班级的邀请码增加“停用”和“启用”功能,停用的邀请码不允许用户主动加入班级
|
2016-12-08 13:40:11 +08:00 |
daiao
|
224c0b686c
|
个人首页的课程社区
|
2016-12-08 09:59:22 +08:00 |
cxt
|
9a830fc907
|
Merge branch 'develop' of https://git.trustie.net/daiao/trustieforge into develop
Conflicts:
app/controllers/users_controller.rb
app/views/layouts/new_base_user.html.erb
|
2016-12-07 15:21:25 +08:00 |
cxt
|
27d800a94a
|
新版首页架构
|
2016-12-07 15:15:00 +08:00 |
daiao
|
69d9228808
|
个人主页的消息页面
|
2016-12-07 15:13:51 +08:00 |
daiao
|
e6763c6d0c
|
用户消息铃铛样式调整
|
2016-12-07 09:00:33 +08:00 |
daiao
|
35fdf9a8a7
|
个人首页头部及其左侧导航(未完)
|
2016-12-06 09:36:13 +08:00 |
cxt
|
fced64cc96
|
点击子域名申请消息报404
|
2016-11-29 16:22:58 +08:00 |
cxt
|
3f35b7f806
|
贴吧回复改版
|
2016-11-29 09:36:38 +08:00 |
daiao
|
c640535cca
|
项目头部样式调整
|
2016-11-25 17:39:55 +08:00 |
huang
|
636721699e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dai_ao
|
2016-11-25 15:16:09 +08:00 |
cxt
|
785f027a63
|
Merge branch 'cxt_course' into develop
|
2016-11-25 14:56:24 +08:00 |
daiao
|
bff5a36577
|
pull request各种情况给出提示 项目顶头的fork信息弹出新页面及鼠标经过手型效果
|
2016-11-25 11:32:45 +08:00 |
cxt
|
eeacd76aa9
|
首页班级列表的归档
|
2016-11-22 10:27:56 +08:00 |
yuanke
|
6cb711d66b
|
Merge branch 'develop' into yuanke_youhua
|
2016-11-21 10:14:08 +08:00 |
yuanke
|
14552abd56
|
博客人气排序修改,个人主页关注BUG修改
|
2016-11-21 10:08:27 +08:00 |
cxt
|
94c4afd6de
|
样式调整
|
2016-11-18 20:11:32 +08:00 |
huang
|
b1b456e63e
|
项目标题去掉姓名,单词不换行
|
2016-11-18 16:57:45 +08:00 |
daiao
|
290a301cee
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/css/common.css
|
2016-11-18 15:48:40 +08:00 |
daiao
|
cd32353d91
|
Merge branch 'dai_ao' into develop
|
2016-11-18 15:45:35 +08:00 |
cxt
|
5510df165d
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-11-18 15:45:06 +08:00 |
cxt
|
1fcb1db27c
|
课程大纲下的班级归档
|
2016-11-18 15:34:53 +08:00 |
cxt
|
efd0bf6707
|
删除学生/退出班级时隐藏学生作品、退出班级按钮位置调整
|
2016-11-17 10:23:13 +08:00 |
daiao
|
d45b1c7d4c
|
我的issue
|
2016-11-15 14:03:57 +08:00 |
yuanke
|
5134418388
|
Merge branch 'yuanke_youhua' into develop
|
2016-11-14 15:14:05 +08:00 |
yuanke
|
5fd00ae472
|
关注官方微信改为关注微信APP
|
2016-11-14 10:35:40 +08:00 |
huang
|
561c96b485
|
用户图像下拉列表中我的课程、组织链接改成登录名
|
2016-11-11 18:02:17 +08:00 |
huang
|
bb871b5a77
|
个人主页 博客 粉丝 关注url的id改成登录名
|
2016-11-11 17:57:31 +08:00 |
cxt
|
cb5ca96bb5
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_course_homework.html.erb
db/schema.rb
|
2016-11-11 16:53:20 +08:00 |
cxt
|
d1bfdde261
|
班级名称命名和显示规范调整
|
2016-11-11 15:19:22 +08:00 |
huang
|
4d1d6506fe
|
用户登录后点左侧个人主页url路径问题及用课程动态中url转换成login
|
2016-11-11 14:13:56 +08:00 |
yuanke
|
c59081c824
|
Merge branch 'yuanke_youhua' into develop
|
2016-11-11 10:24:22 +08:00 |
huang
|
ec39b2d52c
|
用户个人主页姓名添加url
|
2016-11-10 11:11:14 +08:00 |
yuanke
|
7e657a4ad0
|
提问反馈框去掉X按钮
|
2016-11-10 09:23:12 +08:00 |
yuanke
|
4f7531b0c4
|
修改群号
|
2016-11-08 09:28:32 +08:00 |
yuanke
|
5ec5bc9a57
|
修改加入QQ群的链接
|
2016-11-07 14:25:41 +08:00 |
cxt
|
78ca68b5e3
|
Merge branch 'cxt_course' into develop
Conflicts:
public/stylesheets/css/moduel.css
public/stylesheets/css/public.css
|
2016-11-04 16:15:56 +08:00 |
cxt
|
ecae600546
|
启动匿评、关闭匿评的提示
|
2016-11-02 16:46:47 +08:00 |
huang
|
9d15052486
|
隐藏非项目的时候图像中禁掉我的课程
|
2016-11-02 15:10:21 +08:00 |
huang
|
0b4caa3ebd
|
Merge branch 'dev_newproject' into develop
|
2016-11-01 16:34:54 +08:00 |
huang
|
03dba25ab7
|
项目增加fork于某项目功能
|
2016-11-01 16:34:05 +08:00 |
huang
|
e8b116bdb1
|
公共贴吧https改成从配置中获取 ;公共贴吧删除权限判断
|
2016-11-01 14:17:13 +08:00 |
huang
|
32c7d56570
|
项目英文标题换行
|
2016-10-31 17:47:46 +08:00 |
huang
|
60c064d27b
|
项目样式修改
|
2016-10-31 11:33:23 +08:00 |
huang
|
d5e2ae9407
|
Merge branch 'cxt_course' into develop
|
2016-10-28 18:42:29 +08:00 |
cxt
|
9b89b59d60
|
添加分班无反应
|
2016-10-28 18:16:35 +08:00 |
huang
|
72f75b41d0
|
Merge branch 'cxt_course' into develop
|
2016-10-28 18:06:12 +08:00 |
cxt
|
2a1549457b
|
学生身份成员应该在左侧导航处看到讨论区新建帖子的入口
|
2016-10-28 17:58:16 +08:00 |
huang
|
738d473ce1
|
里程碑统计数加上title及项目样式
|
2016-10-28 16:32:46 +08:00 |
huang
|
459c592f68
|
项目名称样式调整
|
2016-10-28 16:20:36 +08:00 |
yuanke
|
93ed72fb59
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-10-28 15:57:53 +08:00 |
huang
|
540c8ffa8e
|
标题过长
|
2016-10-28 14:43:59 +08:00 |
huang
|
d2138dd872
|
里程碑中增加创建者、项目私有公开显示特性
|
2016-10-28 14:20:00 +08:00 |
huang
|
3ef90a3c62
|
Merge branch 'dev_newproject' into develop
Conflicts:
db/schema.rb
|
2016-10-27 17:33:28 +08:00 |
huang
|
5eb82de6e0
|
pull request权限判断
|
2016-10-26 13:45:15 +08:00 |
huang
|
2702b5a197
|
项目收藏结构修改
|
2016-10-25 14:05:07 +08:00 |
huang
|
f41696eaee
|
版本库创建跳转及显示
|
2016-10-25 13:32:22 +08:00 |
cxt
|
c2a7ec4fc7
|
游客身份,隐藏讨论区二级栏目新建帖子的入口
|
2016-10-24 14:10:37 +08:00 |
cxt
|
3bc11cd5be
|
班级左侧导航的小分班增加“添加成员”的快捷按钮
|
2016-10-24 09:45:49 +08:00 |
cxt
|
3d29eb2be0
|
分班批量添加学生、小班页面
|
2016-10-21 17:34:02 +08:00 |
cxt
|
f6e86866cb
|
个人主页调整
|
2016-10-21 08:55:17 +08:00 |
huang
|
a3da43b793
|
里程碑列表
|
2016-10-20 18:08:24 +08:00 |
cxt
|
bee1597167
|
删除的个人主页报500
|
2016-10-20 15:01:05 +08:00 |
cxt
|
59f0101a62
|
个人主页的链接改成登录名
|
2016-10-20 13:32:33 +08:00 |
cxt
|
dff47b586e
|
主页宽度调整、主页配置菜单调整
|
2016-10-20 09:26:01 +08:00 |
cxt
|
35caacf067
|
首页取消、添加关注不可用
|
2016-10-19 20:03:34 +08:00 |
cxt
|
6109a1602b
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-10-19 18:11:02 +08:00 |
cxt
|
e102815f60
|
个人主页
|
2016-10-19 18:03:59 +08:00 |
huang
|
601de5d67f
|
项目base中统计数字四舍五入,数字中添加链接
|
2016-10-19 17:35:33 +08:00 |
huang
|
a722cb0031
|
超过1w的用k+
|
2016-10-19 16:35:26 +08:00 |
huang
|
bb9ba14c47
|
base
|
2016-10-19 14:47:22 +08:00 |
huang
|
fce6c407c8
|
Merge branch 'rep_quality' into dev_newproject
Conflicts:
app/controllers/projects_controller.rb
app/views/layouts/base_projects.html.erb
app/views/projects/settings/_new_edit.html.erb
public/stylesheets/css/project.css
|
2016-10-19 11:27:49 +08:00 |
huang
|
72ce5a51ed
|
新版项目顶部样式JS控制
|
2016-10-19 10:01:14 +08:00 |
Tim
|
bde2f6b65d
|
项目上传资源弹框样式js控制;更新版本弹框资源名长度控制
|
2016-10-15 16:45:41 +08:00 |
Tim
|
ee03cda8a6
|
班级资源库弹窗样式及位置js控制
|
2016-10-15 15:34:33 +08:00 |
huang
|
5532ec3b86
|
Merge branch 'develop' into dev_newproject
Conflicts:
app/views/issues/index.html.erb
app/views/layouts/base_projects.html.erb
public/stylesheets/css/project.css
|
2016-10-15 10:53:01 +08:00 |
daiao
|
d3575b288e
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
Conflicts:
db/schema.rb
|
2016-10-15 09:00:03 +08:00 |
cxt
|
5870c3eaaf
|
子栏目讨论区列表的排序、作品内容的样式调整
|
2016-10-14 18:24:54 +08:00 |
huang
|
0760836f29
|
项目base优化
|
2016-10-14 17:23:51 +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 |
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 |