hitsword
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity
339 Commits
6 Branches
62 Tags
41 MiB
Commit Graph

339 Commits (ea0c09b7551f88717593d43b3c02745c8e9e2607)
 

Author SHA1 Message Date
Chao Xing ea0c09b755 !26 活跃直播流 
Merge pull request !26 from Chao Xing/xingchao
 2018-05-06 11:28:54 +08:00
xingchao b69b0022af 'stream_addr' 2018-05-06 11:27:56 +08:00
Chao Xing aa5d979c28 !25 活跃直播流 
Merge pull request !25 from Chao Xing/xingchao
 2018-05-06 11:25:04 +08:00
xingchao 634c2b9095 'stream_addr' 2018-05-06 11:24:03 +08:00
Chao Xing 882d15f852 !24 活跃直播流 
Merge pull request !24 from Chao Xing/xingchao
 2018-05-06 11:22:59 +08:00
xingchao b2ccc14fae 'stream_addr' 2018-05-06 11:21:59 +08:00
Chao Xing f57eb0be7c !23 活跃 
Merge pull request !23 from Chao Xing/xingchao
 2018-05-06 11:01:09 +08:00
xingchao 5ab960492c 'stream_addr' 2018-05-06 10:58:19 +08:00
Chao Xing 58cbe6d19e !22 活跃直播流 
Merge pull request !22 from Chao Xing/xingchao
 2018-05-06 10:51:26 +08:00
xingchao 9557929665 'stream_addr' 2018-05-06 10:49:16 +08:00
Chao Xing 0a344f8dda !21 流地址 
Merge pull request !21 from Chao Xing/xingchao
 2018-05-06 03:56:55 +08:00
xingchao d5dc8ce330 'stream_addr' 2018-05-06 03:54:52 +08:00
Chao Xing 0329cbacff !20 推流拉流 
Merge pull request !20 from Chao Xing/xingchao
 2018-04-16 08:48:48 +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