Commit Graph
18038 Commits
Author SHA1 Message Date
holan20180123 02ff58e4e1 * Finish task #8018. 2020-09-17 11:35:17 +08:00
qiyu-xie 3298d24bba * Finish task#7948. 2020-09-17 11:13:43 +08:00
qiyu-xie 124647c340 * Finish task#7948. 2020-09-17 10:41:09 +08:00
holan20180123 33004a4ba2 * Adjust resource mistake. 2020-09-17 10:40:12 +08:00
holan20180123 b29a0798fc Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-09-17 10:32:52 +08:00
holan20180123 61bc92a6df * Finish task #7931. 2020-09-17 10:32:29 +08:00
tianshujie98 2842f00e51 * Adjust code style. 2020-09-17 10:23:19 +08:00
tianshujie98 6479441957 * Finish task #7946. 2020-09-17 10:18:54 +08:00
hufangzhou 39b313ed53 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-09-17 08:46:11 +08:00
hufangzhou 93ace5a27d * Finish task#7950. 2020-09-17 08:46:03 +08:00
tianshujie98 4e67efa330 * Add notes. 2020-09-17 08:23:11 +08:00
tianshujie98 e8875195b2 * Finish task #7944. 2020-09-17 08:16:39 +08:00
hufangzhou 0d3cccda63 * Add chanzhi.ico. 2020-09-17 08:16:08 +08:00
hufangzhou b198528dfe * Deleted chanzhi.ico. 2020-09-17 08:15:00 +08:00
hufangzhou 779f9421af Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-09-16 17:40:14 +08:00
hufangzhou ff19909161 * Finish task#7916. 2020-09-16 17:40:06 +08:00
tianshujie98 1b911d2606 * Finish task #7927. 2020-09-16 16:15:03 +08:00
tianshujie98 32fb838e3d * Adjust the batch link stage code. 2020-09-16 16:00:21 +08:00
tianshujie98 a53043cbf2 * Add batch link stage judgment. 2020-09-16 15:57:35 +08:00
qiyu-xie a1fcff2a25 * Finish task#7929. 2020-09-16 15:46:25 +08:00
tianshujie98 cfc4b6173b * Restore the previous version. 2020-09-16 15:41:19 +08:00
tianshujie98 c840b9b857 * Fix bug 3405. 2020-09-16 15:12:15 +08:00
tianshujie98 80dfeda677 * Adjust code style. 2020-09-16 15:01:20 +08:00
tianshujie98 a9013adc4e * Finish task #7994. 2020-09-16 14:55:30 +08:00
holan20180123 5fdd5a4a9a * Finish task #7968. 2020-09-16 14:38:26 +08:00
tianshujie98 51d4343a50 * Finish task #7940. 2020-09-16 13:23:26 +08:00
hufangzhou cc36c64c59 * Finish task#7918. 2020-09-16 13:03:37 +08:00
tianshujie98 bd7838bebd * Finish task #8031. 2020-09-16 11:20:30 +08:00
holan20180123 93c740c1ad * Fix bug #8032. 2020-09-16 09:55:31 +08:00
holan20180123 8edc1d2ec5 * Fix bug #8034. 2020-09-16 09:55:10 +08:00
tianshujie98 47b04f91b8 * Delete newline. 2020-09-16 08:53:47 +08:00
tianshujie98 e6fdef3c77 * Finish task #7957. 2020-09-16 08:46:44 +08:00
holan20180123 08c1428b30 * Fix bug #7914. 2020-09-15 17:20:19 +08:00
z 93581b34b4 * add new version. zentaopms_12.4.2_20200915 2020-09-15 09:52:17 +08:00
z 0940140b9d * adjust for ja lang. 2020-09-15 09:07:42 +08:00
qiyu-xie 36dcee74da * Fix bug#3377. 2020-09-14 17:14:20 +08:00
qiyu-xie c86d0327d6 * Fix bug#3425. 2020-09-14 16:35:12 +08:00
qiyu-xie fe74778306 * Fix bug#3438. 2020-09-14 16:15:04 +08:00
hufangzhou bdc908f858 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-09-14 15:57:50 +08:00
hufangzhou bb3d5a2446 * Fix bug#3463. 2020-09-14 15:57:41 +08:00
tianshujie98 5df1ab65db * Fix bug #3457. 2020-09-14 10:10:29 +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
tianshujie98 b9e61a1852 * Fix bug #3457. 2020-09-11 16:53:16 +08:00
tianshujie98 dd4331be7c * Fix bug #3389. 2020-09-11 15:33:57 +08:00
tianshujie98 76285c5556 * Fix bug #3468. 2020-09-11 14:53:54 +08:00
tianshujie98 a40aad4a13 * Fix bug #3473. 2020-09-11 14:47:52 +08:00
tianshujie98 5657235d84 * Fix bug 3464. 2020-09-11 14:44:29 +08:00
hufangzhou ea578deb07 * Fix bug#3469. 2020-09-11 10:09:35 +08:00
Catouse a2038434c7 * update jquery for security. 2020-09-09 16:46:46 +08:00