 cxt
|
89819f5ccd
|
消息列表
|
2016-07-11 17:33:11 +08:00 |
 huang
|
22745edb9b
|
Merge branch 'rep_quality' into develop
|
2016-07-11 17:02:25 +08:00 |
|
huang
|
8b5a2ac1cb
|
message 500
|
2016-07-11 16:59:37 +08:00 |
 yuanke
|
14b7b04e4d
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-11 16:55:56 +08:00 |
 txz
|
dc6127eb78
|
微信我的资源样式更改
|
2016-07-11 16:54:58 +08:00 |
|
yuanke
|
70ed5790b8
|
修改在动态详情点赞返回和点赞状态不一致的BUG
|
2016-07-11 16:46:07 +08:00 |
|
cxt
|
d21eaf9154
|
未配置班级列表的班级重命名
|
2016-07-11 15:32:01 +08:00 |
|
cxt
|
b4e6561e50
|
Merge branch 'cxt_course' into develop
|
2016-07-11 15:16:27 +08:00 |
|
cxt
|
d71e10c8ac
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-11 15:16:04 +08:00 |
|
cxt
|
0b4db97756
|
班级动态
|
2016-07-11 15:15:38 +08:00 |
|
cxt
|
5d9bde3c95
|
课程发送资源到课程
|
2016-07-11 15:10:55 +08:00 |
|
txz
|
cf304c2b68
|
dot.png图片更新
|
2016-07-11 15:10:52 +08:00 |
|
yuanke
|
627135ec12
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-11 14:50:10 +08:00 |
|
yuanke
|
374aa9918c
|
我的资源里面都显示未发布的，新建课程后返回会刷新数据
|
2016-07-11 14:49:59 +08:00 |
|
txz
|
bd29859a28
|
创建课程和参与课程区分样式
|
2016-07-11 14:46:35 +08:00 |
|
cxt
|
834e72b0f8
|
未配置班级列表报500，全部班级列表添加状态列表明班级是否已删除
|
2016-07-11 14:43:22 +08:00 |
|
txz
|
0093a0a509
|
微信邀请提示文字更改
|
2016-07-11 14:23:53 +08:00 |
|
Tim
|
a0db221ffc
|
Merge branch 'develop' into cs_optimize_txz
|
2016-07-11 13:57:04 +08:00 |
|
Tim
|
1aee5b6955
|
将大纲中共用样式提出；个性签名resize：none
|
2016-07-11 13:56:03 +08:00 |
|
huang
|
1283690250
|
Merge branch 'rep_quality' into develop
|
2016-07-11 11:34:07 +08:00 |
|
huang
|
0a001b4f76
|
message 500 for boliang
|
2016-07-11 11:29:15 +08:00 |
|
Tim
|
76803e90d1
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2016-07-11 11:24:34 +08:00 |
|
huang
|
93e79d9419
|
add hidden to css
|
2016-07-11 11:23:59 +08:00 |
|
Tim
|
944362aa66
|
schema.rb文件
|
2016-07-11 11:22:56 +08:00 |
|
huang
|
bac3e433aa
|
sqlate index nil
|
2016-07-11 11:07:04 +08:00 |
|
txz
|
114512d3d9
|
资源宽度限制
|
2016-07-11 11:05:49 +08:00 |
|
huang
|
831006f3c6
|
css for sqale_index
|
2016-07-11 10:57:46 +08:00 |
|
huang
|
cb148c3b9c
|
fixed 500
|
2016-07-11 10:48:44 +08:00 |
|
txz
|
2e75fa4b23
|
课程动态中新建课程改为新建班级
|
2016-07-11 10:42:07 +08:00 |
|
txz
|
6ea1a605c9
|
flex布局兼容css更新
|
2016-07-11 10:37:56 +08:00 |
|
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 |