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

518 Commits

Author SHA1 Message Date
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
yuanke cedd7ae520 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-22 16:42:47 +08:00
yuanke 37a6adf428 二级回复代码统一写到comment_reply里面 2016-07-22 16:42:34 +08:00
txz cef08a717c 课程名称过长时，邀请码无法点击bug 2016-07-22 16:09:47 +08:00
yuanke cdb7782849 除了issue 和news都增加了二级回复显示 2016-07-22 15:37:25 +08:00
yuanke 178222858c Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-21 17:37:18 +08:00
yuanke 16fef58885 发送班级界面不显示没班级的课程 2016-07-21 17:37:03 +08:00
txz b638f9aea6 tab页issue标题改为问题 2016-07-21 17:33:20 +08:00
txz 8fd915bf1a issue标题改为问题 2016-07-21 17:18:09 +08:00
txz 4a58777bb9 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-21 15:56:31 +08:00
txz 0a0f8aefac 微信加入班级弹框css兼容；app页面meta标签修改 2016-07-21 15:56:27 +08:00
yuanke 92ffbcfce6 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-21 14:03:16 +08:00
yuanke 7cd505ea4b 博客详情动态加入二级回复的展开功能一级一级回复的更多功能。 2016-07-21 14:03:04 +08:00
txz 24ee25e095 课程列表点击管理课程图标，列表展开bug修复 2016-07-21 13:54:03 +08:00
txz 53feb0bbd4 课程列表课程名称宽度限制 2016-07-20 09:11:05 +08:00
txz 27965bee01 加入班级弹框样式统一 2016-07-19 11:17:46 +08:00
yuanke 80843d5084 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-19 10:50:46 +08:00
yuanke bc1b4c1b85 班级邀请码弹框修改，我的动态回复数计算修改 2016-07-19 10:50:36 +08:00
txz bc0d8cd299 管理班级重命名字体变灰 2016-07-19 10:25:45 +08:00
yuanke ff13d2e572 微信增加作业发送，修改发送的权限，修改菜单 2016-07-18 14:24:59 +08:00
yuanke 8968c991ff 微信：作业增加发送功能 2016-07-18 11:08:02 +08:00
yuanke 67fa6da8ae 我的资源界面加载前 不显示暂无数据 2016-07-15 19:18:30 +08:00
yuanke 596bfe4bfc 邀请码分享问题修改 2016-07-15 19:08:05 +08:00
txz b7477a73e4 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-15 17:31:36 +08:00
txz 6491e16c64 微信课程列表底边重合问题 2016-07-15 17:31:33 +08:00
yuanke 6385cc892f Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-15 16:46:36 +08:00
yuanke 60dc0e72cf 微信我我的资源更多按钮显示 2016-07-15 16:46:27 +08:00
txz 0d08d6b192 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-15 16:14:55 +08:00
txz 6063932840 课程管理中，对课程,班级名称编辑时，字体变灰 2016-07-15 16:14:52 +08:00
yuanke c476dae15b 微信我的资源中 更多按钮暂时隐藏 2016-07-15 16:08:04 +08:00
yuanke ae0a4f8ce4 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-15 14:44:48 +08:00
yuanke b540ff7017 我的资源里增加更多按钮 2016-07-15 14:44:37 +08:00
txz 5a463721b8 资源来源限制宽度 2016-07-15 14:09:22 +08:00
txz 08c6c16cfd 课程，项目详情页面属性字体减小 2016-07-15 10:56:54 +08:00
txz 54887112e4 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-15 10:52:46 +08:00
txz df8b995d41 作业，项目属性字体减小 2016-07-15 10:52:43 +08:00
yuanke dc2ba96353 用户注册发送绑定成功消息通知，加入班级消息通知点击跳入班级 2016-07-15 10:26:37 +08:00
yuanke 4c39dcc677 微信：修改班级下有挂起作业所有作业都不显示的BUG，将班级下作业、测验发送按钮屏蔽 2016-07-14 17:39:22 +08:00
yuanke 9c560e56b6 微信修改 不能直接给数据库对象增加新属性 2016-07-14 16:54:43 +08:00
yuanke af2b306953 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-14 09:52:10 +08:00
yuanke 3c426c8d15 微信中英文逗号修改 2016-07-14 09:52:02 +08:00
txz 24821ba01d 登录与注册页面，输入文字显示不全bug 2016-07-14 09:44:35 +08:00
txz f83d791de1 进入课程后，课件，作业，测验及学生管理tab样式更改 2016-07-13 09:54:37 +08:00
txz 2cc87f1dd8 课程页面各tab显示bug 2016-07-12 17:33:55 +08:00
yuanke 2844ac2e65 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-12 15:52:08 +08:00
yuanke d75e2b740f 微信点击我的课程里面的两个按钮时没绑定会提示绑定 2016-07-12 15:51:58 +08:00
txz 78a6785b6b 微信回复框自动增高 2016-07-12 15:18:51 +08:00
txz 77f5ad09d2 各详情页面回复内容全部显示 2016-07-12 15:00:49 +08:00
txz 717bbe2ffa 回复框多行提交后初始化 2016-07-12 14:33:52 +08:00
txz 4434eb3620 回复框固定在最下显示 2016-07-12 14:10:30 +08:00
txz 9d91e9397b 微信邀请码提示文字修改 2016-07-12 11:01:01 +08:00
txz f33feb7d84 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-12 10:43:26 +08:00
txz 243f0bbe7d 微信详情内容与回复中链接添加蓝色 2016-07-12 10:43:21 +08:00
yuanke d4681eea00 我的资源里面显示来源 和大小 并可以下载课件 2016-07-12 10:25:18 +08:00
yuanke 14b7b04e4d Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-11 16:55:56 +08:00
txz dc6127eb78 微信我的资源样式更改 2016-07-11 16:54:58 +08:00
yuanke 70ed5790b8 修改在动态详情点赞返回和点赞状态不一致的BUG 2016-07-11 16:46:07 +08:00
txz bd29859a28 创建课程和参与课程区分样式 2016-07-11 14:46:35 +08:00
txz 0093a0a509 微信邀请提示文字更改 2016-07-11 14:23:53 +08:00
txz 114512d3d9 资源宽度限制 2016-07-11 11:05:49 +08:00
txz 2e75fa4b23 课程动态中新建课程改为新建班级 2016-07-11 10:42:07 +08:00
guange 2b17828844 rge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-08 19:59:16 +08:00
guange 2604f3f0c7 资源搜索中只匹配name 2016-07-08 19:59:10 +08:00
yuanke f8eb150530 新增班级不完成点返回班级会出现再课程列表的BUG 2016-07-08 19:12:26 +08:00
guange 1413fe82dc merge 2016-07-08 17:44:13 +08:00
yuanke 8d8de084ac Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-08 17:23:44 +08:00
yuanke c6099177a4 修改微信发送资源平台不显示发送人的问题，删除班级提示文字不居中的问题等 2016-07-08 17:22:58 +08:00
txz ea5bd94e99 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-08 17:22:50 +08:00
txz 9ae7461501 资源列表学生进入时也显示为课件；课程tab页样式替换 2016-07-08 17:22:44 +08:00
guange 3c36e97ff1 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-08 17:11:41 +08:00
guange 3c23560d77 我的资源搜索无效 2016-07-08 17:11:16 +08:00
yuanke d38ce793bd Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-08 16:23:29 +08:00
yuanke bb62ba40b7 修改微信权限问题、管理课程界面等 2016-07-08 16:23:07 +08:00
txz ed39b4b4f1 动态：创建班级；学生进入资源也显示课件；已有班级和新增班级颜色区分 2016-07-08 11:29:33 +08:00
yuanke 3a6470b1f3 删除班级时增加提示确定信息 2016-07-07 14:55:41 +08:00
guange a17a6ed596 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-07 14:35:26 +08:00
guange 10789d2505 added alert2 2016-07-07 14:35:15 +08:00
yuanke 9d46040f7a 课程列表 + - 按钮增加效果，资源发送界面课程列表显示和课程列表界面保持一直 2016-07-06 17:08:22 +08:00
yuanke b994e786ab 我的动态中三类动态之间切换的效果 2016-07-06 11:06:32 +08:00
txz 7a9665bbee 微信详情页面样式调整 2016-07-05 11:18:58 +08:00
txz 8a59623a73 项目问题，项目讨论区，博客，留言详情页面样式更新 2016-07-05 10:15:32 +08:00
txz 64a1d197ee Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-04 17:06:47 +08:00
txz 3066a564bd 课程作业详情页面样式更新 2016-07-04 17:06:43 +08:00
guange 373e3d3422 merge 2016-07-04 17:06:26 +08:00
guange 48fb02a2d6 管理课程 2016-07-04 17:04:06 +08:00
yuanke 08f263128c Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-04 16:53:10 +08:00
yuanke 9d0b5789d9 1.修改我的动态博客详情页面显示不了的BUG 2.资源界面切换是暂无XX先隐藏 3. 发送资源不选择班级的提示修改 2016-07-04 16:50:49 +08:00
txz 45b824938e 课程讨论区与课程通知详情页面样式更新 2016-07-04 16:41:41 +08:00
guange 60367415fa 新建课程功能完成 2016-07-04 16:19:05 +08:00
txz bd1aae07fd 微信动态页面样式更新 2016-07-04 14:43:51 +08:00
guange 3c295ba5a1 merge 2016-07-04 10:54:03 +08:00
guange b010ce2e61 发送课程完成 2016-07-02 23:46:45 +08:00
cxt bdaa9983e3 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-07-01 11:30:24 +08:00
cxt 2c1e0f534c 课程大纲 2016-07-01 11:11:53 +08:00
guange c248249983 注册没有loading图问题 2016-06-29 21:11:21 +08:00
guange 0bb5c8b5fb 注册绑定问题 2016-06-29 21:09:49 +08:00
guange 047903ddff 重构课程地址 2016-06-28 10:57:58 +08:00
guange 1e6454efc0 加入我的资源 2016-06-27 17:24:06 +08:00
guange 5477c794ba Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-27 16:03:55 +08:00
guange 3b383dfa65 老师课程界面 2016-06-27 16:03:07 +08:00
yuanke 11d38fc3e3 Merge branch 'yuanke' into develop 2016-06-27 15:58:26 +08:00
yuanke a83400f233 粘贴图片 留言和回复框 保持一直截图都可以粘贴进去 2016-06-27 15:57:45 +08:00
guange c501af70ba . 2016-06-27 11:09:25 +08:00
guange 2c2e1892e5 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-24 16:53:58 +08:00
guange c39a982093 二维码 2016-06-24 16:51:40 +08:00
guange 485d0e3743 ticket处理 2016-06-24 14:59:50 +08:00
guange f9075e08ba merge 2016-06-24 13:35:26 +08:00
guange d348981721 加入邀请码 2016-06-24 13:29:36 +08:00
guange 52d4d36097 邀请码页面 2016-06-24 09:01:12 +08:00
guange 7700445c17 加入课程 2016-06-22 16:42:20 +08:00
cxt 2176ad1ede Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-21 11:18:37 +08:00
cxt dc70b40309 kindeditor中的a标签属性编辑 2016-06-21 11:04:35 +08:00
guange 5a8de44c43 添加我的班级控制器 2016-06-20 19:42:51 +08:00
yuanke fde06a2327 更新资源描述样式修改 2016-06-20 16:35:16 +08:00
guange 61c117b8cb 重构老的代码，本地通过session来存放token, 所有的访问直接用老接口 2016-06-20 14:39:20 +08:00