 huang
|
31f3d74b0f
|
组织栏目中，匿名用户可以回复
|
2016-06-02 13:37:38 +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 |
|
cxt
|
32dca93b59
|
统一项目反馈、课程留言、讨论区的回复显示：显示留言者姓名
|
2016-06-01 15:35:26 +08:00 |
|
cxt
|
fa73171818
|
点击“课程活跃度”和“课程英雄榜”跳到学生列表，并分别以“活跃度”、“英雄榜”倒序排列
|
2016-06-01 14:58:59 +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
|
6e44e8355c
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-05-31 19:21:08 +08:00 |
|
guange
|
7f811d7551
|
用户动态如果没有绑定则跳到绑定页面.
|
2016-05-31 19:20:15 +08:00 |
|
cxt
|
ed84783f26
|
私有课程作业的公开作品
|
2016-05-31 17:03:50 +08:00 |
|
guange
|
858ad47338
|
作业长度定为50
|
2016-05-30 18:40:22 +08:00 |
|
guange
|
acc323e46d
|
issue7890解决
|
2016-05-30 18:35:47 +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 |
|
huang
|
ff14809237
|
Merge branch 'cxt_course' into develop
|
2016-05-27 15:30:35 +08:00 |
|
huang
|
a207f48b94
|
Merge branch 'hjq_mail' into develop
Conflicts:
app/models/news.rb
|
2016-05-27 15:27:02 +08:00 |
|
huang
|
9e17db376a
|
解决组织一级目录二级目录匿名用户问题
|
2016-05-27 14:44:28 +08:00 |
|
cxt
|
3b84cd3ed2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-27 11:07:42 +08:00 |
|
cxt
|
1fa6ac89ce
|
微信的配置
|
2016-05-27 11:07:27 +08:00 |
|
huang
|
213b0f75b0
|
Merge branch 'hjq_resource' into develop
|
2016-05-27 09:33:44 +08:00 |
|
huang
|
ab4aa0f06f
|
公共资源多个资源发送功能
|
2016-05-27 09:32:24 +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 |
|
huang
|
0a7d1f1efc
|
公共资源库添加资源多个发送功能，修复项目、课程多个发送的bug
|
2016-05-25 17:54:53 +08:00 |
|
cxt
|
c8467a50a0
|
自己可以给自己点赞
|
2016-05-25 16:19:41 +08:00 |
|
huang
|
72ae31b7f9
|
作业导出资源代码回复
|
2016-05-25 11:23:19 +08:00 |
|
huang
|
b6de2dbd2d
|
发布作业导入资源
|
2016-05-25 09:44:30 +08:00 |
|
huang
|
197f054c18
|
注释掉申请私有资源功能
|
2016-05-25 09:10:41 +08:00 |
|
huang
|
b38bd0c1e5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-24 20:13:42 +08:00 |
|
cxt
|
ed2f413949
|
代码还原
|
2016-05-24 20:04:06 +08:00 |
|
cxt
|
7b7f9cf8f2
|
删除wechat无用代码
|
2016-05-24 19:52:51 +08:00 |
|
huang
|
a7a2be6a4b
|
作业导入资源问题
|
2016-05-24 16:01:02 +08:00 |
|
cxt
|
ccf29c980a
|
作业列表搜索作业：搜索结果中包括不包含关键字的作业、作业回复框加载不出
|
2016-05-24 10:34:36 +08:00 |
|
huang
|
bc0e24d39e
|
资源引用代码注释
|
2016-05-24 10:28:17 +08:00 |
|
cxt
|
6586dfaf91
|
作品搜索时，复制的姓名或学号或邮箱因为包含空格，而搜索不到相关结果
|
2016-05-23 14:47:10 +08:00 |
|
cxt
|
820e594fec
|
题库的私有作业显示作业详情
|
2016-05-23 10:53:49 +08:00 |
|
huang
|
eead7962cf
|
资源申请权限控制
|
2016-05-21 11:39:50 +08:00 |
|
huang
|
66709b16e5
|
Merge branch 'yuanke' into develop
|
2016-05-20 22:09:58 +08:00 |
 yuanke
|
76006ef3e7
|
组织一级二级帖子删除文章问题
|
2016-05-20 22:07:33 +08:00 |
|
huang
|
acb6d5892d
|
Merge branch 'yuanke' into develop
|
2016-05-20 20:31:39 +08:00 |
|
yuanke
|
d4be470e5f
|
1.组织二级帖子文章回复不了
2.组织二级帖子文章点进详情页面删除不了文章
|
2016-05-20 20:08:46 +08:00 |