Commit Graph

4 Commits (3ee684875fa52ca9f4165d26bfbc364dac8cfd87)

Author SHA1 Message Date
Karson 8caeeb8a78 Merge branch '1.x' into develop
# Conflicts:
#	README.md
#	application/admin/command/Install/fastadmin.sql
#	application/admin/controller/Index.php
#	application/admin/controller/auth/Adminlog.php
#	application/common.php
#	application/common/controller/Backend.php
#	application/common/library/Email.php
#	application/config.php
#	application/index/controller/User.php
#	bower.json
#	composer.json
#	extend/fast/Http.php
#	public/assets/css/backend.min.css
#	public/assets/css/frontend.min.css
#	public/assets/js/backend/addon.js
#	public/assets/js/bootstrap-table-commonsearch.js
#	public/assets/js/fast.js
#	public/assets/js/frontend/user.js
#	public/assets/js/jquery.drag.min.js
#	public/assets/js/require-backend.js
#	public/assets/js/require-backend.min.js
#	public/assets/js/require-form.js
#	public/assets/js/require-frontend.min.js
#	public/assets/js/require-table.js
2024-04-01 15:22:15 +08:00
Karson 9fe7a6f9a0 优化拖拽组件高版本jQuery兼容 2023-06-16 16:33:16 +08:00
Karson ec84778d3d 优化路径加载
优化JS和CSS加载目录
2023-03-15 16:18:28 +08:00
Karson 2ceb5f513e init 2017-04-10 23:36:33 +08:00