 guange
|
a177c48a29
|
erge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-15 16:00:19 +08:00 |
 yuanke
|
2cc42a8f5a
|
微信修改资源更多问题
|
2016-07-15 15:32:40 +08:00 |
|
guange
|
fff6f4b310
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-15 14:50:21 +08:00 |
|
guange
|
dd892993dd
|
assets
|
2016-07-15 14:49:23 +08:00 |
|
yuanke
|
b540ff7017
|
我的资源里增加更多按钮
|
2016-07-15 14:44:37 +08:00 |
 txz
|
e61aa9e0dc
|
回复框高度自动增减js同步
|
2016-07-13 16:53:17 +08:00 |
|
yuanke
|
a5acc2641e
|
微信点赞保证各个切换之间点赞状态保持一致
|
2016-07-13 14:06:56 +08:00 |
|
txz
|
78a6785b6b
|
微信回复框自动增高
|
2016-07-12 15:18:51 +08:00 |
|
txz
|
717bbe2ffa
|
回复框多行提交后初始化
|
2016-07-12 14:33:52 +08:00 |
|
yuanke
|
70ed5790b8
|
修改在动态详情点赞返回和点赞状态不一致的BUG
|
2016-07-11 16:46:07 +08:00 |
|
yuanke
|
374aa9918c
|
我的资源里面都显示未发布的，新建课程后返回会刷新数据
|
2016-07-11 14:49:59 +08:00 |
|
guange
|
135b6ca64b
|
assets
|
2016-07-08 20:04:24 +08:00 |
|
guange
|
1413fe82dc
|
merge
|
2016-07-08 17:44:13 +08:00 |
|
yuanke
|
c2166811eb
|
修改管理课程界面刷新显示问题
|
2016-07-08 17:35:14 +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 |
|
guange
|
068c8967e1
|
新增班级时名称为1个字符时报错
|
2016-07-08 17:04:17 +08:00 |
|
yuanke
|
3a2e2c1174
|
未命名课程暂不允许进行课程管理
|
2016-07-08 16:40:24 +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 |
|
guange
|
a2ba65956c
|
.
|
2016-07-07 15:03:45 +08:00 |
|
yuanke
|
3a6470b1f3
|
删除班级时增加提示确定信息
|
2016-07-07 14:55:41 +08:00 |
|
guange
|
7859bf9c32
|
.
|
2016-07-07 14:51:54 +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 |
|
yuanke
|
d49bc8b114
|
发送课程的时候提示语修改
|
2016-07-05 14:44:50 +08:00 |
|
guange
|
373e3d3422
|
merge
|
2016-07-04 17:06:26 +08:00 |
|
guange
|
48fb02a2d6
|
管理课程
|
2016-07-04 17:04:06 +08:00 |
|
yuanke
|
9d0b5789d9
|
1.修改我的动态博客详情页面显示不了的BUG 2.资源界面切换是暂无XX先隐藏 3. 发送资源不选择班级的提示修改
|
2016-07-04 16:50:49 +08:00 |
|
guange
|
60367415fa
|
新建课程功能完成
|
2016-07-04 16:19:05 +08:00 |
|
guange
|
201abd6358
|
assets
|
2016-07-03 00:08:51 +08:00 |
|
guange
|
b010ce2e61
|
发送课程完成
|
2016-07-02 23:46:45 +08:00 |
|
guange
|
0bb5c8b5fb
|
注册绑定问题
|
2016-06-29 21:09:49 +08:00 |
|
guange
|
e9f280b4aa
|
.
|
2016-06-28 11:07:15 +08:00 |
|
guange
|
047903ddff
|
重构课程地址
|
2016-06-28 10:57:58 +08:00 |
|
guange
|
1e6454efc0
|
加入我的资源
|
2016-06-27 17:24:06 +08:00 |
|
guange
|
3b383dfa65
|
老师课程界面
|
2016-06-27 16:03:07 +08:00 |
|
guange
|
c501af70ba
|
.
|
2016-06-27 11:09:25 +08:00 |
|
guange
|
c39a982093
|
二维码
|
2016-06-24 16:51:40 +08:00 |
|
guange
|
485d0e3743
|
ticket处理
|
2016-06-24 14:59:50 +08:00 |
|
guange
|
e21f4e0b4d
|
merge
|
2016-06-24 13:52:11 +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 |
|
guange
|
13273d02de
|
修正了安全问题，不暴露openid
|
2016-06-22 12:11:34 +08:00 |
|
guange
|
5a8de44c43
|
添加我的班级控制器
|
2016-06-20 19:42:51 +08:00 |
|
guange
|
b4a3d4a5a2
|
弹出框处理
|
2016-06-20 16:04:38 +08:00 |
|
guange
|
b7230333dc
|
code获取修改
|
2016-06-20 15:21:13 +08:00 |
|
guange
|
3f98562c0f
|
打包
|
2016-06-20 14:45:19 +08:00 |
|
guange
|
61c117b8cb
|
重构老的代码，本地通过session来存放token, 所有的访问直接用老接口
|
2016-06-20 14:39:20 +08:00 |
|
txz
|
b17b92cc3e
|
微信回复后先加载后启用回复按钮
|
2016-06-20 11:08:57 +08:00 |
|
guange
|
9d19caa736
|
.
|
2016-06-17 18:48:27 +08:00 |
|
guange
|
46018ad388
|
.
|
2016-06-17 18:41:16 +08:00 |
|
guange
|
3582849ef3
|
.
|
2016-06-17 18:40:03 +08:00 |
|
guange
|
a0c0a65d18
|
绑定用户迁移到接口
|
2016-06-17 18:37:26 +08:00 |
|
guange
|
98c6548e39
|
重写登录和注册
|
2016-06-17 18:18:03 +08:00 |
|
guange
|
ada15b4212
|
格式上的调整, 现在可以分开写,但发布时打成一个js提高性能
|
2016-06-14 16:03:10 +08:00 |
|
guange
|
b1791f4531
|
wechat结构分离
|
2016-06-14 14:24:39 +08:00 |
|
guange
|
d3c45fd133
|
使用jquery1.3比较小
|
2016-06-12 13:40:14 +08:00 |
|
guange
|
36fedd4d15
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-06-12 10:21:07 +08:00 |
|
guange
|
793b651393
|
压缩angularjs
|
2016-06-09 19:48:58 +08:00 |
|
txz
|
5f26e9e3ee
|
微信回复文字格式不一致，微信回复换行处理
|
2016-06-08 15:02:06 +08:00 |
|
guange
|
8b05b33e38
|
不刷新返回
|
2016-06-07 17:38:38 +08:00 |
|
guange
|
1251e31061
|
不刷新返回
|
2016-06-07 17:36:11 +08:00 |
|
guange
|
37975552c9
|
base
|
2016-06-07 17:27:17 +08:00 |
|
guange
|
5b34f498c9
|
base
|
2016-06-07 17:23:56 +08:00 |
|
guange
|
fbfb382d78
|
base
|
2016-06-07 17:22:57 +08:00 |
|
guange
|
f993fa87ff
|
base
|
2016-06-07 17:18:28 +08:00 |
|
guange
|
8fb88dfdea
|
base
|
2016-06-07 17:17:14 +08:00 |
|
guange
|
5fe41d80e9
|
base
|
2016-06-07 17:06:13 +08:00 |
|
guange
|
b01a671fb4
|
base
|
2016-06-07 16:59:26 +08:00 |
|
guange
|
eee8a8adb6
|
fix
|
2016-06-07 16:43:37 +08:00 |
|
guange
|
33780759a9
|
修改为html5mode
|
2016-06-07 16:39:42 +08:00 |
|
guange
|
f5da2ba5f6
|
将current page提前
|
2016-06-07 15:40:16 +08:00 |
 cxt
