pppscn 93530d53d6 Merge remote-tracking branch 'karson/master' ... # Conflicts: # application/admin/command/Crud/stubs/index.stub # application/admin/command/Crud/stubs/mixins/radio.stub # application/admin/command/Crud/stubs/mixins/select.stub # application/admin/controller/Ajax.php # application/admin/library/traits/Backend.php # public/assets/css/backend.css		2018-08-06 23:03:11 +08:00
..
html	Merge remote-tracking branch 'karson/master'	2018-08-06 23:03:11 +08:00
mixins	Merge remote-tracking branch 'karson/master'	2018-08-06 23:03:11 +08:00
add.stub	一键清除Log日志、优化Crud、自动插入admin_id字段	2018-04-20 17:33:39 +08:00
controller.stub	Merge remote-tracking branch 'karson/master'	2018-06-29 16:15:24 +08:00
controllerindex.stub	新增附件记录上传会员和上传管理员ID	2018-05-06 02:05:27 +08:00
edit.stub	【新增】表格div.pre启用slimScroll美化滚动条	2018-04-16 17:34:32 +08:00
index.stub	新增CRUD一键生成筛选选项卡功能	2018-08-05 21:59:13 +08:00
javascript.stub	Merge remote-tracking branch 'karson/master'	2018-08-06 23:03:11 +08:00
lang.stub	init	2017-04-10 23:36:33 +08:00
model.stub	美化crud生成的代码格式	2018-04-17 16:29:17 +08:00
relationmodel.stub	新增CRUD多表关联	2018-03-14 16:51:56 +08:00
validate.stub	统一修改文件换行符	2017-11-07 23:15:14 +08:00