diff --git a/commit.ref b/commit.ref index cdced5681..04794f07f 160000 --- a/commit.ref +++ b/commit.ref @@ -1 +1 @@ -Subproject commit cdced56812d8c3e276deeb590076c351a67245bd +Subproject commit 04794f07f886a62650eb15b9405d34112b90c210 diff --git a/commit.yml b/commit.yml index 0d57e1bb5..5567a3409 100644 --- a/commit.yml +++ b/commit.yml @@ -2,214 +2,28 @@ branches: { } fileChange: - /application: - newFile: !uuid 'ffc52161f379ba6da526a35c59110e033471b135' - oldFile: !uuid 'fbb9684e87a442d94c084386bbaec3f3327b508c' - /application/admin: - newFile: !uuid '5f0a090460579b49d173968e45781212f69800d0' - oldFile: !uuid '5f815ceb646e09b0b0b452313b2b1ee947b7890c' - /application/admin/controller: - newFile: !uuid 'bda18155ddba73f0ca666185a454954db181a74d' - oldFile: !uuid 'b8d54321511c016c2fb22fe652aa3c52acd10af9' - /application/admin/controller/Auth.php: - newFile: !uuid 'daa3d8bc30722b8f00957d8d75a68e658de3d61f' - oldFile: !uuid 'a8f3492c7eaee7ae005e3f6e5f9a4a8fe2e376af' - /application/admin/controller/Login.php: - newFile: !uuid '707379823ebda2aab2dab6b488644a931e66b265' - oldFile: !uuid '46b6b95e2946330f553fc8e52bcc329035334f22' - /application/admin/controller/Menu.php: - newFile: !uuid '3dd506db130d58f849f939b99241e8d4aec6972f' - oldFile: !uuid '5ec5e3507f47d812a902030a4701d923bdf35f05' - /application/admin/controller/Node.php: - newFile: !uuid '9e69f59f098a17a20748a671b421f44d9aa71726' - oldFile: !uuid 'ec4d4ad8a3165833bc7b517951abad9031dc0238' - /application/admin/controller/User.php: - newFile: !uuid 'baa7535d003da3b84591eb7b8abd062bf4c83562' - oldFile: !uuid '8956c98ef9a0b7f3979f288fb5ef52db51c95798' - /application/admin/model: - newFile: !uuid '0271737177fb2287d2f3fe545b58fede850fa319' - oldFile: !uuid 'ae49ef1950e4676fe7d32478878e8764c11753e3' - /application/admin/model/Node.php: - newFile: !uuid '8e998890fc3fac47484dd0665bd6900902ec6935' - oldFile: null - /application/admin/view: - newFile: !uuid '0abe4dd0dd5b7a5cded91f34af4a5c09c5827237' - oldFile: !uuid '6dbc18e3be0c142718dd69f69dbd1e0e1a8b974e' - /application/admin/view/auth.apply.html: - newFile: !uuid 'a8b1386f143e04a2011c64350ddf79e1bdf6bf54' - oldFile: null - /application/admin/view/auth.index.html: - newFile: !uuid '1e83eb9d7cbf1c0e88831be82f22b4f4e923b56b' - oldFile: !uuid '4fcb98e8aa84a6d6d539c086094f92a49a924b9f' - /application/admin/view/node.index.html: - newFile: !uuid '3ed91685e0cfd3e4d5b03bcdf316677715fd588b' - oldFile: !uuid 'eb62aa1e4de63bda9731408ce4467d0de8badbfd' - /application/admin/view/user.auth.html: - newFile: !uuid '5f30b728377245ef5a48269274d4d61e3383f72f' - oldFile: null - /application/admin/view/user.form.html: - newFile: !uuid 'f1388313884b056959a5b6f8975512575c58fb1e' - oldFile: !uuid 'be60de231bd279bc60afb353dd317555fd9c6554' - /application/admin/view/user.index.html: - newFile: !uuid 'c98ca24d0a4c406efd3aff7b28bc8a7f4c2b8bfb' - oldFile: !uuid 'b161777a5070a5901d96467db12d54d15977020e' - /application/common.php: - newFile: !uuid 'e238afb31952be80fb88d7fc859cb3fb3b47b0fd' - oldFile: !uuid 'ecd8cd483eb670369de6ff89386e4e73b74d90f5' - /extend: - newFile: !uuid '41c5116a299e7cf5e4cee6fd63f569f0d47c8e16' - oldFile: !uuid '449a669959c2b91cfed1063892abebf1a7abff7b' - /extend/controller: - newFile: !uuid '5c81e603c0e5f1185583407462db44c987f1d9f9' - oldFile: !uuid '03a81f1fcb5eb5da3b1763ae9372fbe972d008ce' - /extend/controller/BasicApi.php: - newFile: !uuid 'a7d3161b8a1ee2d657d800f51c0fe5d523da55d0' - oldFile: null - /extend/library: - newFile: !uuid 'da768a39af81091ee28d4266f5e95245111ee55a' - oldFile: !uuid '3ca5a4a8d3a15a50b475722981c766f86441c896' - /extend/library/Data.php: - newFile: !uuid '59db9ea34a0af1326e141801e9e69a60e1fb76c0' - oldFile: !uuid '928e4ec93cddb28e46590300493d349c89ffc3b7' - /extend/library/Tools.php: - newFile: !uuid 'ad73fad9fb8cba8651034b3c9e1970a22b69e882' - oldFile: !uuid '48d62b78bc606f0406b9f6670256d182f835c557' - /extend/library/resource: - newFile: !uuid 'ff711f39d1f5933efbd4184f37288d3b153f27c9' - oldFile: !uuid '5838d9cb94bf11fc2b61610c66407035ac2e41bb' - /extend/library/resource/mines.php: - newFile: !uuid '4de67cff14a88826bb3c2109ca9d029d2e753b81' - oldFile: !uuid '8730d13110fda8a76884fa3843090949c2f84bc7' /nbproject: - newFile: !uuid 'e91010df3bd1cc09262ed92812a65c3688a766bb' - oldFile: null + newFile: null + oldFile: !uuid 'e91010df3bd1cc09262ed92812a65c3688a766bb' /nbproject/customs.json: - newFile: !uuid '48dd183db2ffffcf31cb617e54316291f9bfe8ae' - oldFile: null + newFile: null + oldFile: !uuid '48dd183db2ffffcf31cb617e54316291f9bfe8ae' /nbproject/private: - newFile: !uuid '9663ff680a1544d546902bdbde90ad5d156d85d0' - oldFile: null + newFile: null + oldFile: !uuid '9663ff680a1544d546902bdbde90ad5d156d85d0' /nbproject/private/private.properties: - newFile: !uuid '813082fd6eb77e5fec30e2f7edded8544ab13c41' - oldFile: null + newFile: null + oldFile: !uuid '813082fd6eb77e5fec30e2f7edded8544ab13c41' /nbproject/private/private.xml: - newFile: !uuid 'cc8b852acb5cb97ae131147e45b3b3e988237c25' - oldFile: null + newFile: null + oldFile: !uuid 'cc8b852acb5cb97ae131147e45b3b3e988237c25' /nbproject/project.properties: - newFile: !uuid '8b7302cf2347d9cdabe69de7e04f5f698a8b0578' - oldFile: null + newFile: null + oldFile: !uuid '8b7302cf2347d9cdabe69de7e04f5f698a8b0578' /nbproject/project.xml: - newFile: !uuid 'e5467ace254c6d42885c9edaaafdbefed0965742' - oldFile: null - /public: - newFile: !uuid '8922e7cb700b795dac6b7b4b0d5aa2f4a63cfbd5' - oldFile: !uuid '26eef9ba7bca6b788748da3bf24c121de9fa6d0b' - /public/static: - newFile: !uuid '8cd52416ef782081da0baf9127b299cb346d8fa4' - oldFile: !uuid '56819eaac7b0bd3eea9e81db24af09145f2cb45b' - /public/static/admin: - newFile: !uuid '999bbeda936a84e028d40322a07f530505b06769' - oldFile: !uuid '4040a8cd613c45850ad42b538a45b770442db6fa' - /public/static/admin/app.js: - newFile: !uuid 'fc978f89cf23c6d60dd853676904757d55553bf8' - oldFile: !uuid 'bb52eedacd0edf0be67494e2525eee626cd199d2' - /public/static/admin/listen.js: - newFile: !uuid 'ba639406ed2874e9defb315944a71ae952307359' - oldFile: !uuid 'bf565cbd648d5bb419e2eda36551f00d6939c75a' - /public/static/admin/plugs.js: - newFile: !uuid '7439058cd25dec6512b5488e3a62dff0d822f22f' - oldFile: !uuid '439f5e06fc4fc6b25e7467041530572b37b719a6' - /public/static/plugs: - newFile: !uuid 'c6883e323102348849c8c034c1e2e5ff0d3a05d3' - oldFile: !uuid '7b5154b3e4b1c147a11ad19071513758b892ad0c' - /public/static/plugs/jquery: - newFile: !uuid 'b8ae574a932fa14b34b93c847dcb93699a2903d8' - oldFile: !uuid 'a4c934fcb41417e94967980ef6b3202b6e1d9a1a' - /public/static/plugs/jquery/jquery.PrintArea.js: - newFile: !uuid '23daa7a21690822b0958fc81d05776119cfa1aff' - oldFile: null - /public/static/plugs/jquery/pcasunzips.js: - newFile: !uuid '3b61ff6e05a3287c0abf0b68c66b2cb8e735a59c' - oldFile: !uuid '21be87700b00e23e70fade39936efe424a76e774' - /public/static/plugs/ztree: - newFile: !uuid '36b198fe1872975c8ae5f4754cb44e90b9228d05' - oldFile: null - /public/static/plugs/ztree/jquery.ztree.all.min.js: - newFile: !uuid '390a5f81a4168e3bd4cef496a6d42cfbe387dd15' - oldFile: null - /public/static/plugs/ztree/zTreeStyle: - newFile: !uuid '5fd2c673280252ba5a89fac76f57bdeeb0a21159' - oldFile: null - /public/static/plugs/ztree/zTreeStyle/img: - newFile: !uuid '77e941bcd79ff837d075a1d29557e8c848004513' - oldFile: null - /public/static/plugs/ztree/zTreeStyle/img/diy: - newFile: !uuid 'a0f7c878936d7aa3050c745e932919e0d7dd5af6' - oldFile: null - /public/static/plugs/ztree/zTreeStyle/img/diy/1_close.png: - newFile: !uuid '68ccb3c3b90170df7cddab1fe6e8e455c3854573' - oldFile: null - /public/static/plugs/ztree/zTreeStyle/img/diy/1_open.png: - newFile: !uuid 'd6ff36d3a99012028c6cf3d4009719108e31bc79' - oldFile: null - /public/static/plugs/ztree/zTreeStyle/img/diy/2.png: - newFile: !uuid '9eff506ba391fa1ddf0dc44d02ae84403700321b' - oldFile: null - /public/static/plugs/ztree/zTreeStyle/img/diy/3.png: - newFile: !uuid 'd7ba6d0c675c35197e2dae8a379155e67c0ac6cb' - oldFile: null - /public/static/plugs/ztree/zTreeStyle/img/diy/4.png: - newFile: !uuid '753e2bfd5725b1f32cda4e41c36a448a4b12c280' - oldFile: null - /public/static/plugs/ztree/zTreeStyle/img/diy/5.png: - newFile: !uuid '0c5eccd562c303cf5197629ef5f2666b6180bd48' - oldFile: null - /public/static/plugs/ztree/zTreeStyle/img/diy/6.png: - newFile: !uuid '070b8352d7770e6be4b6f3cbc61f7ee21ae3e4da' - oldFile: null - /public/static/plugs/ztree/zTreeStyle/img/diy/7.png: - newFile: !uuid '532b037f2045cfa26c62d23cb928ff7405f6fc18' - oldFile: null - /public/static/plugs/ztree/zTreeStyle/img/diy/8.png: - newFile: !uuid 'a8f3a86e7091de4acdd38745f74b30f0f3d40f9e' - oldFile: null - /public/static/plugs/ztree/zTreeStyle/img/diy/9.png: - newFile: !uuid '4db73cd41c95bc74496175625ce9ed3737e599f5' - oldFile: null - /public/static/plugs/ztree/zTreeStyle/img/line_conn.gif: - newFile: !uuid 'd561d36a915776730eb3069cee4c949f027667ed' - oldFile: null - /public/static/plugs/ztree/zTreeStyle/img/loading.gif: - newFile: !uuid 'e8c289293b11c889703d83dce6631fce90da4630' - oldFile: null - /public/static/plugs/ztree/zTreeStyle/img/zTreeStandard.gif: - newFile: !uuid '50c94fd41ef9f1f7c07442d669923fd7a3226f55' - oldFile: null - /public/static/plugs/ztree/zTreeStyle/img/zTreeStandard.png: - newFile: !uuid 'ffda01ef1cccc398ee4e2327f4093ba1130a4961' - oldFile: null - /public/static/plugs/ztree/zTreeStyle/zTreeStyle.css: - newFile: !uuid '4a1705b145cf7d58cbf1916a7c0cecf9c88578c5' - oldFile: null - /public/static/theme: - newFile: !uuid 'ad9a12d52d6a6720823fe15e1224aeeb3e8e44d9' - oldFile: !uuid '3329402dc6a7cb5b560a0941f35adf80b0081491' - /public/static/theme/default: - newFile: !uuid '8f4eea2c7bd1b5edd84e1e7770e5a4f028fed117' - oldFile: !uuid 'd547db815fd7f7d0528273255cae5912b63747d8' - /public/static/theme/default/css: - newFile: !uuid '2709ea3ac54fa00af7ffb4b79e15894760001f1f' - oldFile: !uuid 'c330e68036e274eda3260b61ea8642c3692d1042' - /public/static/theme/default/css/console.css: - newFile: !uuid '0647f707529bb9f752943801bda9f5a555f79dbb' - oldFile: !uuid 'b07d968b5273a90a8d25f8ce51e35c830b604fd0' - /public/static/theme/default/img: - newFile: !uuid '91ce57b8f3b131d4c0cfb16e1d452a1c74c7ae3f' - oldFile: !uuid 'fa397c78110fb627a39e4e7a89357e1aeefbb604' - /public/static/theme/default/img/image.png: - newFile: !uuid '19699f6a9c6b09cb18ec0f488242d9753d2e341b' - oldFile: null -gitCommitId: !uuid 'cdced56812d8c3e276deeb590076c351a67245bd' + newFile: null + oldFile: !uuid 'e5467ace254c6d42885c9edaaafdbefed0965742' +gitCommitId: !uuid '04794f07f886a62650eb15b9405d34112b90c210' renames: { } -revisionId: 202 +revisionId: 203