Commit Graph
1389 Commits
Author SHA1 Message Date
leiyong 6eec4a4a88 * Fix bug. 2020-12-07 08:16:23 +08:00
leiyong a80ae324cb * Finish task#8474. 2020-11-30 10:26:51 +08:00
tianshujie98 85b2060d52 * Adjust code style. 2020-11-30 08:20:57 +08:00
tianshujie98 7600f463e9 * Adjust code style. 2020-11-27 17:54:04 +08:00
Yagami d587642cb1 * Merge code. 2020-11-27 16:49:32 +08:00
tianshujie98 6c5f8f0515 * Add required fields. 2020-11-27 16:32:53 +08:00
tianshujie98 4b97325873 * Finish task #8479. 2020-11-27 16:08:30 +08:00
tianshujie98 da954e3766 * Finish task #8534. 2020-11-26 15:26:38 +08:00
tianshujie98 919bb4b484 * Remove the parent stage link. 2020-11-25 14:41:34 +08:00
leiyong 5ef321f149 * Adjust code logic. 2020-11-25 10:59:41 +08:00
Yagami 90446d239a * Merge code and finish task #8475. 2020-11-25 10:36:44 +08:00
tianshujie98 0c4aee39c9 * Finish task #8479. 2020-11-25 09:13:08 +08:00
z b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
qiyu-xie 31032dfb66 * Fix bug. 2020-11-20 08:27:36 +08:00
holan20180123 f9995e4362 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-18 11:44:15 +08:00
holan20180123 d1bb42ad3a * Finish task #8376. 2020-11-18 11:34:41 +08:00
tianshujie98 48e4e31a30 * Finish task #8397. 2020-11-18 10:33:34 +08:00
holan20180123 726bbc775b * Finish task #8407. 2020-11-18 09:52:04 +08:00
holan20180123 a34b9be905 * Finish task #8406. 2020-11-17 17:17:38 +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
tianshujie98 f1423214eb * Finish task #8402. 2020-11-17 15:12:09 +08:00
tianshujie98 bddac7fe2d * Finish task #8404. 2020-11-17 14:59:09 +08:00
tianshujie98 d0c79808c3 * Finish task #8405. 2020-11-17 14:42:50 +08:00
holan20180123 23362073ba * Finish task #8378. 2020-11-17 14:15:32 +08:00
holan20180123 97770dd00f * Finish task #8379. 2020-11-17 13:17:15 +08:00
holan20180123 fd6502b596 * Alignment format. 2020-11-16 11:31:29 +08:00
holan20180123 e9750cfe26 * Finish task #8194. 2020-11-16 11:00:05 +08:00
tianshujie98 c0e6591afe * Adjust code style. 2020-11-16 10:56:02 +08:00
holan20180123 cef356a33b Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-15 22:39:48 +08:00
holan20180123 95c2adcdb0 *Finish task #8194. 2020-11-15 22:39:26 +08:00
tianshujie98 7d18efad03 * Adjust code style. 2020-11-13 13:11:39 +08:00
tianshujie98 f08eaf98a1 * Finish task #8203. 2020-11-12 16:50:03 +08:00
holan20180123 3ae9a9189e * Finish task #8194. 2020-11-12 16:25:23 +08:00
holan20180123 4e69741e70 * Finish task #8194. 2020-11-12 14:18:08 +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 2d0ffc2b4a * Finish task #8194. 2020-11-11 15:40:26 +08:00
holan20180123 15e8463347 * Finish task #8194. 2020-11-11 11:18:08 +08:00
holan20180123 f80458f916 * Finish task #8194. 2020-11-10 14:06:00 +08:00
holan20180123 bff623a7bc * Finish task #8194. 2020-11-10 09:31:52 +08:00
holan20180123 8b1e4808c2 * Finish task #8194. 2020-11-10 08:49:00 +08:00
holan20180123 07d0f7c6d8 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-06 14:01:58 +08:00
holan20180123 09d6f83f85 * Finish task #8194. 2020-11-06 14:01:01 +08:00
tianshujie98 2a4927cfc6 * Adjust code style. 2020-11-06 10:08:46 +08:00
tianshujie98 838a05196d * Adjust code style. 2020-11-06 08:42:48 +08:00
tianshujie98 592a6b6a5c * Finish task #8197. 2020-11-05 13:23:17 +08:00
z 5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +08:00
leiyong 1ab465d4d7 * Modify upgrade whitelist. 2020-10-29 11:37:09 +08:00
leiyong 0909592ea1 * Adjust whitelist setting logic. 2020-10-28 09:14:38 +08:00