Commit Graph

187 Commits

Author SHA1 Message Date
yuanke 2c86ae3eb2 二维码识别 项目和班级区分 2016-08-01 15:09:36 +08:00
yuanke c1bd3b6bf1 增加日志测试 2016-08-01 14:30:31 +08:00
yuanke 4c9e183cd0 微信菜单点击加入项目修改 2016-08-01 11:24:27 +08:00
yuanke bb0bfa21cc 加入项目邀请码修改 2016-08-01 11:18:01 +08:00
yuanke f0cf7adcdf 加入项目邀请码 2016-08-01 11:14:03 +08:00
yuanke 93844e757c 微信:角色配置后返回角色界面、修改开发为开放、创建项目发送消息项目名称修改 2016-07-28 17:26:57 +08:00
yuanke 6d594cfcbe git pull后重新commit 2016-07-28 15:11:04 +08:00
yuanke cf65e6748b 微信项目相关功能开发,班级角色功能等 2016-07-28 14:49:45 +08:00
guange 9d2900d58f 解决没绑定用户不跳转到绑定页问题 2016-07-25 16:59:52 +08:00
yuanke 86731c34d5 单个课程作业不显示的BUG修改,加入班级时如果班级已被删除需要提示! 2016-07-21 15:21:09 +08:00
yuanke 7cd505ea4b 博客详情动态加入二级回复的展开功能一级一级回复的更多功能。 2016-07-21 14:03:04 +08:00
yuanke ff13d2e572 微信增加作业发送,修改发送的权限,修改菜单 2016-07-18 14:24:59 +08:00
yuanke dc2ba96353 用户注册发送绑定成功消息通知,加入班级消息通知点击跳入班级 2016-07-15 10:26:37 +08:00
yuanke b8c8b2c4ae 修改加入班级的提示 2016-07-15 09:48:10 +08:00
yuanke 6ab1269c01 修改微信反馈框加入重复班级提示有误的问题 2016-07-15 09:16:37 +08:00
yuanke d75e2b740f 微信点击我的课程里面的两个按钮时没绑定会提示绑定 2016-07-12 15:51:58 +08:00
guange 99a27766be . 2016-07-09 10:34:05 +08:00
guange 09a97fc9d8 . 2016-07-09 10:23:49 +08:00
guange 8279d9385c 区分是课程邀请,还是意见反馈 2016-07-09 10:13:05 +08:00
guange 436de8ce5a 优先取env中的wechat url 2016-06-28 11:33:54 +08:00
guange 57cdc1d5ec 协议修改 2016-06-28 11:30:06 +08:00
guange c501af70ba . 2016-06-27 11:09:25 +08:00
guange b5bfe40693 . 2016-06-24 17:35:55 +08:00
guange 084b545be9 修改为正式版 2016-06-24 17:14:58 +08:00
guange 4436e87c84 . 2016-06-24 16:35:27 +08:00
guange 9a9f6400da . 2016-06-24 15:42:00 +08:00
guange c522d7160c . 2016-06-24 15:40:27 +08:00
guange 9ec1f916b6 . 2016-06-24 15:38:46 +08:00
guange 7e2482167d . 2016-06-24 15:31:45 +08:00
guange 16a9f017b6 error 2016-06-24 15:28:44 +08:00
guange 485d0e3743 ticket处理 2016-06-24 14:59:50 +08:00
guange 52d4d36097 邀请码页面 2016-06-24 09:01:12 +08:00
guange d466b09f3f . 2016-06-22 17:20:34 +08:00
guange 1470cafe57 . 2016-06-22 17:09:49 +08:00
guange 9b42b4e7f7 . 2016-06-22 17:04:01 +08:00
guange 40217d5c56 . 2016-06-22 16:57:01 +08:00
guange 0929d2ac28 . 2016-06-22 16:48:34 +08:00
guange 7700445c17 加入课程 2016-06-22 16:42:20 +08:00
guange 8129e29d5b . 2016-06-22 12:52:26 +08:00
guange f791f37205 . 2016-06-22 12:36:46 +08:00
guange 5b087179eb . 2016-06-22 12:31:47 +08:00
guange 833c5a5ede . 2016-06-22 12:27:23 +08:00
guange 4663f48496 修改跳转菜单 2016-06-22 12:13:50 +08:00
guange 13273d02de 修正了安全问题,不暴露openid 2016-06-22 12:11:34 +08:00
guange 1d6d100983 . 2016-06-20 17:37:35 +08:00
guange 6f14b61cce . 2016-06-20 17:28:21 +08:00
guange 4b813ef535 加入班级消息 2016-06-20 17:26:29 +08:00
guange c940527694 . 2016-06-20 17:12:53 +08:00
guange 62a1b5de7c 加入班级更新 2016-06-20 17:04:42 +08:00
guange c6f04db19e wechat 2016-06-20 15:50:52 +08:00
guange b7230333dc code获取修改 2016-06-20 15:21:13 +08:00
guange 3f98562c0f 打包 2016-06-20 14:45:19 +08:00
guange 9d19caa736 . 2016-06-17 18:48:27 +08:00
guange 7aec37bb3a . 2016-06-17 18:25:55 +08:00
guange 98c6548e39 重写登录和注册 2016-06-17 18:18:03 +08:00
cxt 768d91278d 微信提示信息的修改 2016-06-07 16:15:25 +08:00
cxt 6a25adb37e 最新动态改成我的动态,提示修改 2016-06-06 11:13:35 +08:00
cxt 747128750c Merge branch 'weixin_guange' into cxt_course 2016-06-02 10:42:04 +08:00
cxt b72ad364db 微信模板消息:用户绑定成功、作业消息、个人留言、班级通知 2016-06-02 10:39:11 +08:00
guange 814fde878e 从后台获取openid即可 2016-05-31 20:19:45 +08:00
guange e01da32c75 tempate=>file 2016-05-31 19:54:45 +08:00
guange ac5d91a428 用户动态如果没有绑定则跳到绑定页面. 2016-05-31 19:51:38 +08:00
guange 1c5a31e8f1 用户动态如果没有绑定则跳到绑定页面. 2016-05-31 19:49:57 +08:00
guange 49a1a9de32 用户动态如果没有绑定则跳到绑定页面. 2016-05-31 19:46:30 +08:00
guange e73c946806 用户动态如果没有绑定则跳到绑定页面. 2016-05-31 19:43:27 +08:00
guange 7b5a7a93f5 用户动态如果没有绑定则跳到绑定页面. 2016-05-31 19:40:54 +08:00
guange 7f811d7551 用户动态如果没有绑定则跳到绑定页面. 2016-05-31 19:20:15 +08:00
guange 8b623e3a0c Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-05-27 22:59:11 +08:00
guange 4561bdfd0d code=>params[:code] 2016-05-27 22:18:03 +08:00
guange 622d71c476 已绑定成功的,直接提示 2016-05-27 22:14:41 +08:00
cxt 1fa6ac89ce 微信的配置 2016-05-27 11:07:27 +08:00
cxt 6fea9c2ba8 微信文字和图片的显示 2016-05-26 17:14:52 +08:00
cxt ff974d6901 Merge branch 'weixin_guange' into develop
Conflicts:
	app/views/wechats/login.html.erb
