Commit Graph

1084 Commits

Author SHA1 Message Date
guange 70d58ccf85 恢复授权页 2016-08-13 15:24:52 +08:00
guange 4a88fbe3db . 2016-08-13 13:36:15 +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
huang b86b2299a7 fork分支选择 js 2016-08-05 11:10:39 +08:00
huang b297446778 select选择框 2016-08-05 10:42:06 +08:00
yuanke bb46aa4745 微信点击已审批模版消息进入界面显示修改 2016-08-04 18:09:54 +08:00
Tim 28a29fa724 拖拽删除 2016-08-04 16:50:33 +08:00
yuanke d5df45e8fb 项目动态点入详情后返回需回到点入的项目动态处 2016-08-04 16:35:07 +08:00
yuanke 55afb84aef 模版消息标题加上句号,审核模版消息再次点击显示修改 2016-08-04 15:32:25 +08:00
yuanke e4a414e550 微信菜单跳入加入项目和班级界面点取消要能返回公众号界面 2016-08-04 14:37:04 +08:00
yuanke 12a9c95c01 微信项目及班级邀请码相关BUG修改 2016-08-04 14:07:35 +08:00
yuanke 3c2ab32121 微信动态分享修改 2016-08-04 11:17:50 +08:00
yuanke 4bae4527a2 微信分享URL修改 2016-08-04 10:48:13 +08:00
yuanke aaa1c01eed 微信动态分享图片修改 2016-08-04 10:47:35 +08:00
yuanke c0579de57d 微信分享内容修改 2016-08-04 10:00:55 +08:00
yuanke 17c98eb9fe 微信分享修改 2016-08-04 09:08:18 +08:00
yuanke 29e707a88d 微信加入项目修改、二级回复三个回复时多了个边框BUG修改等 2016-08-03 16:31:33 +08:00
yuanke a34272027e 微信菜单及项目班级审核修改 2016-08-03 14:55:54 +08:00
daiao 5f969c6593 单位审核相关Bug修复 2016-08-03 10:36:03 +08:00
yuanke 65719add19 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-03 09:37:36 +08:00
yuanke 4ab2427827 微信项目及课程申请审核相关功能 2016-08-03 09:37:24 +08:00
guange 6f2b84570f 去除调试模式 2016-08-02 17:48:51 +08:00