 yuanke
|
bb2a1de98c
|
资源详情返回更多按钮BUG修改
|
2016-08-25 14:26:31 +08:00 |
|
yuanke
|
fd2021a1fe
|
微信资源界面发送后返回处理
|
2016-08-25 14:05:21 +08:00 |
|
yuanke
|
aa11f39b2d
|
Merge branch 'develop' into weixin_guange
Conflicts:
public/assets/wechat/class.html
public/javascripts/wechat/controllers/class.js
|
2016-08-25 11:24:27 +08:00 |
|
yuanke
|
f35c3e8528
|
微信新闻、issue增加二级回复等
|
2016-08-25 09:45:23 +08:00 |
|
yuanke
|
f8dfe85156
|
项目issue增加模版消息
|
2016-08-24 11:03:38 +08:00 |
|
yuanke
|
c612104fab
|
微信增加发帖功能
|
2016-08-23 16:52:35 +08:00 |
|
yuanke
|
e473a18487
|
提交错分支 还原
|
2016-08-23 10:26:39 +08:00 |
|
yuanke
|
55512f9eb2
|
Merge branch 'develop' into weixin_guange
|
2016-08-23 10:24:46 +08:00 |
 Tim
|
bbc0277d39
|
iphone端输入框js控制
|
2016-08-23 10:23:55 +08:00 |
|
yuanke
|
965d8930dc
|
班级增加动态
|
2016-08-23 10:23:46 +08:00 |
|
Tim
|
863ec9d396
|
iphone下输入框位置调整
|
2016-08-22 16:50:14 +08:00 |
|
yuanke
|
864c6c821f
|
Merge branch 'weixin_guange' into develop
|
2016-08-22 16:50:13 +08:00 |
|
yuanke
|
75d81d5dba
|
前端判断是否绑定屏蔽
|
2016-08-22 14:09:29 +08:00 |
 cxt
|
572ad5a162
|
个人主页的课程和项目展开出现重复数据
|
2016-08-22 10:49:46 +08:00 |
|
Tim
|
19becbfdf3
|
邀请内容更改
|
2016-08-14 16:06:37 +08:00 |
|
Tim
|
2659b742fd
|
成员管理头像高度不一致；邀请内容格式调整
|
2016-08-14 15:30:57 +08:00 |
|
yuanke
|
9446760258
|
Merge branch 'weixin_guange' into develop
Conflicts:
db/schema.rb
|
2016-08-14 09:56:17 +08:00 |
|
yuanke
|
8ab003d5ee
|
分享页提交回复未关注公众号会跳到二维码界面
|
2016-08-14 09:38:47 +08:00 |
 guange
|
70d58ccf85
|
恢复授权页
|
2016-08-13 15:24:52 +08:00 |
|
guange
|
4a88fbe3db
|
.
|
2016-08-13 13:36:15 +08:00 |
|
Tim
|
083d5453d4
|
加入课程、项目弹框，在内容部分不能拖拽
|
2016-08-13 10:00:31 +08:00 |
|
Tim
|
6734904945
|
班级详情页面定位
|
2016-08-12 15:34:53 +08:00 |
|
yuanke
|
2cfd876f2f
|
调试
|
2016-08-12 14:17:50 +08:00 |
|
yuanke
|
3b42861a54
|
分享修改
|
2016-08-12 13:33:57 +08:00 |
|
yuanke
|
822ca15c78
|
分享修改
|
2016-08-12 11:34:09 +08:00 |
|
yuanke
|
c0dc070c15
|
分享修改
|
2016-08-12 11:25:43 +08:00 |
|
yuanke
|
5c42cdb39c
|
分享内容时改为用户信息授权方式
|
2016-08-12 10:40:36 +08:00 |
|
yuanke
|
6af15b7121
|
微信自动绑定用户修改
|
2016-08-12 09:23:09 +08:00 |
|
yuanke
|
4e6c58ae37
|
动态点提交如果没绑定则自动创建一个帐号绑定，然后注册的时候将已绑定的用户信息修改为注册的信息
|
2016-08-11 17:22:48 +08:00 |
|
yuanke
|
c26e2a9acc
|
私有动态BUG修改
|
2016-08-11 14:09:41 +08:00 |
|
yuanke
|
ea926395c3
|
Merge branch 'develop' into weixin_guange
|
2016-08-11 11:19:52 +08:00 |
|
yuanke
|
0d69fa0cc0
|
微信私有动态内容加上提示
|
2016-08-11 10:33:22 +08:00 |
|
yuanke
|
7c5240b386
|
微信 没登录动态回复会跳到绑定登录界面，私有内容需要是成员才能回复
|
2016-08-11 09:58:45 +08:00 |
|
Tim
|
f5f88c5204
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-10 16:09:13 +08:00 |
|
yuanke
|
57737ff15d
|
微信细节优化
|
2016-08-10 16:08:30 +08:00 |
|
Tim
|
e85f9373c8
|
点回复按钮回复框获取焦点；班级通知内容冗余；班级、项目邀请文字更友善；班级、项目中人数后箭头与人数对齐；邀请码提示增加间距；回复中@删除链接；二维码页面增加默认加入身份提示；公众号联系我们文字更改
|
2016-08-10 15:37:08 +08:00 |
|
cxt
|
0ed508a887
|
题库预览弹窗的调整
|
2016-08-09 17:09:36 +08:00 |
|
yuanke
|
66357c4024
|
修改分享链接
|
2016-08-09 17:01:06 +08:00 |
|
cxt
|
9594aada50
|
Merge branch 'cxt_course' into develop
Conflicts:
public/javascripts/application.js
|
2016-08-09 16:42:23 +08:00 |
|
cxt
|
fc3df1c26f
|
题库预览弹框的样式调整
|
2016-08-09 16:38:17 +08:00 |
|
yuanke
|
bd908af765
|
修改报错BUG
|
2016-08-09 09:33:34 +08:00 |
|
yuanke
|
61ba668818
|
函数写错名称
|
2016-08-09 09:30:30 +08:00 |
|
yuanke
|
2b7ff3c76b
|
修改各个页面验证绑定登录的方式。
|
2016-08-09 09:23:06 +08:00 |
|
Tim
|
cd30f94d72
|
题库发送预览弹框位置及可拖拽js更新
|
2016-08-05 18:01:11 +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
|
3178700131
|
Merge branch 'cxt_course' into develop
|
2016-08-05 16:14:56 +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 |
|
huang
|
81ce93e88b
|
Merge branch 'rep_quality' into develop
|
2016-08-05 15:28:39 +08:00 |
|
Tim
|
82644bcd81
|
加入班级、项目弹框可拖拽
|
2016-08-05 14:36:01 +08:00 |