2016-05-26 15:32:00 +08:00
cxt 4d5ee5a722 微信的欢迎图片及欢迎词的修改,测试版的配置 2016-05-26 15:27:31 +08:00
guange b48b1c97b3 weixin 2016-05-26 13:02:27 +08:00
guange e4653426d2 将openid存到session 2016-05-26 12:59:15 +08:00
cxt 7b7f9cf8f2 删除wechat无用代码 2016-05-24 19:52:51 +08:00
huang 3985c190bf Merge branch 'cxt_course' into develop
Conflicts:
	db/schema.rb
2016-05-19 16:01:07 +08:00
cxt 6517f23f03 首页不显示项目的创建动态 2016-05-19 15:26:23 +08:00
guange 8411a08ddb 修改错别字 2016-05-14 09:43:01 +08:00
cxt 49a7e2ce1d 关注和绑定登录后发送欢迎消息 2016-04-26 09:03:01 +08:00
guange 055ba00de5 绑定成功后关闭页面 2016-04-09 23:20:24 +08:00
guange 0731405828 重新再次进来的用户提示欢迎信息 2016-04-08 10:50:05 +08:00
guange ff93e9f79b 修改返回为json 2016-04-02 07:56:12 +08:00
guange 1926f0ba53 修改openid路由 2016-04-02 07:49:36 +08:00
guange a25fe6cef8 修改openid路由 2016-04-02 07:47:34 +08:00
guange 9c93b3f9a6 修改openid调用位置 2016-04-02 07:43:55 +08:00
Tim 406bb7930c Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
Conflicts:
	public/javascripts/wechat/wechat-dev.js
2016-03-28 14:47:11 +08:00
guange 60931dde6a 添加获取openid的功能 2016-03-26 15:52:14 +08:00
guange fbe1b2dac2 Merge branch 'guange_dev' into weixin_guange
# Conflicts:
#	Gemfile
#	db/schema.rb
2016-03-21 18:17:39 +08:00
guange 3c513085d2 request变量 2016-03-07 21:43:18 +08:00
guange 79004e1328 修改绑定流程 2016-03-03 23:27:05 +08:00
guange 697906509b 修改菜单 2016-03-01 17:58:54 +08:00
guange f53d9e19f7 修改菜单 2016-03-01 17:55:03 +08:00
guange 8e1624fafe 修改菜单 2016-03-01 17:33:48 +08:00
guange 1b171e414c 修改菜单 2016-03-01 17:31:44 +08:00
guange b823413267 修改菜单 2016-03-01 17:16:48 +08:00
guange c33b35383d 修改菜单 2016-03-01 17:13:06 +08:00
guange d5e8945619 修改菜单 2016-03-01 17:06:40 +08:00
guange 509d4a3df7 绑定提交改为ajax 2016-03-01 16:56:37 +08:00