Commit Graph
1098 Commits
Author SHA1 Message Date
tianshujie98 f0a812a946 * Finish task #8501. 2020-11-26 11:13:11 +08:00
jajasper 78facc12be * Fix bug of integrated zdoo need set X-Frame to allow-from. 2020-11-25 14:05:50 +08:00
leiyong 8f11da1edd * Finish task#8461. 2020-11-24 13:15:27 +08:00
z b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
Yagami 7eaf1d34e1 * Adjust code. 2020-11-19 08:53:47 +08:00
leiyong 455e828fce * Adjust recent. 2020-11-18 15:22:49 +08:00
holan20180123 378d6245e8 * Finish task #8376. 2020-11-18 15:17:30 +08:00
holan20180123 557a5d5d62 * Finish task #8387. 2020-11-18 14:04:34 +08:00
holan20180123 d1bb42ad3a * Finish task #8376. 2020-11-18 11:34:41 +08:00
hufangzhou 55df1f202b * Finish task#8387. 2020-11-18 09:09:16 +08:00
holan20180123 9e7d7aa91a * Finish task #8388. 2020-11-17 16:39:10 +08:00
holan20180123 4943ce7bbe * Finish task #8387. 2020-11-17 15:25:16 +08:00
holan20180123 bb34dfe79b * Finish task #8378. 2020-11-17 14:04:50 +08:00
leiyong 3272d0c454 * Adjust the test module related code. 2020-11-16 14:50:04 +08:00
holan20180123 5ca98d0eee * Finish task #8194. 2020-11-16 09:13:06 +08:00
holan20180123 95c2adcdb0 *Finish task #8194. 2020-11-15 22:39:26 +08:00
leiyong d8feaae09d * Adjust recent sprit. 2020-11-13 15:48:58 +08:00
holan20180123 728ff92cf6 * Finish task #8194. 2020-11-12 11:25:05 +08:00
leiyong c01934f8ba * Finish task#8339. 2020-11-12 10:20:06 +08:00
holan20180123 a7533f722d * Finish task #8194. 2020-11-12 10:09:16 +08:00
holan20180123 547ecde44d * Finish task #8194. 2020-11-11 16:11:27 +08:00
Yagami 89de3231b2 * Fix code error. 2020-11-06 16:53:42 +08:00
Yagami 3c1fe9d75e * Fix sub menu. 2020-11-06 16:53:42 +08:00
holan20180123 09d6f83f85 * Finish task #8194. 2020-11-06 14:01:01 +08:00
leiyong 680c880b5a * Fix bug. 2020-10-30 17:32:19 +08:00
z 5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +08:00
leiyong b8166b7b84 * Modify the program icon. 2020-10-29 10:52:13 +08:00
leiyong abf386a1e3 * Adjust whitelist deletion logic. 2020-10-27 16:08:46 +08:00
leiyong 5002be3199 * Modify whitelist related logic. 2020-10-27 13:10:54 +08:00
leiyong aff516e659 * Project add whitelist function. 2020-10-26 14:38:41 +08:00
leiyong adad0cedfb * Add sync whitelist. 2020-10-26 10:19:19 +08:00
Yagami ec4dd58fb7 * Fix bugs. 2020-10-21 09:53:39 +08:00
holan20180123 13038a9a5b * Remove duplicate query code. 2020-10-21 09:42:17 +08:00
holan20180123 35ecdc8290 * Remove duplicate query code. 2020-10-21 09:31:28 +08:00
leiyong 5dab208c02 * Adding permissions and maintaining language files. 2020-10-20 09:08:45 +08:00
leiyong 00631c63f8 * Adjusting the left menu style. 2020-10-19 16:05:11 +08:00
leiyong 2554993ae0 * Adjusting the left menu style. 2020-10-19 15:49:46 +08:00
Yagami f21ea4477f * Finish task #8122,#8117,#8115,#8114,#8113. 2020-10-16 16:45:55 +08:00
holan20180123 7f49f1f614 * Finish task #8085. 2020-10-12 15:49:46 +08:00
leiyong 526b475395 * Finish task#8112. 2020-10-12 10:22:41 +08:00
holan20180123 b849999023 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-10-10 16:57:05 +08:00
holan20180123 02eb03583d * Finish task #8085. 2020-10-10 16:56:36 +08:00
z 12820bf546 * fix for task #8091. 2020-10-09 11:43:18 +08:00
z 1af3353ae1 * adjust notice. 2020-10-09 11:02:01 +08:00
z 3d0ccb781d * finish task #8091. 2020-10-09 09:13:29 +08:00
z 4262f4c782 * finish task #8051. 2020-09-30 20:34:53 +08:00
leiyong b60e13adff * Finish task#8076. 2020-09-30 14:16:17 +08:00
z a7b7d8da4a * fix bug for set https. 2020-09-30 13:36:49 +08:00
leiyong 8e74ba9677 * Adjust code. 2020-09-29 09:47:25 +08:00
leiyong d066fef4e5 *Adjust code. 2020-09-29 08:31:27 +08:00