 yuanke
|
603a00fde3
|
Merge branch 'weixin_guange' into develop
|
2016-07-28 17:56:33 +08:00 |
|
yuanke
|
1489ab015a
|
微信模版消息标题加上句号
|
2016-07-28 17:55:37 +08:00 |
|
yuanke
|
de46c5d9ca
|
Merge branch 'weixin_guange' into develop
|
2016-07-28 17:27:57 +08:00 |
|
yuanke
|
8bf69a2e4d
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-28 17:27:06 +08:00 |
|
yuanke
|
93844e757c
|
微信：角色配置后返回角色界面、修改开发为开放、创建项目发送消息项目名称修改
|
2016-07-28 17:26:57 +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 |
 huang
|
a8fa4a55e3
|
项目申请消息发送
|
2016-07-28 16:22:33 +08:00 |
|
yuanke
|
20d9e613b6
|
正式、测试版配置
|
2016-07-28 15:39:27 +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 |
|
huang
|
4a9eec0cce
|
完成项目邀请及公共弹框的封装
|
2016-07-28 14:42:36 +08:00 |
|
Tim
|
318ef2bb30
|
微信定位高度
|
2016-07-28 14:35:50 +08:00 |
|
Tim
|
40bb59ea9d
|
微信定位
|
2016-07-28 10:43:54 +08:00 |
|
huang
|
c6bc5c9cb8
|
Merge branch 'dev_shcool' into rep_quality
Conflicts:
db/schema.rb
|
2016-07-28 10:19:37 +08:00 |
|
huang
|
7413298aad
|
项目邀请码申请及弹框
|
2016-07-28 10:18:35 +08:00 |
 cxt
|
e275cd9aa0
|
邀请码
|
2016-07-27 17:18:26 +08:00 |
|
cxt
|
e2546cdcb7
|
邀请码的提示
|
2016-07-27 17:14:06 +08:00 |
|
cxt
|
2fea69359d
|
非本课程成员无法看到邀请码
|
2016-07-27 16:47:47 +08:00 |
|
Tim
|
6078db7e39
|
sy_public.css样式重用处理
|
2016-07-27 16:44:21 +08:00 |
|
cxt
|
0dfc887f74
|
复制班级中资源的提示修改
|
2016-07-27 16:43:27 +08:00 |
|
Tim
|
9d7fa86cb6
|
syllabus.css样式重用处理
|
2016-07-27 16:33:27 +08:00 |
|
yuanke
|
4fe60bfc97
|
微信课程角色修改
|
2016-07-27 14:56:41 +08:00 |
|
huang
|
b1f69140c7
|
issue用户添加链接，issue链接颜色修改
|
2016-07-27 14:47:13 +08:00 |
|
Tim
|
52475099dc
|
博客设为主页后，文字整个容器宽度显示；班级配置图标菜单css冲突处理；大纲样式冲突处理
|
2016-07-27 14:36:46 +08:00 |
|
yuanke
|
653b98d832
|
微信增加项目相关内容
|
2016-07-27 14:30:19 +08:00 |
|
cxt
|
35b3993c0c
|
未提交的作品去掉提示
|
2016-07-27 14:14:29 +08:00 |
|
cxt
|
a1149c1104
|
班级列表的公开私有
|
2016-07-27 14:07:16 +08:00 |
|
huang
|
43cb2a0d18
|
单位申请消息显示
|
2016-07-27 11:33:54 +08:00 |
|
huang
|
2f79e521ca
|
单位批准发送消息；申请单位给系统每位管理员发送消息
|
2016-07-27 11:20:12 +08:00 |
|
huang
|
29edd60ce6
|
Merge branch 'daiao_dev' into dev_shcool
|
2016-07-27 10:54:38 +08:00 |
 daiao
|
9e788c9b6f
|
单位批准及消息框架搭建
|
2016-07-27 10:46:48 +08:00 |
|
daiao
|
f35b33b09e
|
单位申请记录用户信息（添加user_id）
|
2016-07-27 10:36:08 +08:00 |
|
cxt
|
aafe0aa4ae
|
删除班级留言时左侧导航栏的样式问题
|
2016-07-27 10:20:27 +08:00 |
|
cxt
|
4422bb1bc0
|
课程列表中的私有班级不可访问
|
2016-07-27 10:11:00 +08:00 |
|
cxt
|
76eca76728
|
作业发布时资源库的提示修改
|
2016-07-27 09:39:42 +08:00 |
|
Tim
|
c2388073d6
|
Merge branch 'develop' into cs_optimize_txz
|
2016-07-27 09:34:53 +08:00 |
|
Tim
|
82ae7310dc
|
rake db生成文件
|
2016-07-27 09:32:10 +08:00 |
 guange
|
c5dd2eaf41
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-07-26 18:28:28 +08:00 |
|
guange
|
c63639b86a
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-26 18:28:08 +08:00 |
|
guange
|
4bdb679352
|
将微信token缓存到rails体系里面
|
2016-07-26 18:27:27 +08:00 |
|
cxt
|
a0f2f518cf
|
回复他人的博客首页不应跳到自己的博客首页
|
2016-07-26 17:45:59 +08:00 |
|
Tim
|
a2acbba34a
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-26 17:30:27 +08:00 |
|
Tim
|
e3057566c8
|
各详情页面内容和二级回复样式调整；回复详情内容不显示bug
|
2016-07-26 17:30:02 +08:00 |
|
cxt
|
1f8fa1c70a
|
班级动态去掉“>”
|
2016-07-26 17:16:42 +08:00 |
|
cxt
|
d17a9dabd8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/helpers/courses_helper.rb
|
2016-07-26 16:59:20 +08:00 |
|
daiao
|
0d59f5a358
|
Merge branch 'daiao_dev' into develop
|
2016-07-26 16:57:18 +08:00 |
|
cxt
|
04207609cb
|
未配置课程的班级打开报500
|
2016-07-26 16:54:34 +08:00 |