 Tim
|
4c33b1d7ba
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-09-08 14:15:10 +08:00 |
|
Tim
|
216c834a40
|
微信修改资料select框去边框；二级回复显隐点击效果更改
|
2016-09-08 14:15:00 +08:00 |
 yuanke
|
be0158fbb0
|
微信二级回复BUG修改
|
2016-09-08 14:10:58 +08:00 |
|
yuanke
|
1109eba460
|
微信上传图片功能先屏蔽
|
2016-09-08 08:46:29 +08:00 |
|
yuanke
|
18fbf305c1
|
微信上传头像大小限制为1M
|
2016-09-07 16:16:53 +08:00 |
|
Tim
|
2bb2a64dde
|
上传头像按钮和头像重合，并使上传按钮有效
|
2016-09-07 15:32:48 +08:00 |
|
yuanke
|
d8a4eb56cf
|
微信上传头像修改
|
2016-09-07 15:14:46 +08:00 |
|
yuanke
|
133b8af6ca
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-09-07 14:19:19 +08:00 |
|
yuanke
|
c234a8d2cb
|
个人资料修改功能
|
2016-09-07 14:19:07 +08:00 |
|
Tim
|
01246f65ba
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-09-06 17:10:11 +08:00 |
|
Tim
|
bd7cd7e244
|
二级回复点击显隐效果
|
2016-09-06 17:09:57 +08:00 |
|
yuanke
|
c9c63eeb85
|
微信修改资料后台代码
|
2016-09-06 14:41:22 +08:00 |
|
Tim
|
96e7d14060
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-09-06 09:17:40 +08:00 |
|
Tim
|
05170c43ed
|
微信动态详情二级回复
|
2016-09-06 09:17:29 +08:00 |
|
yuanke
|
f5ef2bac50
|
微信回复的回复后台修改
|
2016-09-05 17:06:25 +08:00 |
|
yuanke
|
a07462076d
|
微信回复的回复后台功能完善
|
2016-09-05 16:38:25 +08:00 |
|
yuanke
|
fd3c0effe5
|
Merge branch 'develop' into weixin_guange
|
2016-09-05 14:50:06 +08:00 |
|
yuanke
|
6f7b40b5ad
|
微信增加回复的回复后台代码
|
2016-09-05 14:49:22 +08:00 |
|
yuanke
|
10017d2c69
|
微信增加解除绑定功能
|
2016-09-05 11:02:34 +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 |
|
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 |
|
huang
|
2e36cf6d6a
|
课程资源库添加资源提示及
|
2016-09-02 12:12:26 +08:00 |
|
huang
|
fa25a78f62
|
项目资源库 添加私有资源提示及局部过滤刷新
|
2016-09-02 11:27:35 +08:00 |