 cxt
|
8e8d6a8439
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
db/schema.rb
|
2016-07-11 08:48:03 +08:00 |
|
cxt
|
239f4e67eb
|
Merge branch 'develop' into cxt_course
|
2016-07-11 08:47:32 +08:00 |
 guange
|
c7bb53d2bd
|
在服务端加上imagemagick
|
2016-07-09 13:39:50 +08:00 |
|
guange
|
99a27766be
|
.
|
2016-07-09 10:34:05 +08:00 |
|
guange
|
09a97fc9d8
|
.
|
2016-07-09 10:23:49 +08:00 |
|
guange
|
8279d9385c
|
区分是课程邀请，还是意见反馈
|
2016-07-09 10:13:05 +08:00 |
|
guange
|
f5b4bc3e43
|
merge
|
2016-07-09 09:23:19 +08:00 |
|
guange
|
2a2fe9e81d
|
解决android缓存问题
|
2016-07-09 09:22:41 +08:00 |
|
guange
|
0984c389ae
|
菜单配置
|
2016-07-09 09:20:00 +08:00 |
 huang
|
817eaf318a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-08 21:30:36 +08:00 |
|
huang
|
f77bad34ad
|
缩短时间
|
2016-07-08 21:29:47 +08:00 |
 yuanke
|
c33bb4709c
|
微信正式版配置
|
2016-07-08 21:01:10 +08:00 |
|
guange
|
8800290db9
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-07-08 20:49:55 +08:00 |
|
guange
|
9c00b38358
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-08 20:49:31 +08:00 |
|
huang
|
ee149d15bf
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-08 20:39:50 +08:00 |
|
huang
|
8785264e07
|
Merge branch 'rep_quality' into develop
|
2016-07-08 20:39:43 +08:00 |
|
huang
|
62cb7d4568
|
add css
|
2016-07-08 20:35:21 +08:00 |
|
yuanke
|
e5c3f1d261
|
微信配置修改
|
2016-07-08 20:33:23 +08:00 |
|
yuanke
|
931ff62331
|
Merge branch 'weixin_guange' into develop
|
2016-07-08 20:17:41 +08:00 |
|
yuanke
|
caecd45fba
|
测试版微信配置文件
|
2016-07-08 20:16:42 +08:00 |
|
guange
|
135b6ca64b
|
assets
|
2016-07-08 20:04:24 +08:00 |
|
cxt
|
320db4ddd9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
.access_token
|
2016-07-08 20:01:55 +08:00 |
|
guange
|
7c98e0f392
|
merge
|
2016-07-08 20:00:49 +08:00 |
|
guange
|
2b17828844
|
rge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-08 19:59:16 +08:00 |
|
guange
|
2604f3f0c7
|
资源搜索中只匹配name
|
2016-07-08 19:59:10 +08:00 |
|
huang
|
8365042399
|
Merge branch 'rep_quality' into develop
|
2016-07-08 19:47:50 +08:00 |
|
cxt
|
73619ca696
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-08 19:47:39 +08:00 |
|
huang
|
6b8b20e127
|
logger to puts
|
2016-07-08 19:45:15 +08:00 |
|
cxt
|
1a15c0f567
|
新建班级发布作业报500
|
2016-07-08 19:25:26 +08:00 |
|
cxt
|
d25f401afa
|
管理员界面修改班级名称
|
2016-07-08 19:16:53 +08:00 |
|
yuanke
|
f8eb150530
|
新增班级不完成点返回班级会出现再课程列表的BUG
|
2016-07-08 19:12:26 +08:00 |
|
huang
|
23ba289adf
|
Merge branch 'develop' into rep_quality
|
2016-07-08 19:02:38 +08:00 |
|
yuanke
|
5ccde8e433
|
修改课程列表显示不对的BUG
|
2016-07-08 18:52:21 +08:00 |
|
yuanke
|
189e641d23
|
课程列表改下
|
2016-07-08 18:32:30 +08:00 |
|
cxt
|
6115b7fa4d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-08 18:23:05 +08:00 |
|
cxt
|
3362ebe321
|
线下作业
|
2016-07-08 18:22:59 +08:00 |
|
yuanke
|
1df1368214
|
修改课程名修改无效的BUG
|
2016-07-08 18:12:22 +08:00 |
|
yuanke
|
cce503f32f
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-08 18:08:55 +08:00 |
|
yuanke
|
f1f61c304a
|
修改课程列表显示有误的问题
|
2016-07-08 18:08:31 +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
|
5c0468f8fd
|
二维码过期改为一个月有效期
|
2016-07-08 17:18:09 +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 |
|
huang
|
011b7ef4d4
|
Merge branch 'rep_quality' into develop
|
2016-07-08 16:59:05 +08:00 |