blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2026-07-17 12:31:09 +08:00
Code Issues Projects Releases Wiki Activity

#672: Merge branch 'master' of https://github.com/zoujingli/Think.Admin

Browse Source 
# Conflicts:
#	application/admin/controller/Config.php
#	application/admin/controller/Index.php
#	application/admin/controller/User.php
#	application/admin/view/auth.index.html
#	application/admin/view/log.index.html
#	application/admin/view/user.index.html
This commit is contained in:
Anyon 2017-09-27 16:26:27 +08:00
commit 3502ab2c97
2 changed files with 5 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
commit.ref

@ -1 +1 @@
Subproject commit 58bdcbbab5284702b6ce23d3a558defa95a3758b
Subproject commit 5f461f6f04a0f0436be6c1047a9b3f838cf5f704

70
commit.yml
View File

@ -1,71 +1,9 @@
!revision
branches: {
}
fileChange:
/application:
newFile: !uuid '29dd206b716b1a6c3f7254434bbe3dcd173f2f59'
oldFile: !uuid '8d744c43b7a54095072894b00741b5945ac34b95'
/application/admin:
newFile: !uuid 'e726d77b47526361da89b73b665c032deb8d1ed8'
oldFile: !uuid 'f7c73a323a3c7a9eeaee97bc614b92e32bd88494'
/application/admin/controller:
newFile: !uuid 'a5e4c00022571c3a310792db0c338f812115b10d'
oldFile: !uuid '3432d8948d36f75e700fc988e1c1b3800776995c'
/application/admin/controller/Config.php:
newFile: !uuid '9ecf6093836110d305037afa19cbce8e2a4a175b'
oldFile: !uuid '155ffc1b3a43437d9f9817cdbb4216fa28bd56b3'
/application/admin/controller/Index.php:
newFile: !uuid 'f19b4e6036c7d144b6f3b018e0f91cd27b243030'
oldFile: !uuid '65484ba9fa5a82e98357484ec6e87d159c1aa554'
/application/admin/controller/Log.php:
newFile: !uuid 'e0a2098348b5300af0e545f7f1c8d3684c594021'
oldFile: !uuid 'f9e77cd6b886e2cad01093164700916fe940064b'
/application/admin/controller/Login.php:
newFile: !uuid 'edf78044db91f744e64fd2863fb65f04fd3e833c'
oldFile: !uuid 'd01674a254828cf0ccd05603a83ddaa24c008758'
/application/admin/controller/Plugs.php:
newFile: !uuid 'daee94587b04ee123fc383f6edf7ecf30843494a'
oldFile: !uuid 'acfd213d5192eb45fe5c327abf65057a98ea167f'
/application/admin/controller/User.php:
newFile: !uuid '48c621acdd1f44617bb246e2ed914db8b077dba9'
oldFile: !uuid '09045dcd0f8c5f311904023e7cb98474a2586176'
/application/admin/view:
newFile: !uuid '0e7738bb584f31a4e5f7470a5c07f2c7c10c5c18'
oldFile: !uuid 'b93580347df72466e9578938642afbc226e764a3'
/application/admin/view/auth.index.html:
newFile: !uuid '36c62a8ba715cdef36038252530e930c9484c58d'
oldFile: !uuid 'd23682d5563663f5013c594079266a406a3e9d05'
/application/admin/view/config.file.html:
newFile: !uuid 'cc7a3c198a3cde36ea143d6e03081c2dfb3ca476'
oldFile: !uuid '52d89ad3a173d199c68c9d25493225b3f4f13401'
/application/admin/view/config.sms.html:
newFile: !uuid 'bae058a55569f4e5f5ac042065d7954e6e611ad9'
oldFile: null
/application/admin/view/index.main.html:
newFile: !uuid '1df88aa5568dc189f07286e37dc1eea2943e950c'
oldFile: !uuid 'e702533f88b237073caf0c63f13675c504b25fb6'
/application/admin/view/log.index.html:
newFile: !uuid '6124668b071a2e52c7ff8c1a4e223a9abb352743'
oldFile: !uuid 'a18e3ab66137b09df12907c5b7ac8849e5572fa0'
/application/admin/view/login.index.html:
newFile: !uuid '45ddf09a85e5d18ab56f9feb631e23319a466a9f'
oldFile: !uuid '82ad6baa1f5db2b5426a8e70fe2a81ed309b4282'
/application/admin/view/node.index.html:
newFile: !uuid '9cb61f0bba84a73108e6be052cb550b2f836edce'
oldFile: !uuid '7801d950688f1bf034b8aa0b4d3f20d56e2508ee'
/application/admin/view/user.auth.html:
newFile: !uuid 'f391930b6f3482c9eb192484a6fbbb5da570995a'
oldFile: !uuid 'd67f5a6842f63523e641820df6164d106d878802'
/application/admin/view/user.form.html:
newFile: !uuid '0ad72f6a0b988d0d4c9f8eeea2e26babb234ea1d'
oldFile: !uuid '62cb15ff61fe5f24daa0aac6e35231de1dd226e9'
/application/admin/view/user.index.html:
newFile: !uuid 'bae437e07f94de7e47142c896e5f40e51da4fa63'
oldFile: !uuid 'a4bf67d8cc6a03126923f5232d237ad46066216f'
/application/admin/view/user.pass.html:
newFile: !uuid '0184e87bb7c8168e19593d5bab8c7df6eed9dbd0'
oldFile: !uuid 'cf2f3ac5d4485f94108034928b6c3590a0f400d0'
gitCommitId: !uuid '58bdcbbab5284702b6ce23d3a558defa95a3758b'
fileChange: {
}
gitCommitId: !uuid '5f461f6f04a0f0436be6c1047a9b3f838cf5f704'
renames: {
}
revisionId: 671
revisionId: 672