 huang
|
2c03bfbf3a
|
资源提示权限控制
|
2016-09-02 16:51:05 +08:00 |
 cxt
|
22e914eec2
|
查看他人的留言动态报500
|
2016-09-02 16:42:19 +08:00 |
|
cxt
|
2197e9aeda
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-02 16:40:16 +08:00 |
|
cxt
|
b8d04c1352
|
课程列表的主讲老师改为创建老师
|
2016-09-02 16:40:07 +08:00 |
 yuanke
|
f540ac282d
|
Merge branch 'weixin_guange' into develop
|
2016-09-02 16:37:16 +08:00 |
 Tim
|
92ae8865f0
|
删注释
|
2016-09-02 16:35:16 +08:00 |
|
Tim
|
77c727e18a
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-09-02 16:34:46 +08:00 |
|
Tim
|
7fe1394403
|
ios自动定位输入框
|
2016-09-02 16:34:33 +08:00 |
|
cxt
|
2a9ac3c11e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-02 16:22:07 +08:00 |
|
cxt
|
01ca94bc98
|
未读消息弹框
|
2016-09-02 16:21:58 +08:00 |
 daiao
|
9a3603c778
|
1.基本资料页面，身份为从业者时，直接点确定报提示问题
2.强制修改基本资料，修改资料按键错误
|
2016-09-02 16:11:14 +08:00 |
|
yuanke
|
66aec27714
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-02 16:09:00 +08:00 |
|
yuanke
|
6571b94bf1
|
Merge branch 'weixin_guange' into develop
|
2016-09-02 16:08:49 +08:00 |
|
cxt
|
0d2a3cbe36
|
测试版消息列表报500
|
2016-09-02 16:00:54 +08:00 |
|
yuanke
|
ed7308969c
|
微信帖子删除后显示
|
2016-09-02 15:45:07 +08:00 |
|
cxt
|
877d1930f0
|
超级管理员应该有权限查看不公开学生列表班级的学生列表
|
2016-09-02 15:35:20 +08:00 |
|
cxt
|
b588495847
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-02 15:26:23 +08:00 |
|
huang
|
6c0bcadf6d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-02 15:27:08 +08:00 |
|
huang
|
ec51d27eaf
|
Merge branch 'rep_quality' into develop
|
2016-09-02 15:26:41 +08:00 |
|
cxt
|
e949566d3d
|
合并
|
2016-09-02 15:26:00 +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 |
|
cxt
|
4cdef4a22b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-02 15:22:20 +08:00 |
|
cxt
|
613f974440
|
项目的管理员和课程的老师都有权限删除帖子和新闻/通知的回复
|
2016-09-02 15:22:09 +08:00 |
|
huang
|
3881e5c5c5
|
资源搜索的是时候tip局部刷新
组织资源更新公开私有问题
|
2016-09-02 14:50:06 +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 |
|
yuanke
|
11f3060ca5
|
自己建的issue指向自己不发微信消息
|
2016-09-02 14:40:40 +08:00 |
|
Tim
|
d0a2ea02f2
|
学生列表名字学号过长省略号显示；课程教师团队名称过长省略号显示
|
2016-09-02 14:27:49 +08:00 |
|
cxt
|
ded6753ce1
|
访问他人的主页只显示他本人的动态
|
2016-09-02 14:23:02 +08:00 |
|
Tim
|
9e317c4a8f
|
二级回复英文单词过长不折行
|
2016-09-02 13:54:34 +08:00 |
|
Tim
|
0974153364
|
课程加入路径显示
|
2016-09-02 13:49:08 +08:00 |
|
daiao
|
27ad94eac2
|
组织配置界面，成员列表分页
|
2016-09-02 13:25:01 +08:00 |
|
huang
|
2e36cf6d6a
|
课程资源库添加资源提示及
|
2016-09-02 12:12:26 +08:00 |
|
huang
|
fa25a78f62
|
项目资源库 添加私有资源提示及局部过滤刷新
|
2016-09-02 11:27:35 +08:00 |
|
yuanke
|
12f854f31b
|
Merge branch 'weixin_guange' into develop
|
2016-09-02 10:55:43 +08:00 |
|
yuanke
|
a6bb19eb60
|
微信动态回复增加点赞
|
2016-09-02 10:54:40 +08:00 |
|
Tim
|
2316b3fe7b
|
回复添加点赞
|
2016-09-02 10:21:50 +08:00 |
|
cxt
|
b234212a8a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-02 10:06:13 +08:00 |
|
cxt
|
231c660744
|
老师对帖子的删除权限
|
2016-09-02 10:06:03 +08:00 |
|
yuanke
|
5cda2292d0
|
Merge branch 'weixin_guange' into develop
|
2016-09-02 09:48:35 +08:00 |
|
yuanke
|
5d47ee0c43
|
修改项目班级动态BUG
|
2016-09-02 09:42:45 +08:00 |
|
cxt
|
f78595bbbb
|
管理员界面中的学校列表支持按用户数排序
|
2016-09-01 17:11:39 +08:00 |
|
huang
|
e798381feb
|
项目资源数改成实时获取
|
2016-09-01 16:39:09 +08:00 |
|
huang
|
17440ca5dc
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-09-01 16:04:00 +08:00 |
|
huang
|
5ffe1d65b1
|
Merge branch 'develop' into rep_quality
|
2016-09-01 16:03:50 +08:00 |
|
Tim
|
0dff52ff09
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-01 16:01:25 +08:00 |
|
Tim
|
40f5510195
|
侧导航文字和按钮不重合
|
2016-09-01 16:01:16 +08:00 |