 yuanke
|
b43f8cf974
|
调试
|
2016-09-08 17:44:38 +08:00 |
|
yuanke
|
8f3a73d400
|
调试
|
2016-09-08 17:37:00 +08:00 |
|
yuanke
|
b6fdbc11a6
|
微信回复框修改
|
2016-09-08 16:22:19 +08:00 |
|
yuanke
|
e74516cb68
|
微信修改个人资料
|
2016-09-08 15:34:48 +08:00 |
|
yuanke
|
8584d1dccb
|
修改微信二级回复回复框的BUG
|
2016-09-08 15:05:27 +08:00 |
 Tim
|
216c834a40
|
微信修改资料select框去边框；二级回复显隐点击效果更改
|
2016-09-08 14:15:00 +08:00 |
|
yuanke
|
18fbf305c1
|
微信上传头像大小限制为1M
|
2016-09-07 16:16:53 +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
|
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 |
|
yuanke
|
6571b94bf1
|
Merge branch 'weixin_guange' into develop
|
2016-09-02 16:08:49 +08:00 |
|
yuanke
|
ed7308969c
|
微信帖子删除后显示
|
2016-09-02 15:45:07 +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 |
|
yuanke
|
5d47ee0c43
|
修改项目班级动态BUG
|
2016-09-02 09:42:45 +08:00 |
|
yuanke
|
11ed1ea345
|
Merge branch 'weixin_guange' into develop
|
2016-09-01 14:11:20 +08:00 |
|
yuanke
|
a6241afe04
|
.
|
2016-09-01 13:36:27 +08:00 |
|
yuanke
|
251fd36748
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-09-01 11:18:52 +08:00 |
|
yuanke
|
d4f8bd29f4
|
班级项目成员管理BUG修改
|
2016-09-01 11:18:42 +08:00 |
 huang
|
52a8a64a69
|
项目隐藏 项目讨论区发送中去掉课程
|
2016-09-01 10:48:13 +08:00 |
|
Tim
|
742100d9b5
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-09-01 10:41:32 +08:00 |
|
Tim
|
2251869881
|
iphone下视角滚动
|
2016-09-01 10:40:57 +08:00 |
|
yuanke
|
8644ad178c
|
修复班级项目 删除成员的BUG
|
2016-09-01 10:21:29 +08:00 |
|
yuanke
|
c3c2516e6b
|
微信班级、项目增加删除成员和退出功能
|
2016-08-31 17:19:12 +08:00 |
|
Tim
|
d11f673711
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-31 14:30:32 +08:00 |
|
Tim
|
ec15474c3a
|
成员管理更改时，确定按钮样式变更
|
2016-08-31 14:30:16 +08:00 |
|
yuanke
|
292e778a8c
|
微信班级项目增加删除和退出功能
|
2016-08-31 14:21:38 +08:00 |
|
cxt
|
a8575f2a15
|
暂时隐藏个人名片
|
2016-08-31 14:08:19 +08:00 |
|
yuanke
|
e37a2fee1e
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-30 14:25:46 +08:00 |
|
yuanke
|
b4a5179a1b
|
修改班级成员管里的配置返回后显示空白及@issue链接无效的问题
|
2016-08-30 14:25:36 +08:00 |
|
Tim
|
14ece14b78
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-30 14:12:15 +08:00 |
|
Tim
|
bc1caf3d54
|
表情处理
|
2016-08-30 14:12:05 +08:00 |
|
yuanke
|
4e312595fe
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-30 14:08:23 +08:00 |
|
yuanke
|
8a6ad89973
|
issue指向改变才发微信消息，增加微信动态里来源链接，@增加微信消息，菜单去掉加入班级和项目等
|
2016-08-30 14:08:10 +08:00 |
|
Tim
|
e30416f6b3
|
手机表情处理
|
2016-08-30 10:49:44 +08:00 |
|
Tim
|
a467338161
|
iphone定位js
|
2016-08-29 11:32:11 +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 |
|
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 |
|
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 |
|
yuanke
|
82779c99ea
|
字符串去掉空白时，空格不去掉。
|
2016-08-26 09:59:00 +08:00 |