jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
19,667 Commits 98 Branches 0 Tags 0 B
Commit Graph

532 Commits

Author SHA1 Message Date
Tim ca4c668c9b 邮箱提示位置调整 2016-09-08 15:36:58 +08:00
yuanke e74516cb68 微信修改个人资料 2016-09-08 15:34:48 +08:00
Tim 031ba38655 性别选框样式调整 2016-09-08 15:28:22 +08:00
yuanke 8584d1dccb 修改微信二级回复回复框的BUG 2016-09-08 15:05:27 +08:00
yuanke 1109eba460 微信上传图片功能先屏蔽 2016-09-08 08:46:29 +08:00
Tim 2bb2a64dde 上传头像按钮和头像重合，并使上传按钮有效 2016-09-07 15:32:48 +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 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 12f854f31b Merge branch 'weixin_guange' into develop 2016-09-02 10:55:43 +08:00
yuanke a6bb19eb60 微信动态回复增加点赞 2016-09-02 10:54:40 +08:00
Tim 2316b3fe7b 回复添加点赞 2016-09-02 10:21:50 +08:00
yuanke aaa263f01e Merge branch 'weixin_guange' into develop 2016-09-01 15:58:16 +08:00
yuanke 0a398b38da 修改按钮颜色 2016-09-01 15:57:29 +08:00
Tim d080f0bb16 Merge branch 'cs_optimize_txz' into develop 2016-09-01 14:34:56 +08:00
Tim 4c64e883ea 加入班级、项目时，增加获取邀请码提示 2016-09-01 14:30:21 +08:00
yuanke 11ed1ea345 Merge branch 'weixin_guange' into develop 2016-09-01 14:11:20 +08:00
yuanke d4f8bd29f4 班级项目成员管理BUG修改 2016-09-01 11:18:42 +08:00
yuanke 8644ad178c 修复班级项目 删除成员的BUG 2016-09-01 10:21:29 +08:00
yuanke c3c2516e6b 微信班级、项目增加删除成员和退出功能 2016-08-31 17:19:12 +08:00
cxt 9c327fe05e at符号前面是标点符号或没有空格还是弹出用户列表。 2016-08-31 14:59:27 +08:00
Tim ec15474c3a 成员管理更改时，确定按钮样式变更 2016-08-31 14:30:16 +08:00
Tim 48f110bbc8 新增退出项目，成员管理删除 2016-08-31 13:53:11 +08:00
Tim e0fed38f1d 新增退出班级及删除成员 2016-08-31 10:53:58 +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 a467338161 iphone定位js 2016-08-29 11:32:11 +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 b33136c59b 班级问答区改成讨论区 2016-08-25 15:59:09 +08:00
yuanke ea238cd407 微信班级发布问题改为发起讨论 2016-08-25 15:45:39 +08:00
yuanke 5b73e7dc19 修改发布帖子标题的长度及班级动态中不显示头像 2016-08-25 15:34:13 +08:00
Tim ae09d7ff27 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-25 13:39:13 +08:00
Tim bb935e42a8 发帖时，标题字符限制；发布按钮不遮住输入框 2016-08-25 13:39:02 +08:00
yuanke 4932b9fad8 班级留言不显示 2016-08-25 10:55:22 +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
Tim 34acb1aa2f 课程项目增加发布按钮 2016-08-23 11:05:49 +08:00
yuanke 55512f9eb2 Merge branch 'develop' into weixin_guange 2016-08-23 10:24:46 +08:00
yuanke 965d8930dc 班级增加动态 2016-08-23 10:23:46 +08:00
Tim 863ec9d396 iphone下输入框位置调整 2016-08-22 16:50:14 +08:00
Tim 2659b742fd 成员管理头像高度不一致；邀请内容格式调整 2016-08-14 15:30:57 +08:00
Tim 5eb397aa2a Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 
Conflicts:
	public/assets/wechat/login_tip.html
 2016-08-12 14:49:21 +08:00
