Commit Graph
570 Commits
Author SHA1 Message Date
tanghucheng 3741c9b6fa Merge branch '18.x' into zentaoipd 2023-07-03 13:36:29 +08:00
hufangzhou 190a20061b * Finish task #95094. 2023-06-25 13:11:33 +08:00
songchenxuan db02eb695d * Fix bug #34964 again. 2023-05-25 15:13:41 +08:00
songchenxuan 756bc82f6e * Fix bug #35369. 2023-05-22 15:14:17 +08:00
Yagami 434aed0830 Merge branch '18.4' into zentaoipd 2023-05-19 14:47:42 +08:00
songchenxuan b0f2917d6e * Fix bug #34964. 2023-05-17 16:35:13 +08:00
tanghucheng 090852083e * Add showStage for stage list. 2023-05-15 14:53:04 +00:00
Yagami 8ee31b76c5 * Fix ipd project module-menu bug. 2023-05-09 15:04:04 +08:00
liumengyi 2397c644f5 * Finish task #91011. 2023-04-11 15:30:05 +08:00
liumengyi 3326617ffd * Finish task #85646. 2023-03-06 03:45:49 +00:00
Yagami f95691948a Merge branch 'zentaopms_294' 2023-03-06 08:37:11 +08:00
liumengyi 6529c78e32 * Finish task #85646. 2023-03-01 02:52:05 +00:00
liumengyi e96d7b0e00 * Fix bug #32455. 2023-02-28 06:25:07 +00:00
hufangzhou 75b5b2562c * Finish task #84583. 2023-02-18 16:04:53 +00:00
liumengyi b9ae54ede7 * Fix bug of task #84592. 2023-02-15 08:58:18 +00:00
wangyidong 1f1e8b0836 * fix bug #31519. 2023-02-03 08:48:18 +08:00
wangyidong 0a3df6b5ec * fix bug #30254. 2022-12-23 10:21:12 +08:00
wangyidong 13e8ae5728 * adjust code. 2022-12-23 08:11:36 +08:00
wangyidong 0369dba360 * adjust for execution field width for project build page. 2022-12-22 19:24:49 +08:00
lanzongjun 7e91261485 * Fix Bug #30943 2022-12-19 11:15:51 +08:00
孙广明 cfd9e136bc * Fix bug #30878. 2022-12-15 10:42:59 +08:00
Yagami fb95d28f5a * Fix bug #30569. 2022-12-08 14:17:43 +08:00
孙广明 1bca37102e * Fix bug #30554. 2022-12-06 13:40:07 +08:00
Yagami b181c11e37 * Fix bug #30476. 2022-12-02 15:00:12 +08:00
Yagami 32424d7072 * Finish task #77800. 2022-12-02 10:39:49 +08:00
Yagami 02171e9a5d * Finish task #77800. 2022-12-02 08:34:49 +08:00
Yagami cfc70e8176 * Code for task #77800. 2022-12-01 15:15:07 +08:00
Yagami 7a843ece37 * Code for task #77800. 2022-12-01 13:52:46 +08:00
Yagami 6263ee7a5c * Code for task #77801. 2022-12-01 10:34:23 +08:00
Yagami 76b3882e55 * Fix project manage products bug. 2022-11-25 14:10:07 +08:00
Yagami eda6dc67ef Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-25 13:10:25 +08:00
Yagami 4f16057c77 * Code for manage products. 2022-11-25 13:10:10 +08:00
王怡栋 e90baa91f9 Merge branch 'znetaopms_263_bug#30265' into 'master'
* Fix bug #30265.

See merge request easycorp/zentaopms!6381
2022-11-25 05:02:58 +00:00
wangyuting a4cc3fd11a * Fix bug #30265. 2022-11-25 03:25:52 +00:00
Yagami 84dce924b8 * Code for task #30261. 2022-11-25 11:07:45 +08:00
Yagami 7fbcb9b13e * Finish task #30261. 2022-11-25 10:50:22 +08:00
Yagami 25e5b27220 * Finish task #77365. 2022-11-25 08:39:24 +08:00
lanzongjun eac16b903f * Fix Bug #30156 2022-11-23 16:54:49 +08:00
lanzongjun 0b2bb1a273 * Fix bug #29442#29695 2022-11-18 15:18:57 +08:00
lanzongjun a105dc7845 * Fix task #76459 2022-11-18 11:17:09 +08:00
王怡栋 468ae934f4 Merge branch 'master_xieqiyu_code' into 'master'
* Fallback code for bug#29896.

See merge request easycorp/zentaopms!6207
2022-11-17 02:00:50 +00:00
王怡栋 6425496407 Merge branch 'zentaopms261_wyd' 2022-11-17 09:55:27 +08:00
xieqiyu 679f2641aa * Fallback code for bug#29896. 2022-11-16 17:19:43 +08:00
xieqiyu 2a7493ac78 * Fix bug#29896. 2022-11-16 15:48:18 +08:00
王怡栋 5db92a2dad * fix bug #29648. 2022-11-16 13:51:46 +08:00
lanzongjun bbee9eedca * finish task #76394 2022-11-16 10:26:10 +08:00
Yagami a97b9ea972 * Finish task #75355. 2022-11-10 15:25:40 +08:00
wangyidong 8ee88df5de Merge branch 'zentaopms_252' 2022-11-08 09:23:23 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
daitingting 1eaf98a48a * Fix for #73988, #74180. 2022-11-03 07:58:17 +00:00