Commit Graph
830 Commits
Author SHA1 Message Date
wangyidong 657b505dcd * Fix bug #37568. 2023-08-25 14:28:29 +08:00
liumengyi b0d27c83ec * Fix bug of get dynamic count. 2023-08-11 15:01:23 +08:00
liumengyi ecb41011a3 * Change page to limit in actions query. 2023-08-08 13:58:04 +08:00
songchenxuan 752365514b * Add a new param for story-getExecutionStories. 2023-08-03 14:31:56 +08:00
tanghucheng 3741c9b6fa Merge branch '18.x' into zentaoipd 2023-07-03 13:36:29 +08:00
songchenxuan af1376a1b6 * Fix bug #35984. 2023-06-20 15:09:24 +08:00
hufangzhou afe93cf022 * Fix bug #35982, #35932. 2023-06-19 13:17:13 +08:00
zhujinyong 2f9ca0e6d6 * Performance for product list. 2023-06-12 16:30:09 +08:00
tanghucheng 5f8a10c448 * Fix bug #35700. 2023-06-08 05:21:22 +00:00
Lufei 5e7721deb6 * Optimize product all page. 2023-06-01 10:15:54 +08:00
Yagami 57b4701355 * Fix bug #34995. 2023-05-14 16:32:41 +08:00
Yagami 503593149c * Code for task #92300. 2023-05-08 18:30:34 +08:00
Yagami b94a69a0b8 * Finish task #92304. 2023-05-06 16:21:28 +08:00
Yagami bc44a293ef * Add PLM to judgement. 2023-05-05 10:24:12 +08:00
tanghucheng c8a626480d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-21 13:49:46 +08:00
tanghucheng 0a944b7e11 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-14 16:38:09 +08:00
liumengyi 648dc288ca Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-14 15:15:03 +08:00
tianshujie 0c935c7eea * Modify jump link. 2023-04-13 15:45:51 +08:00
liumengyi f197999e42 - Delete the privilege of product-build. 2023-04-13 14:28:37 +08:00
tanghucheng 0af9b86b70 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-13 10:23:19 +08:00
Yagami 2dbdb3d2ff * Code for requirement label. 2023-04-12 13:18:05 +08:00
tianshujie c99fed9fe9 * Code for task #90792. 2023-04-10 14:31:21 +08:00
Yagami 00cec9c960 * Fix bug #33791. 2023-04-10 10:41:06 +08:00
Yagami a256b8503d * Finish task #89871. 2023-04-07 11:08:37 +08:00
朱金勇 22f9f1d087 Merge branch 'db' 2023-04-05 14:30:11 +00:00
朱金勇 7f9d638d28 * Fix sql for dmdb. 2023-04-05 14:18:24 +00:00
Yagami 93b14b8f1e * Add activate product. 2023-03-31 08:59:29 +08:00
tianshujie 665422c7ce * Fix bug #32761. 2023-03-09 16:50:22 +08:00
caoyanyi 1364c7923b * Fix bug #28114. 2023-03-08 16:41:51 +08:00
Yagami f95691948a Merge branch 'zentaopms_294' 2023-03-06 08:37:11 +08:00
liumengyi 7851944450 * Finish task #85640. 2023-03-03 03:19:04 +00:00
Yagami fda9efd09c * Remove request stages in bug batch-create page. 2023-03-02 16:05:35 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
wangyidong b4598b8738 * fix bug #31725. 2023-01-29 17:18:40 +08:00
mayue a074537835 * Resolve feedback #1941. 2023-01-10 13:07:38 +08:00
zenggang ee78bb255b * Resolve feedback#1692 2022-12-12 02:53:26 +00:00
孙广明 8fa7675188 Merge branch 'master' into 'master_xieqiyu_78690'
# Conflicts:
#   module/productplan/model.php
2022-12-09 08:58:14 +00:00
xieqiyu 7405efe5c7 * Code for task#78690. 2022-12-09 15:39:55 +08:00
lanzongjun 980b2998ad * Fix Bug #78688 2022-12-09 13:58:10 +08:00
lanzongjun d6f9976aae * Finish Bug #30480 2022-12-08 11:06:04 +08:00
lanzongjun 5f3444278b * Finish Task #78688 2022-12-07 14:22:27 +08:00
Yagami ac2a798661 * Finish task #78689. 2022-12-05 14:16:02 +08:00
lanzongjun a835220fe1 resolve conflict master 2022-12-02 10:28:31 +08:00
liuyongkai 80bd2c745c * Resolve feedback #1461. 2022-12-01 14:25:21 +08:00
lanzongjun 315dc16980 master branch only relation master plan 2022-12-01 14:04:26 +08:00
lanzongjun 2a75393953 * Finish Task #77806 2022-11-30 15:57:08 +08:00
lanzongjun 00877a531d code meeting fix 2022-11-30 09:05:23 +08:00
lanzongjun 9077e9b4a3 * Fix Task #77798 2022-11-29 14:35:07 +08:00
zenggang 9b63267e10 * Fix bug#30309 2022-11-29 03:01:45 +00:00
孙广明 6356683483 Merge branch 'master' into 256 2022-11-28 13:36:48 +08:00