Tim bdeb8297cb 关注提示页面 2016-08-12 14:45:33 +08:00
yuanke d74924ff67 私有动态提示修改 2016-08-11 13:51:20 +08:00
yuanke 0d69fa0cc0 微信私有动态内容加上提示 2016-08-11 10:33:22 +08:00
yuanke 61ffa58896 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-11 09:59:00 +08:00
yuanke 7c5240b386 微信 没登录动态回复会跳到绑定登录界面，私有内容需要是成员才能回复 2016-08-11 09:58:45 +08:00
Tim 8d753f55dc 班级、项目动态增加“私有内容，谨慎传播”提示 2016-08-10 17:10:22 +08:00
Tim b5af6f2c7f 绑定说明页面 2016-08-10 16:45:31 +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
yuanke b53979d91c 修改微信头像不显示的BUG，动态暂时全部去掉认证！ 2016-08-09 10:20:21 +08:00
yuanke 57f3aaa9e8 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-09 09:23:19 +08:00
yuanke 2b7ff3c76b 修改各个页面验证绑定登录的方式。 2016-08-09 09:23:06 +08:00
Tim cb6750cd01 输入时，忘记密码和绑定按钮重合的bug 2016-08-05 14:50:10 +08:00
yuanke 491b6fcb72 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-04 18:10:47 +08:00
yuanke bb46aa4745 微信点击已审批模版消息进入界面显示修改 2016-08-04 18:09:54 +08:00
Tim 1335dc1b76 提示文字取消粗体 2016-08-04 17:27:53 +08:00
yuanke 55afb84aef 模版消息标题加上句号，审核模版消息再次点击显示修改 2016-08-04 15:32:25 +08:00
yuanke e4a414e550 微信菜单跳入加入项目和班级界面点取消要能返回公众号界面 2016-08-04 14:37:04 +08:00
yuanke aaa1c01eed 微信动态分享图片修改 2016-08-04 10:47:35 +08:00
Tim 7b6675ed6a Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 
Conflicts:
	public/assets/wechat/join_project.html
 2016-08-03 16:41:15 +08:00
Tim 950b18c250 加入班级提示 2016-08-03 16:39:22 +08:00
yuanke 29e707a88d 微信加入项目修改、二级回复三个回复时多了个边框BUG修改等 2016-08-03 16:31:33 +08:00
yuanke a34272027e 微信菜单及项目班级审核修改 2016-08-03 14:55:54 +08:00
yuanke 6ee6cdf28f 微信项目加入审核修改 2016-08-03 10:56:55 +08:00
yuanke 4ab2427827 微信项目及课程申请审核相关功能 2016-08-03 09:37:24 +08:00
yuanke 614e877e6e 微信项目和班级加入修改 2016-08-02 15:50:15 +08:00
yuanke f3ae53dc97 Merge branch 'develop' into weixin_guange 
Conflicts:
	public/assets/wechat/app.html
	public/assets/wechat/new_project.html
	public/javascripts/wechat/directives/ellipsis.js
	public/stylesheets/weui/weixin.css
 2016-08-01 09:21:31 +08:00
daiao 5b93d40f67 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/assets/wechat/app.html
	public/assets/wechat/new_project.html
	public/javascripts/wechat/directives/ellipsis.js
	public/stylesheets/weui/weixin.css
 2016-07-29 22:03:45 +08:00
Tim 9a3acdd1db 删除注释 2016-07-29 17:07:22 +08:00
Tim 24a6aabb6b 新建项目说明列表圆点大小与间距调整 2016-07-29 16:56:55 +08:00
yuanke 78e44617e3 Merge branch 'weixin_guange' into develop 2016-07-29 16:13:38 +08:00
daiao 4d3f4c358a 微信功能 2016-07-29 16:13:25 +08:00
Tim 3d7b7b513b 隐藏文字超出省略号显示 2016-07-29 16:11:43 +08:00
Tim 43498e79e8 项目说明居中对齐 2016-07-29 16:09:55 +08:00
yuanke 18862fdee9 编辑课程文字修改 2016-07-29 16:06:30 +08:00
Tim 071ad88956 新建项目增加项目说明；动态多出文字以省略号显示； 文本内容单词不被强制拆分折行 2016-07-29 15:40:47 +08:00
yuanke f1859151bc 修改新建项目、新建课程中的文字 2016-07-29 09:43:18 +08:00
Tim 6b89460295 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-28 17:11:56 +08:00
Tim 37e29404ba 微信班级管理图标可点击区域放大 2016-07-28 17:11:46 +08:00
yuanke 283dc86a8b Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 
Conflicts:
	db/schema.rb
	public/assets/wechat/homework_detail.html
	public/javascripts/wechat/controllers/activity.js
 2016-07-28 15:23:12 +08:00
yuanke 6d594cfcbe git pull后重新commit 2016-07-28 15:11:04 +08:00
Tim 4bbd72ecd2 发送班级页面发送按钮定位 2016-07-28 14:58:19 +08:00
yuanke cf65e6748b 微信项目相关功能开发，班级角色功能等 2016-07-28 14:49:45 +08:00
yuanke 653b98d832 微信增加项目相关内容 2016-07-27 14:30:19 +08:00
Tim e3057566c8 各详情页面内容和二级回复样式调整；回复详情内容不显示bug 2016-07-26 17:30:02 +08:00
yuanke 4f803ce0de Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-25 17:02:52 +08:00
yuanke db7c267a47 微信单个项目动态 2016-07-25 17:02:42 +08:00
txz 12e845c3ab 课程列表与项目列表样式统一 2016-07-25 15:31:44 +08:00
yuanke b9b9a867f4 项目 2016-07-25 15:20:01 +08:00