Commit Graph
42212 Commits
Author SHA1 Message Date
tianshujie 599bd7504f * Finish task #61169. 2022-07-19 09:42:42 +08:00
tianshujie c7a3e799f7 * Finish task #61169. 2022-07-19 09:39:03 +08:00
tianshujie 1b65879003 * Finish task #61169. 2022-07-19 09:31:50 +08:00
tianshujie 8dff584576 * Finish task #61169. 2022-07-18 17:51:05 +08:00
tianshujie c11d07e84e * Finish task #61169. 2022-07-18 15:41:02 +08:00
王怡栋 ee7479b9d5 Merge branch 'sprint/master_zhoxudong_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!4591
zentaopms_17.3
2022-07-18 03:15:34 +00:00
zhouxudong 5688575ea9 * Fix bug. 2022-07-18 03:13:48 +00:00
孙广明 efc04f20e3 Merge branch 'sprint/215_liumengyi_25399' into 'master'
* Fix bug #25399.

See merge request easycorp/zentaopms!4589
2022-07-18 00:53:33 +00:00
孙广明 54200f9c3b Merge branch 'sprint/tianshujie_25400' into 'master'
* Fix bug #25400.

See merge request easycorp/zentaopms!4590
2022-07-18 00:53:23 +00:00
tianshujie 5a56b7bb21 * Fix bug #25400. 2022-07-18 08:50:45 +08:00
liumengyi 6c16eab8eb * Fix bug #25399. 2022-07-18 08:46:51 +08:00
王怡栋 ce27a627af Merge branch 'bugfix/liwenrui/clientdownload2' into 'master'
* tune memory limit, client zips sometimes take more than 512M. needs refactor later.

See merge request easycorp/zentaopms!4588
2022-07-18 00:28:37 +00:00
孙广明 3041238bf6 Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #25251.

See merge request easycorp/zentaopms!4585
2022-07-17 07:23:08 +00:00
Wenrui LI 5a3ed254d4 * tune memory limit, client zips sometimes take more than 512M. needs refactor later. 2022-07-15 16:02:13 +08:00
王怡栋 ec1f058ff8 Merge branch 'sprint/master_zhouxudong_24318' into 'master'
* Fix bug #24318.

See merge request easycorp/zentaopms!4586
2022-07-15 07:10:54 +00:00
王怡栋 6aadc5a77d Merge branch 'sprint/master_zhouxudong_24894' into 'master'
* Fix bug #24894.

See merge request easycorp/zentaopms!4583
2022-07-15 07:10:34 +00:00
王怡栋 393a7466a1 Merge branch 'master_xieqiyu_25038' into 'master'
* Fix bug#25038.

See merge request easycorp/zentaopms!4580
2022-07-15 07:10:20 +00:00
王怡栋 9fbcd9113c Merge branch 'sprint/215_liumengyi_25386' into 'master'
* Fix bug #25386.

See merge request easycorp/zentaopms!4587
2022-07-15 07:09:55 +00:00
liumengyi 3c974558c1 * Fix bug #25386. 2022-07-15 15:03:01 +08:00
zhouxudong da0401def9 * Fix bug #24318. 2022-07-15 06:58:16 +00:00
liyuchun fc61e1c142 * Fix bug #25251. 2022-07-15 06:49:47 +00:00
孙广明 2a50a5dc72 Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #25321.

See merge request easycorp/zentaopms!4584
2022-07-15 06:40:49 +00:00
tianshujie c0c21bc75d * Fix bug #25321. 2022-07-15 14:39:35 +08:00
xieqiyu ea5c5c760d * Delete future width when create project. 2022-07-15 14:38:17 +08:00
孙广明 cb01084a13 Merge branch 'sprint/215_liumengyi_25230' into 'master'
* Fix bug #25230, #25200,#24929.

See merge request easycorp/zentaopms!4579
2022-07-15 06:17:32 +00:00
孙广明 900e2342a2 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4582
2022-07-15 06:16:50 +00:00
liumengyi 67772332b5 * Fix bug #24929. 2022-07-15 14:16:27 +08:00
liumengyi c38e03a604 * Fix bug #25200. 2022-07-15 14:07:49 +08:00
tianshujie 656cc5f060 * Fix bug #25321. 2022-07-15 14:07:32 +08:00
xieqiyu 12d9c215ee * Fix bug#25038. 2022-07-15 13:58:53 +08:00
zhouxudong 95dba9297d * Fix bug #24894. 2022-07-15 05:43:51 +00:00
liumengyi 7b9c5e6d52 * Fix bug #25230. 2022-07-15 13:42:13 +08:00
孙广明 824c6f5aee Merge branch 'sprint/216_mayue_fixbug' into 'master'
* Fix bug .

See merge request easycorp/zentaopms!4577
2022-07-15 05:14:06 +00:00
mayue a8dc623084 * Fix bug . 2022-07-15 13:13:28 +08:00
tianshujie 5e464f8b85 * Fix bug #25375. 2022-07-15 13:09:24 +08:00
王怡栋 849eafbe36 Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!4576
2022-07-15 05:04:56 +00:00
zhouxudong 56c1339fbe * Fix bug. 2022-07-15 03:36:57 +00:00
王怡栋 21bc4a5a5f Merge branch 'bugfix/liwenrui/kanbanheader' into 'master'
* fix toolbar position for zentaoclient.

See merge request easycorp/zentaopms!4574
2022-07-15 03:23:51 +00:00
Wenrui LI d3351f941c * adjust toolbar position. 2022-07-15 11:23:25 +08:00
王怡栋 7e682c99c2 Merge branch 'sprint/xuanxuan_110' into 'master'
Sprint/xuanxuan 110

See merge request easycorp/zentaopms!4563
2022-07-15 03:17:39 +00:00
王怡栋 e399056cee Merge branch 'master_xieqiyu_25365' into 'master'
* Fix bug#25365.

See merge request easycorp/zentaopms!4575
2022-07-15 03:16:28 +00:00
孙广明 ba6798198f Merge branch 'sprint216_zg_gaijin' into 'master'
* Remove productplan die

See merge request easycorp/zentaopms!4572
2022-07-15 03:15:09 +00:00
孙广明 aedab5c784 Merge branch 'sprint/216_mayue_bug#25358' into 'master'
* Fix bug #25358.

See merge request easycorp/zentaopms!4571
2022-07-15 03:14:57 +00:00
孙广明 bcf080f6b7 Merge branch 'liyuchun_fixbug' into 'master'
Liyuchun fixbug

See merge request easycorp/zentaopms!4570
2022-07-15 03:14:43 +00:00
李玉春 51b2242326 Liyuchun fixbug 2022-07-15 03:14:43 +00:00
孙广明 c468dd6c63 Merge branch 'zg_bugs' into 'master'
* Fix batchadd user ajax error

See merge request easycorp/zentaopms!4566
2022-07-15 03:13:52 +00:00
xieqiyu 311436573a * Fix bug#25365. 2022-07-15 11:12:04 +08:00
Wenrui LI 85342843ef * fix toolbar position for zentaoclient. 2022-07-15 11:10:34 +08:00
王怡栋 16bd36bb4e Merge branch 'bugfix/liwenrui/clientdownload' into 'master'
* fix oom on downloading client.

See merge request easycorp/zentaopms!4573
2022-07-15 03:09:38 +00:00
Wenrui LI bae78d6262 * fix oom on downloading client. 2022-07-15 11:05:38 +08:00