|
2431ef6986
|
模板消息引起的问题
|
2016-06-02 13:56:11 +08:00 |
|
cxt
|
b20dc06e23
|
微信测试版配置修改
|
2016-06-02 10:56:04 +08:00 |
|
cxt
|
747128750c
|
Merge branch 'weixin_guange' into cxt_course
|
2016-06-02 10:42:04 +08:00 |
|
guange
|
51d3fc3aad
|
更多修复
|
2016-05-31 21:31:36 +08:00 |
|
guange
|
ceffa6c2c8
|
更多修复
|
2016-05-31 21:27:00 +08:00 |
|
guange
|
03357388bd
|
更多修复
|
2016-05-31 21:26:31 +08:00 |
|
guange
|
553a02c89d
|
更多修复
|
2016-05-31 21:22:44 +08:00 |
|
guange
|
c26d544772
|
更多修复
|
2016-05-31 21:15:31 +08:00 |
|
guange
|
c9eddad45d
|
更多修复
|
2016-05-31 21:09:47 +08:00 |
|
guange
|
32ffd2a5b5
|
返回优化完成
|
2016-05-31 20:55:46 +08:00 |
|
guange
|
48b36e5d16
|
优化返回刷新
|
2016-05-31 20:46:46 +08:00 |
|
guange
|
814fde878e
|
从后台获取openid即可
|
2016-05-31 20:19:45 +08:00 |
|
guange
|
13d11e2239
|
用户动态如果没有绑定则跳到绑定页面.
|
2016-05-31 20:01:41 +08:00 |
|
guange
|
4815dc3c7b
|
用户动态如果没有绑定则跳到绑定页面.
|
2016-05-31 19:59:34 +08:00 |
|
cxt
|
8540b48091
|
未绑定微信账号时点击“最新动态”出现提示信息
|
2016-05-31 17:34:56 +08:00 |
|
txz
|
1c95e76209
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-05-26 10:55:18 +08:00 |
|
txz
|
921b01e8e3
|
输入框支持文字内容滑动
|
2016-05-25 14:26:49 +08:00 |
|
cxt
|
b1a58ecfb8
|
Merge branch 'weixin_guange' into develop
Conflicts:
1234567
|
2016-05-24 20:51:24 +08:00 |
|
txz
|
29ceb7b8e9
|
微信图标清晰问题，回复点赞右对齐
|
2016-05-24 15:01:26 +08:00 |
|
txz
|
2a0b35a1b3
|
微信回复框高度随文字增减
|
2016-05-24 09:38:49 +08:00 |
|
txz
|
103af96ac2
|
替换加载中gif图
|
2016-05-23 10:26:17 +08:00 |
 huang
