Commit Graph
18090 Commits
Author SHA1 Message Date
z 3fa53be319 * code for task #7939. 2020-09-23 15:05:45 +08:00
z 103a6d6011 Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x 2020-09-23 11:37:22 +08:00
tianshujie98 d39955eb24 * Finish task #8009. 2020-09-23 11:04:55 +08:00
z 31d8bd2f44 Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x 2020-09-23 10:36:53 +08:00
z 7d80bf3cdb * finish task #7920. 2020-09-23 10:36:09 +08:00
holan20180123 f19e7c3220 * Finish task #7965. 2020-09-23 09:44:24 +08:00
holan20180123 372d47f9aa * Finish task #7965. Fix bug #3325. 2020-09-23 09:29:15 +08:00
qiyu-xie 32744c0f25 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-09-22 17:14:30 +08:00
qiyu-xie f343d76f72 * Finish task#7970. 2020-09-22 17:14:01 +08:00
holan20180123 3296d751c4 * Finish task #7971. Fix bug #3296. 2020-09-22 16:33:33 +08:00
holan20180123 7d69e9e479 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-09-22 15:06:49 +08:00
holan20180123 2e593e8a27 * Finish task #7943. Fix bug 3388. 2020-09-22 15:05:56 +08:00
hufangzhou 76f58d6879 * Finish task#7961. 2020-09-22 14:36:07 +08:00
hufangzhou e94b917f66 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-09-22 09:59:05 +08:00
hufangzhou 8f522653f6 * Add the unit of the horizontal axis of the burn chart. 2020-09-22 09:58:55 +08:00
qiyu-xie bd93c680fa * Change lowercase to uppercase. 2020-09-22 08:52:24 +08:00
hufangzhou 658e88e370 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-09-21 17:15:47 +08:00
hufangzhou dbea650d61 * Modify the code format. 2020-09-21 17:15:39 +08:00
z d91c3b1361 Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x 2020-09-21 16:59:14 +08:00
holan20180123 b92156a283 * Finish task #8021. Fix bug #2550. 2020-09-21 16:56:01 +08:00
z bcb0e7732c * adjust for low php version. 2020-09-21 16:51:16 +08:00
holan20180123 233e1ae7c7 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-09-21 15:52:23 +08:00
holan20180123 1033a3e484 * Finish task #7931. 2020-09-21 15:51:39 +08:00
hufangzhou 2488c7ef93 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-09-21 15:43:58 +08:00
hufangzhou 3f31a524b1 * Adjust the display of the burn chart. 2020-09-21 15:43:51 +08:00
holan20180123 ef7027956d * Finish task #8011. Fix bug 2610. 2020-09-21 15:14:53 +08:00
qiyu-xie 52da0d9602 * Finish task#7966. 2020-09-21 14:25:37 +08:00
holan20180123 1e6785c111 * Finish task #7931. Fix bug #3424. 2020-09-21 14:20:36 +08:00
tianshujie98 3c93f0c5dc * Finish task #8015. 2020-09-21 09:48:41 +08:00
tianshujie98 56d2b29c1e * Finish task #7923. 2020-09-21 09:34:42 +08:00
hufangzhou ebc6879d7c Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-09-21 09:21:36 +08:00
hufangzhou 7462c9b885 * Finish task#7937. 2020-09-21 09:21:25 +08:00
z e138e02ab0 * finish task #8019. 2020-09-18 20:04:01 +08:00
z c3dff67efc * finish task #7925. 2020-09-18 16:35:03 +08:00
z 3351881259 Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x 2020-09-18 16:21:09 +08:00
z 853fafe717 * finish task 7924. 2020-09-18 16:20:14 +08:00
hufangzhou e9a11d4ee1 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-09-18 15:15:23 +08:00
hufangzhou c189483958 * Finish task#7941. 2020-09-18 15:15:15 +08:00
holan20180123 c23c2769f0 * Finish task #7956. Fix bug #3361. 2020-09-18 15:13:40 +08:00
holan20180123 09ee542ac9 * Adjust get user function. 2020-09-18 14:47:25 +08:00
holan20180123 71632459fa * Finish task #7924. Fix bug #3446. 2020-09-18 13:06:54 +08:00
tianshujie98 2f12591e13 * Finish task #7990. 2020-09-18 11:38:03 +08:00
z 62e51b057a * finish task #7922. 2020-09-18 11:20:32 +08:00
z 3e6c37b4dc * adjust include my.php position. 2020-09-18 11:20:32 +08:00
qiyu-xie 001e036822 * Finish task#7936. 2020-09-17 16:33:50 +08:00
holan20180123 1aca528db1 * Finish task #7917. 2020-09-17 16:20:04 +08:00
holan20180123 f7763163b0 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-09-17 15:58:29 +08:00
holan20180123 e590c140b3 * Finish task #7917. 2020-09-17 15:58:09 +08:00
hufangzhou 7397d07fbe Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-09-17 14:55:55 +08:00
hufangzhou f0e3a5e949 * Finish task#7969. 2020-09-17 14:55:47 +08:00