Commit Graph
437 Commits
Author SHA1 Message Date
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 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 cb7931251b * finish task #7535. 2020-07-27 09:29:31 +08:00
z 9b835f13fd * finish task #7534. 2020-07-24 20:57:32 +08:00
z 480b7df59d * finish task #7533. 2020-07-24 20:41:06 +08:00
z cac3322a8d * adjust for workflow. 2020-07-20 15:09:41 +08:00
chenfei 7768b040d4 * Finish task #7383. 2020-07-17 16:39:49 +08:00
leiyong 59d6baede0 * Fix jenkins password cannot contain @. 2020-07-16 14:37:21 +08:00
z a76b09bef2 * adjust code for flow. 2020-07-13 16:21:10 +08:00
chenfei 7cd810d3d1 * Fix bug #3255. 2020-07-09 13:57:20 +08:00
z 5907a27f8f * finish task #7278. 2020-06-19 16:43:08 +08:00
z ceea9745a1 * finish task #7261. 2020-06-17 14:15:16 +08:00
wangyidong 7a9cc4070a * fix for security weaknesses. 2020-05-28 09:52:41 +08:00
wangyidong 9e83e63996 * code for php7.4. 2020-03-18 16:48:14 +08:00
wangyidong 928147ac91 * finish task #6891. 2020-02-20 15:09:25 +08:00
wangyidong 5d97280b3a * Fix error. 2020-02-11 15:12:58 +08:00
wangyidong 6a91d77a31 * adjust code. 2020-02-11 12:04:24 +08:00
wangyidong 616d01b015 * fix bug. 2020-02-05 17:30:21 +08:00
wangyidong 6fc074f237 * code for task #9812. 2020-02-04 17:34:13 +08:00
wangyidong 3de40ee5b2 * finish task #2201. 2020-01-13 14:56:23 +08:00
wangyidong e2efd30948 * fix bug for show annual data. 2020-01-07 08:49:09 +08:00
wangyidong 89329621d3 * adjust for annual data. 2020-01-06 16:50:15 +08:00
wangyidong 7af8e82c0d * code for upgrade. 2020-01-02 09:45:21 +08:00
chenfei 125e2375f8 * Adjust variable name. 2019-12-11 11:15:00 +08:00
wangyidong 168ce93203 * finish task #6620. 2019-12-05 17:00:08 +08:00
wangyidong 4988680449 * finish task #6577. 2019-11-26 13:49:20 +08:00
wangyidong 90122b67b9 * adjust code. 2019-11-26 11:03:45 +08:00
wangyidong 41c693d07a * finish task #6488. 2019-11-22 10:37:50 +08:00
wangyidong 6434e06342 * finish task #6539,6537. 2019-11-18 14:14:03 +08:00
Yagami 6a34209544 * Finish task #6481. 2019-11-14 10:44:43 +08:00
wangyidong 2f62ecb51e * finish task #6444. 2019-10-12 14:50:00 +08:00
Yagami 1821853a9f * Finish task #6384. 2019-10-09 10:00:16 +08:00
wangyidong 54eaa0d545 * check timestamp for check entry token. 2019-09-25 15:00:08 +08:00
wangyidong b72f3f5db3 * code for tutorial. 2019-09-03 14:31:48 +08:00
wangyidong 981d69a87e * code for task #6310. 2019-09-03 13:18:55 +08:00
wangyidong 2b78f53283 * finish task #6310. 2019-09-03 13:17:45 +08:00
wangyidong 010e585550 * finish task #6176. 2019-08-14 08:59:39 +08:00