Commit Graph
907 Commits
Author SHA1 Message Date
xieqiyu 86308137c7 * Code for bug#28673. 2023-02-16 08:59:37 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
xieqiyu b0b04b0144 * Code for bug#32089. 2023-02-13 17:08:33 +08:00
xieqiyu eb176697b1 * Fix bug#30859. 2023-02-01 10:48:48 +08:00
王怡栋 b75714f5b1 Merge branch 'zentaopms_284_task_#83030' into 'master'
* Finish task #83030.

See merge request easycorp/zentaopms!6800
2023-01-30 08:03:30 +00:00
daitingting af2dc8014c * Finish task #83030. 2023-01-30 07:32:19 +00:00
xieqiyu 67a4f16f74 * Fix bug#31685. 2023-01-18 15:12:14 +08:00
hufangzhou 3a51b751ef * Add the new Version. 2022-12-27 00:54:30 +00:00
liugang 8100689bb2 Merge branch 'sprint/biz17' 2022-12-26 08:50:31 +08:00
孙广明 dc33dd6283 Merge branch 'master_xieqiyu_30891' into 'master'
* Fix bug#30891.

See merge request easycorp/zentaopms!6576
2022-12-16 05:06:37 +00:00
孙广明 9a6929062a * Fix bug #30882. 2022-12-16 11:12:40 +08:00
xieqiyu f17dbd2c68 * Fix bug#30861. 2022-12-16 11:01:03 +08:00
xieqiyu 6d970f0935 * Code for task#79444. 2022-12-15 14:33:39 +08:00
lanzongjun 43b667ba2b * Finish Bug #30700 2022-12-08 16:16:16 +08:00
lanzongjun 47284dc742 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun 2022-12-08 14:45:33 +08:00
lanzongjun e6989dc17c * Finish Bug #30687 2022-12-08 14:32:27 +08:00
xieqiyu ec6f263bd3 * Code for task#78661. 2022-12-07 21:42:59 +08:00
xieqiyu ae62bdff75 * Code for task#78661. 2022-12-07 14:19:36 +08:00
lanzongjun a835220fe1 resolve conflict master 2022-12-02 10:28:31 +08:00
liumengyi a6c8171286 * Fix bug #30278. 2022-12-01 10:33:59 +08:00
孙广明 6356683483 Merge branch 'master' into 256 2022-11-28 13:36:48 +08:00
liugang 7c62eef9dc Merge branch 'master' into sprint/biz17 2022-11-21 13:08:59 +08:00
Yagami 427d5947c5 * Fix bug #29443. 2022-11-18 14:41:25 +08:00
liumengyi 31f3e49602 * Fix bug #29911. 2022-11-17 15:05:37 +08:00
liumengyi 64ac87995c * Fix bug #29902. 2022-11-17 08:46:41 +08:00
liumengyi 398afed7ae * Fix bug #29912. 2022-11-17 08:42:54 +08:00
孙广明 3aedd173f8 Merge branch 'master_xieqiyu_29808' into 'master'
* Fix bug#29808.

See merge request easycorp/zentaopms!6165
2022-11-15 07:57:42 +00:00
xieqiyu 85c8e84c79 * Fix bug#29808. 2022-11-15 15:56:34 +08:00
mayue 127139f803 * Fix bug #29757. 2022-11-15 11:13:03 +08:00
liumengyi 95d7aec45f * Fix bug for group dynamic. 2022-11-10 10:32:45 +08:00
mayue 404f47a361 * Fix bug #27342. 2022-11-09 09:37:05 +08:00
liugang 6c915bb8c2 * Finish task #75077. 2022-11-08 14:22:18 +08:00
zhujinyong a65662436d Merge branch 'sprint/biz17' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/biz17 2022-11-08 14:09:44 +08:00
liugang 39f4ea0e7a * Finish task #75169. 2022-11-08 10:36:53 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
liumengyi a38461a20e * Fix bug for manage chart group. 2022-11-06 16:03:14 +08:00
liumengyi 98ceb83f84 * Fix bug #29227. 2022-11-03 14:37:41 +08:00
lanzongjun c525d43c1f fix ajax needCreate param 2022-11-03 09:29:50 +08:00
liumengyi ca70d4d63c * Finish task #74322, #74326. 2022-11-01 14:20:57 +08:00
lanzongjun 67737d25c2 * task #74142 2022-11-01 09:58:04 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
tanghucheng 645072d3ae * Fix bug #28711. 2022-10-24 14:44:12 +08:00
tanghucheng 4ad1ac2435 * Code for bug #28684. 2022-10-24 14:27:58 +08:00
tanghucheng 4bb1f27573 * Fix bug #28711. 2022-10-20 17:06:00 +08:00
tanghucheng c0a9e98cd1 * Fix bug #28684,28680. 2022-10-19 15:42:46 +08:00
tanghucheng 14f82baf7e * Fix bug #28639. 2022-10-19 13:57:00 +08:00
tanghucheng 30bf3b8d3d * Add language for tree. 2022-10-19 11:25:31 +08:00
tanghucheng 7959557283 * Fix bug #28647. 2022-10-19 11:05:35 +08:00
tanghucheng 484cffa1a1 * Add ticket module. 2022-10-19 09:33:26 +08:00
Yagami 6788ef5793 * Finish task #72671. 2022-10-19 09:23:59 +08:00