 daiao
|
430a93e4b2
|
单位名称列表功能代码
|
2016-07-29 20:48:36 +08:00 |
|
daiao
|
38f9bf0482
|
Merge branch 'develop' into dev_shcool
|
2016-07-29 16:15:35 +08:00 |
|
daiao
|
4d3f4c358a
|
微信功能
|
2016-07-29 16:13:25 +08:00 |
|
daiao
|
45e33cc456
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-29 16:12:01 +08:00 |
|
daiao
|
5b30036639
|
单位名称列表功能
|
2016-07-29 16:11:26 +08:00 |
 yuanke
|
a4eb774fe9
|
Merge branch 'weixin_guange' into develop
|
2016-07-29 15:48:37 +08:00 |
|
yuanke
|
e478b050d1
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-29 15:47:47 +08:00 |
|
yuanke
|
ce8f915d7e
|
分享修改成原来的
|
2016-07-29 15:47:34 +08:00 |
 Tim
|
a11dfcc9fb
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-29 15:40:58 +08:00 |
|
Tim
|
071ad88956
|
新建项目增加项目说明；动态多出文字以省略号显示； 文本内容单词不被强制拆分折行
|
2016-07-29 15:40:47 +08:00 |
|
yuanke
|
54e9367f71
|
分享标题内容修改
|
2016-07-29 10:52:35 +08:00 |
|
yuanke
|
59a8fb8b60
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-29 09:44:57 +08:00 |
|
yuanke
|
7cf1bf2786
|
Merge branch 'weixin_guange' into develop
|
2016-07-29 09:44:07 +08:00 |
|
yuanke
|
f1859151bc
|
修改新建项目、新建课程中的文字
|
2016-07-29 09:43:18 +08:00 |
|
daiao
|
6bd9f47222
|
Merge branch 'dev_shcool' into develop
Conflicts:
db/schema.rb
|
2016-07-28 20:02:57 +08:00 |
|
daiao
|
50ec127c5b
|
单位名称列表功能
|
2016-07-28 20:01:22 +08:00 |
|
yuanke
|
b3fef1b3ec
|
Merge branch 'weixin_guange' into develop
|
2016-07-28 19:06:27 +08:00 |
|
yuanke
|
14d0a91b0b
|
修改下微信菜单
|
2016-07-28 19:05:52 +08:00 |
|
yuanke
|
22897af6c3
|
Merge branch 'weixin_guange' into develop
|
2016-07-28 18:22:20 +08:00 |
|
yuanke
|
ca60496e7b
|
微信 新建项目默认为私有
|
2016-07-28 18:21:42 +08:00 |
|
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 |
|
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 |
|
Tim
|
318ef2bb30
|
微信定位高度
|
2016-07-28 14:35:50 +08:00 |
|
Tim
|
40bb59ea9d
|
微信定位
|
2016-07-28 10:43:54 +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 |
|
yuanke
|
4fe60bfc97
|
微信课程角色修改
|
2016-07-27 14:56:41 +08:00 |
|
yuanke
|
653b98d832
|
微信增加项目相关内容
|
2016-07-27 14:30:19 +08:00 |
|
cxt
|
35b3993c0c
|
未提交的作品去掉提示
|
2016-07-27 14:14:29 +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 |
|
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 |
|
Tim
|
a2acbba34a
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-26 17:30:27 +08:00 |