Commit Graph

335 Commits (b525fd1b49165598f3b4e0a72ef8382485ffab0f)
 

Author SHA1 Message Date
xingchao b525fd1b49 '有直播流可以直播' 2018-05-07 11:50:39 +08:00
xingchao 0f25bd16ac '去注释' 2018-05-07 11:33:40 +08:00
xingchao 85adc4f880 '添加直播流' 2018-05-07 11:27:31 +08:00
xingchao b69b0022af 'stream_addr' 2018-05-06 11:27:56 +08:00
xingchao 634c2b9095 'stream_addr' 2018-05-06 11:24:03 +08:00
xingchao b2ccc14fae 'stream_addr' 2018-05-06 11:21:59 +08:00
xingchao 5ab960492c 'stream_addr' 2018-05-06 10:58:19 +08:00
xingchao 9557929665 'stream_addr' 2018-05-06 10:49:16 +08:00
xingchao d5dc8ce330 'stream_addr' 2018-05-06 03:54:52 +08:00
xingchao a9680c36bb 推流拉流model 2018-04-16 08:45:07 +08:00
xingchao 4cf807f996 推流拉流控制器 2018-04-16 08:43:33 +08:00
Chao Xing 7b91aa2a15 !19 攻略
Merge pull request !19 from Chao Xing/xingchao
2018-03-01 17:57:29 +08:00
XingChao 92f055a934 '攻略' 2018-03-01 17:54:40 +08:00
Chao Xing 7edc152cf5 !18 订单添加 景点门票注释单选
Merge pull request !18 from Chao Xing/xingchao
2018-03-01 16:17:58 +08:00
XingChao ee93723d62 '订单读取' 2018-03-01 16:13:25 +08:00
kaiend 698c73dff7 !17 travel notes
Merge pull request !17 from kaiend/sunkai
2018-02-27 17:31:04 +08:00
kaiend 32521adc7e travel notes 2018-02-27 17:30:00 +08:00
kaiend 79b310435b !16 order
Merge pull request !16 from kaiend/sunkai
2018-02-27 13:55:48 +08:00
kaiend 5afdf74fc2 order 2018-02-27 13:53:52 +08:00
张立超 065db70a71 !15 添加一个文件
Merge pull request !15 from 张立超/zhanglichao
2018-02-27 11:49:34 +08:00
root d3b69c8a0a zhanglihcao 2018-02-27 11:47:49 +08:00
Chao Xing 752f52c7aa !14 update.gitignore
Merge pull request !14 from Chao Xing/xingchao
2018-02-27 10:22:12 +08:00
XingChao 5d05d2f1bb 'update.gitignore' 2018-02-27 10:19:39 +08:00
kaiend 1176dfe6d5 删除目录runtime/temp 2018-02-04 17:10:48 +08:00
kaiend c5e9d22642 删除目录runtime/cache/cb 2018-02-04 17:09:48 +08:00
kaiend 810daf5ed0 删除目录runtime/cache/4e 2018-02-04 17:09:42 +08:00
kaiend e050690539 !13 api-product-controller
Merge pull request !13 from kaiend/sunkai
2018-02-04 17:07:49 +08:00
kaiend a933584473 'api-product-controller' 2018-02-04 17:06:24 +08:00
kaiend b6f2cfa8ae !12 api-product-controller
Merge pull request !12 from kaiend/sunkai
2018-02-04 16:55:20 +08:00
kaiend 80c4c098da 'api-product-controller' 2018-02-04 16:54:22 +08:00
kaiend e9f713b379 !11 API-product-model
Merge pull request !11 from kaiend/sunkai
2018-02-04 16:43:13 +08:00
kaiend 9cae97054f 'api
odel'
2018-02-04 16:41:50 +08:00
kaiend a3b6a72964 Merge branch 'master' of https://gitee.com/luapp/fastadmin into sunkai 2018-02-04 16:41:04 +08:00
kaiend 121dade030 Merge https://gitee.com/karson/fastadmin into sunkai 2018-02-04 16:31:01 +08:00
kaiend b1aab39f28 !10 api
Merge pull request !10 from kaiend/sunkai
2018-02-04 16:24:53 +08:00
kaiend 3d3b24bafb 'api' 2018-02-04 16:23:43 +08:00
Karson 26a35c9738 新增插件在线一键升级功能
新增安装指定插件版本
修复二级管理员无法添加管理员的BUG
优化require-table在add_url的ids替换
2018-02-04 00:36:17 +08:00
kaiend 453d7c5b55 !9 order
Merge pull request !9 from kaiend/sunkai
2018-02-02 17:06:34 +08:00
kaiend fd4e40b941 'order' 2018-02-02 17:03:46 +08:00
kaiend 3eb468e142 !8 攻略
Merge pull request !8 from kaiend/sunkai
2018-02-02 13:21:10 +08:00
kaiend 013fe09956 'idea' 2018-02-02 13:14:10 +08:00
kaiend 7200bb986c Merge branch 'sunkai' of https://gitee.com/luapp/fastadmin into sunkai 2018-02-02 13:10:37 +08:00
kaiend 71567acc05 '攻略' 2018-02-02 13:09:41 +08:00
kaiend 270604e5bc !6 2-1
Merge pull request !6 from kaiend/sunkai
2018-02-01 10:25:56 +08:00
kaiend 9cc2579bb3 2-1 2018-02-01 10:22:30 +08:00
kaiend 0a553141d0 2-1 2018-02-01 10:20:22 +08:00
Karson 36a392962e 修复二级目录下JS中请求插件地址时错误的BUG 2018-01-31 23:06:49 +08:00
F4NNIU e0987fda2d !36 修复 test 表中添加数据时显示 admin_id 无默认值的报错
Merge pull request !36 from F4NNIU/fix_admin_id_defalut_value
2018-01-31 22:26:54 +08:00
Karson f2152bee1f 新增后台3次登录失败后1天以后才可再次尝试
新增Config中多个变量供JS中使用
修复分类管理在使用CRUD一键生成关联模型后的BUG
修复后台管理员selectpage编辑时的BUG
2018-01-31 22:26:32 +08:00
kaiend 78f3b10092 删除目录.idea 2018-01-31 11:38:23 +08:00