|
faf5e89cc2
|
Merge branch 'weixin_guange' into develop
Conflicts:
1234567
app/views/blogs/_article.html.erb
db/schema.rb
|
2016-05-19 16:04:27 +08:00 |
|
txz
|
66042cb3c9
|
debug false
|
2016-05-19 15:21:25 +08:00 |
|
txz
|
e2f3ba8e7d
|
微信问题修改
|
2016-05-19 15:20:46 +08:00 |
|
txz
|
a1afd0dc96
|
微信回复多次点击，仅第一次生效
|
2016-05-11 09:38:02 +08:00 |
|
huang
|
8446fbe39a
|
Merge branch 'weixin_guange' into develop
Conflicts:
app/services/wechat_service.rb
public/stylesheets/weui/weixin.css
|
2016-05-03 17:14:58 +08:00 |
|
txz
|
de8b303b93
|
微信数据请求时显示加载中
|
2016-05-03 15:37:35 +08:00 |
|
cxt
|
0222038899
|
缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息
|
2016-04-27 10:28:36 +08:00 |
|
cxt
|
b86669d49c
|
微信模板消息的详情页面
|
2016-04-25 14:57:55 +08:00 |
|
txz
|
dcb150559e
|
angularjs路径修改
|
2016-04-22 16:37:01 +08:00 |
|
txz
|
2345eb9d64
|
路径修改
|
2016-04-21 11:22:52 +08:00 |
|
txz
|
0bab42256c
|
微信loading弹框改
|
2016-04-21 11:21:29 +08:00 |
|
txz
|
8e254ff722
|
微信loading弹框
|
2016-04-21 10:38:36 +08:00 |
|
txz
|
13576ca477
|
app.js
|
2016-04-14 09:43:43 +08:00 |
|
cxt
|
f5122d7ef0
|
微信url切换到正式版
|
2016-04-13 14:52:18 +08:00 |
|
cxt
|
a6f4b7f505
|
测试版
|
2016-04-12 16:23:52 +08:00 |
|
cxt
|
e420be8ee9
|
Merge branch 'weixin_guange' into develop
Conflicts:
app/models/blog_comment.rb
|
2016-04-12 15:56:08 +08:00 |
|
cxt
|
1882cd8f4f
|
用户姓名不显示
|
2016-04-12 15:42:59 +08:00 |
|
txz
|
3665597153
|
详情页面排版调整
|
2016-04-12 14:56:17 +08:00 |
|
guange
|
7c5d62b8a8
|
头像url不显示
|
2016-04-09 23:16:22 +08:00 |
|
guange
|
73ad787e23
|
修改到正式版
|
2016-04-09 22:48:10 +08:00 |
|
guange
|
cadb5f3f15
|
更换服务器至test.course.trustie.net
|
2016-04-09 18:15:54 +08:00 |
|
cxt
|
007fee95bd
|
作业和留言回复的模板消息
|
2016-04-09 14:41:45 +08:00 |
|
cxt
|
3f365e75b5
|
讨论区的模板消息
|
2016-04-09 14:13:59 +08:00 |
|
cxt
|
b6adaf61db
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-09 13:29:34 +08:00 |
|
cxt
|
930d95f8b5
|
私有动态不显示的问题
|
2016-04-09 13:29:26 +08:00 |
|
txz
|
02a5e7752d
|
微信环境切换
|
2016-04-08 21:46:41 +08:00 |
|
cxt
|
281fcf315f
|
点击模板消息页面为空
|
2016-04-08 21:01:15 +08:00 |
|
cxt
|
89330f9e40
|
调试
|
2016-04-08 17:03:48 +08:00 |
|
cxt
|
d6daa906b6
|
回复
|
2016-04-08 16:58:27 +08:00 |
|
cxt
|
fcddaf403c
|
删除博客为空的数据
|
2016-04-08 15:59:23 +08:00 |
|
guange
|
ef317089f1
|
错误信息打印到日志
|
2016-04-08 14:46:00 +08:00 |
|
guange
|
a35511195a
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-08 14:42:39 +08:00 |
|
guange
|
abf4a80942
|
错误信息打印到日志
|
2016-04-08 14:42:23 +08:00 |
|
cxt
|
eee7b89388
|
项目动态
|
2016-04-08 14:38:35 +08:00 |
|
txz
|
707127631e
|
微信公众号样式调整
|
2016-04-08 14:07:49 +08:00 |
|
cxt
|
1503686ddb
|
无更多动态时不显示更多
|
2016-04-08 10:09:45 +08:00 |
|
cxt
|
bb71d1c322
|
调试模式
|
2016-04-07 16:59:46 +08:00 |
|
txz
|
411a8be8b8
|
点击展开
|
2016-04-07 16:58:06 +08:00 |
|
txz
|
139a7931ee
|
点赞功能修改
|
2016-04-07 16:39:04 +08:00 |
|
cxt
|
60c8320f82
|
praise api的修改
|
2016-04-07 15:42:08 +08:00 |
|
txz
|
938bf48d08
|
点赞功能修改
|
2016-04-07 15:26:23 +08:00 |
|
cxt
|
2fe32fda61
|
点赞的js
|
2016-04-07 15:17:42 +08:00 |
|
txz
|
eb996280a6
|
点赞功能
|
2016-04-07 15:07:37 +08:00 |
|
cxt
|
f1783c06a2
|
详情页面传参openid
|
2016-04-07 14:24:15 +08:00 |
|
txz
|
3008c0c44d
|
activities.html冲突解决
|
2016-04-07 14:16:51 +08:00 |
|
txz
|
0b1b08bd3d
|
点赞
|
2016-04-07 14:15:19 +08:00 |
|
guange
|
80f47476cb
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
# Conflicts:
# public/javascripts/wechat/app.js
|
2016-04-07 13:58:23 +08:00 |