Commit Graph
2034 Commits
Author SHA1 Message Date
wangyidong 5eda53df87 * code for bug #3693. 2020-12-11 09:30:43 +08:00
wangyidong e8f207ffc1 * adjust code. 2020-12-01 10:43:52 +08:00
jajasper fabd02ef52 * Fix bug #1484 of integrate zdoo. 2020-11-27 17:01:47 +08:00
holan20180123 e41208725d Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-27 11:30:17 +08:00
holan20180123 8d04de9dd6 * Modify the login time permission judgment. 2020-11-27 11:28:05 +08:00
z 124bbb2e8b * adjust for X-Frame-Options. 2020-11-26 13:53:44 +08:00
z 5362b9367f * add new version and upgrade. 2020-11-19 11:20:03 +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 a55a538270 * Finish task #8390. 2020-11-18 13:52:07 +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 3aee933db6 * Finish task #8386. 2020-11-17 16:32:41 +08:00
holan20180123 cb8dc1bc3b * Finish task #8389. 2020-11-17 16:11:06 +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
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
holan20180123 728ff92cf6 * Finish task #8194. 2020-11-12 11:25:05 +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
holan20180123 15e8463347 * Finish task #8194. 2020-11-11 11:18:08 +08:00
z b765cbc494 * finish task #8242. 2020-11-09 17:31:57 +08:00
holan20180123 09d6f83f85 * Finish task #8194. 2020-11-06 14:01:01 +08:00
z 1bccfd5744 * add new version and upgrade. 2020-10-30 10:40:00 +08:00
holan20180123 d9f4ac717d * Finish task #12957. 2020-10-28 17:29:19 +08:00
holan20180123 e930c53b0d * Finish task #12957. 2020-10-28 17:14:08 +08:00
holan20180123 35ecdc8290 * Remove duplicate query code. 2020-10-21 09:31:28 +08:00
leiyong 6af8ff9971 * modulePageActions is modified to TRActions. 2020-10-21 09:17:33 +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
holan20180123 72ad194da7 * Finish task #7951. 2020-09-28 09:04:07 +08:00
holan20180123 ed523a1442 * Finish task #7951. Fix bug 3369. 2020-09-28 08:54:14 +08:00
z 2a6e021191 * finish task #7986. 2020-09-24 13:24:46 +08:00
z 93581b34b4 * add new version. 2020-09-15 09:52:17 +08:00
z 0940140b9d * adjust for ja lang. 2020-09-15 09:07:42 +08:00
z 859b836916 * adjust for ja lang. 2020-09-12 10:55:23 +08:00
z 5b8f0c4bc1 + add ja lang. 2020-09-12 10:55:23 +08:00
z c2c14a88c9 * code for task #7799. 2020-09-08 13:50:08 +08:00
z 8e2f4654c4 * finish task #7795. 2020-09-03 16:32:39 +08:00
z a9df6f3b9c * merge after 12.4.1 changes. 2020-08-31 15:31:55 +08:00
z b1cd0ed599 * code for task #7600. 2020-08-06 13:36:41 +08:00
Catouse c2b35db7d1 * fix picker undefined error in some pages without import picker js. 2020-08-06 10:48:30 +08:00