Commit Graph

281 Commits

Author SHA1 Message Date
guange 7700445c17 加入课程 2016-06-22 16:42:20 +08:00
guange 13273d02de 修正了安全问题,不暴露openid 2016-06-22 12:11:34 +08:00
guange 61c117b8cb 重构老的代码,本地通过session来存放token, 所有的访问直接用老接口 2016-06-20 14:39:20 +08:00
guange f40794282f . 2016-06-17 18:54:24 +08:00
guange 762ca9c3cb . 2016-06-17 18:50:43 +08:00
guange b9280caf36 . 2016-06-17 18:46:15 +08:00
guange 64ad182a84 . 2016-06-17 18:42:58 +08:00
guange a0c0a65d18 绑定用户迁移到接口 2016-06-17 18:37:26 +08:00
guange 98c6548e39 重写登录和注册 2016-06-17 18:18:03 +08:00
guange 8fd4d518b2 添加邀请码 2016-06-15 13:44:28 +08:00
guange 0a82de1cf4 中文问题 2016-06-12 17:25:47 +08:00
guange 1cb63055cb api可以通过openid来认证 2016-06-12 17:18:05 +08:00
guange 32ffd2a5b5 返回优化完成 2016-05-31 20:55:46 +08:00
cxt 79c106a1c6 微信动态的缺失 2016-05-31 11:04:20 +08:00
cxt c421933cf6 微信最新动态 2016-05-31 08:57:08 +08:00
cxt 0cac1e99c7 微信动态的描述过滤掉html 2016-05-26 17:18:58 +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
cxt 6517f23f03 首页不显示项目的创建动态 2016-05-19 15:26:23 +08:00
txz e2f3ba8e7d 微信问题修改 2016-05-19 15:20:46 +08:00
cxt 05a475e47e 微信动态中不应出现已删除的项目和课程动态 2016-05-19 14:35:40 +08:00
cxt 3e340b6ef9 博客微信api 2016-05-13 15:01:36 +08:00
cxt 89749b853b 微信帖子api 2016-05-13 14:43:22 +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
guange 7c5d62b8a8 头像url不显示 2016-04-09 23:16:22 +08:00
cxt 930d95f8b5 私有动态不显示的问题 2016-04-09 13:29:26 +08:00
cxt d6daa906b6 回复 2016-04-08 16:58:27 +08:00
cxt fcddaf403c 删除博客为空的数据 2016-04-08 15:59:23 +08:00
guange c5b1ffb42f 错误信息打印到日志 2016-04-08 14:50:49 +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 15ce3ba7e9 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 14:38:43 +08:00
cxt eee7b89388 项目动态 2016-04-08 14:38:35 +08:00
guange 5241dddca2 错误信息打印到日志 2016-04-08 14:38:23 +08:00
cxt 51a61a52d4 activity.rb 2016-04-08 14:12:17 +08:00
cxt ae981cfb07 项目问答区改成项目讨论区 2016-04-07 16:57:40 +08:00
cxt 523a623f1b 作业详情页面的点赞 2016-04-07 16:53:37 +08:00
cxt c404d26ac5 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-07 16:40:36 +08:00
cxt dc0bf4df30 传act_id、act_type到详情页面 2016-04-07 16:40:21 +08:00
txz 139a7931ee 点赞功能修改 2016-04-07 16:39:04 +08:00
cxt 60c8320f82 praise api的修改 2016-04-07 15:42:08 +08:00
cxt 2fe32fda61 点赞的js 2016-04-07 15:17:42 +08:00
cxt c8e769e05b 回复倒序排列 2016-04-07 15:09:17 +08:00
cxt edb18bd1b8 api提供has_praise 2016-04-07 11:16:38 +08:00
txz 8e1473a484 点赞代码优化等 2016-04-07 09:26:24 +08:00
cxt 6c527a9a54 点赞的api 2016-04-06 11:40:05 +08:00
guange 58c1b27600 加入openid传参 2016-04-02 08:13:52 +08:00
guange a6a0681b78 openid参数 2016-04-02 08:08:03 +08:00
guange e1f1c6fbc0 openid参数 2016-04-02 08:05:49 +08:00
guange 7d4de36521 修改openid调用位置 2016-04-02 07:39:46 +08:00
cxt 9da89ef5e2 课程通知的回复 2016-04-02 00:37:24 +08:00
cxt 790b452a9b issue回复 2016-04-01 23:22:39 +08:00
cxt cc2fe6108a Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-01 22:38:57 +08:00
cxt 5e697e5367 作业的回复 2016-04-01 22:38:45 +08:00
txz 0d24de7198 详情页面回复 2016-04-01 22:35:44 +08:00
cxt 7dccb0d963 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-01 21:32:56 +08:00
cxt 88c39512b9 journal的修改 2016-04-01 21:32:33 +08:00
txz 58e5fe85c3 issue 详情页面 2016-04-01 21:28:25 +08:00
txz 4902361b3f 冲突解决 2016-04-01 20:56:50 +08:00
txz 596bf641ac 最新动态各详情页面 2016-04-01 20:53:21 +08:00
cxt b3b0488bf5 动态点击更多 2016-04-01 20:46:38 +08:00
cxt 66e80d034f issue只取回复 2016-04-01 18:46:00 +08:00
Yiang Gan 869810b3a0 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-01 18:23:21 +08:00
Yiang Gan af2bd66847 回复api 2016-04-01 18:23:12 +08:00
Yiang Gan 4088fb9cb4 课程作业详情页面 2016-04-01 14:58:41 +08:00
cxt e4db141604 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-03-31 20:48:25 +08:00
Yiang Gan 03abdbb68b Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-03-31 20:46:54 +08:00
Yiang Gan 536394663a 微信消息模板 2016-03-31 20:46:36 +08:00
Yiang Gan 392c5708f2 作业详情页面 2016-03-31 20:43:06 +08:00
Yiang Gan 6c831b6811 解决冲突 2016-03-30 18:00:39 +08:00
Yiang Gan 313d415a15 详情api 2016-03-30 17:49:05 +08:00
Tim 77e11fe0fe 微信最新动态修改 2016-03-30 17:47:44 +08:00
Yiang Gan 9cebcfdd2d 动态api调整 2016-03-30 15:51:27 +08:00
cxt c8142b3ee5 作业api 2016-03-30 14:02:35 +08:00
Yiang Gan 4de598873f 动态和作业的api 2016-03-30 10:32:45 +08:00
Tim 43de1a21b1 issues api 列表 2016-03-26 14:54:36 +08:00
guange fbe1b2dac2 Merge branch 'guange_dev' into weixin_guange
# Conflicts:
#	Gemfile
#	db/schema.rb
2016-03-21 18:17:39 +08:00
huang faf1fcaf22 issue回复局部刷新
附件浏览问题
昵称改成登录名
2016-01-22 17:27:21 +08:00
lizanle f521ca424d 首页动态优化 2015-07-24 11:47:45 +08:00
lizanle c8cb730397 首页动态优化 2015-07-24 10:56:19 +08:00
lizanle 8350d5f10b 首页动态优化 2015-07-24 09:37:53 +08:00
lizanle 75ad419e85 修改一些小bug 2015-07-17 15:19:28 +08:00
lizanle 759e68621f 讨论区列表api
讨论区某主题详细 api
回复 某主题 api
2015-07-16 17:56:35 +08:00
lizanle 8d7faaced6 登录api修改
活跃值,平均成绩 是否可以加载 需要计算 最大值
2015-07-09 14:32:10 +08:00
lizanle 1b1cce615d 回复通知api
活跃排名api
其他api的修改
2015-07-08 17:36:17 +08:00
lizanle 6d85dd7ca4 app的课程动态界面api修改
添加活跃学生查看,
获取作业的匿评率
2015-07-07 17:18:29 +08:00
lizanle c5e298d24e 停止匿评 api 2015-07-04 15:53:01 +08:00
lizanle 5c648c9284 Attachment添加file_dir 属性 2015-07-03 15:32:57 +08:00
lizanle fe55258349 获取匿评状态的解释 api
开启匿评 api
2015-07-03 12:22:33 +08:00
lizanle 662fc02a80 news author解析 2015-07-03 09:44:26 +08:00
lizanle 426d382ee5 学生作业模型 2015-07-02 17:32:36 +08:00
lizanle 9eab8b92ca 动态 api 隐藏 资源 讨论区 2015-07-02 17:31:30 +08:00
lizanle 664770c63f 课程动态api改变
查看学生作业总平均分列表
2015-07-01 16:56:03 +08:00
lizanle 416dee2d30 课程动态 api改版 2015-06-30 15:17:22 +08:00
lizanle 09b6f1d787 修改news api 2015-06-26 17:16:03 +08:00
lizanle a8377f7dcb 讨论区模型 2015-06-26 09:19:23 +08:00
lizanle e5082ff489 新版课程动态 课程作业展示 2015-06-26 09:18:12 +08:00
lizanle d73a2c1003 课程动态新版api 2015-06-19 15:05:25 +08:00
lizanle 7d76b20574 作业那块逻辑修改,对于作业的学生提问以及回复功能需要取消 2015-06-08 17:16:34 +08:00
lizanle 849af9b04b 课程评论添加上拉分页 2015-05-29 14:22:43 +08:00