Commit Graph
36241 Commits
Author SHA1 Message Date
李玉春 169fa0c19e Merge branch 'mayue_fix_bug#13804' into 'master'
* Fix bug #13804.

See merge request easycorp/zentaopms!2520
2022-03-24 09:21:04 +00:00
朱金勇 b2b30ea4bc Merge branch 'sprint/sunhao/optimize_dropmenu' into 'master'
* optimize UI for dropmenu.

See merge request easycorp/zentaopms!2519
2022-03-24 09:20:45 +00:00
mayue fb1821c735 * Optimize code. 2022-03-24 17:19:20 +08:00
李玉春 eef0da7fd0 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2517
2022-03-24 09:16:36 +00:00
孙广明 e41cd55b4c Merge branch 'sprint/autoTest_liumengyi_product' 2022-03-24 17:08:57 +08:00
Hao Sun f6b6fdd023 * add "onSearchComplete" event to search-list in dropmenu. 2022-03-24 17:06:42 +08:00
mayue 7d2b061a75 * Fix bug #13804. 2022-03-24 17:06:28 +08:00
孙广明 133c7f7b04 Merge branch 'master' into 'sprint/autoTest_liumengyi_product'
# Conflicts:
#   module/product/model.php
2022-03-24 09:04:36 +00:00
liumengyi 333cc3fbb2 * Modify code. 2022-03-24 17:02:26 +08:00
Hao Sun 8d043cc467 * update themes. 2022-03-24 17:01:49 +08:00
liumengyi ac5c19df57 * Add auto test of product. 2022-03-24 17:01:42 +08:00
Hao Sun 539c797bd5 * bug #14569, optimize style for dropmenu. 2022-03-24 17:01:41 +08:00
tianshujie f5bc1f99a2 * Modify the code. 2022-03-24 16:53:54 +08:00
王怡栋 44d14b8c6a Merge branch 'sprint/lite6_lwr_fix_table_footer' into 'master'
* set z-index to table-footer, fix bug #21053.

See merge request easycorp/zentaopms!2509
2022-03-24 08:39:42 +00:00
王怡栋 2b3cb7a687 Merge branch 'sprint/fixbug_hufangzhou_16183' into 'master'
* Fix bug #16183.

See merge request easycorp/zentaopms!2510
2022-03-24 08:39:23 +00:00
李玉春 009aaed504 Merge branch 'devops24_zenggang' into 'master'
Finish task#51184,51176,51141

See merge request easycorp/zentaopms!2508
2022-03-24 07:45:13 +00:00
李玉春 43d834e01d Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!2513
2022-03-24 07:44:23 +00:00
朱金勇 b59ec4b785 Merge branch 'sprint/scx_branch_codeformat' into 'master'
*AjaxGetBranches function code format.

See merge request easycorp/zentaopms!2515
2022-03-24 07:41:58 +00:00
songchenxuan 7a9afd7052 *AjaxGetBranches function code format. 2022-03-24 15:39:35 +08:00
zhouxudong 3a3660764c * Fix bug. 2022-03-24 15:15:12 +08:00
zhouxudong c6f8ca1526 * Fix bug. 2022-03-24 14:57:46 +08:00
李玉春 ca3b8a3927 Merge branch 'sprint/sunhao/optimize_kanban' into 'master'
* optimize UI for kanban and fix drop rules not work.

See merge request easycorp/zentaopms!2511
2022-03-24 06:44:07 +00:00
tianshujie c9c1573a2d * Fix bug #20523. 2022-03-24 14:40:38 +08:00
Hao Sun 834533a5c5 * update kanban lib and fix sortable option not work as expected. 2022-03-24 14:38:40 +08:00
李玉春 defd9faa28 Merge branch 'sunhuawei_fixbug_13935' into 'master'
*Fix bug#13935

See merge request easycorp/zentaopms!2505
2022-03-24 06:35:13 +00:00
Hao Sun 5c17d72ca9 * fix kanban drop rules not work. 2022-03-24 14:34:17 +08:00
孙华伟 cf0ba445e9 *Fix bug#13935 2022-03-24 14:30:05 +08:00
hufangzhou f75e310eb9 * Fix bug #16183. 2022-03-24 14:29:35 +08:00
Hao Sun 0a7c559478 * optimize UI for kanban. 2022-03-24 14:27:03 +08:00
Wenrui LI b6cc4de226 * set z-index to table-footer, fix bug #21053. 2022-03-24 14:25:57 +08:00
孙广明 ea4da61f53 Merge branch 'autotest_ly' into 'master'
add story stage data

See merge request easycorp/zentaopms!2506
2022-03-24 06:21:51 +00:00
zenggang dd5cab2011 * Finish task#51184,51176,51141 2022-03-24 06:21:10 +00:00
liyang 8fad14a267 add story stage data 2022-03-24 14:19:56 +08:00
孙广明 4889b79a59 Merge branch 'sunhuawei_fixbug_20863' into 'master'
*Fix bug #20863.

See merge request easycorp/zentaopms!2502
2022-03-24 06:10:01 +00:00
孙广明 8595ff996b Merge branch 'autotest_ly' into 'master'
update storyspec data

See merge request easycorp/zentaopms!2504
2022-03-24 06:09:35 +00:00
孙华伟 a6fa85f9dd *Fix bug#13935 2022-03-24 14:06:15 +08:00
Hao Sun 099d927657 * fix UI for product kanban. 2022-03-24 13:31:05 +08:00
liyang 54a30d9868 update storyspec data 2022-03-24 13:14:01 +08:00
王怡栋 f292ad9465 Merge branch 'sprint/master_lanzongjun_fixbug_add_params' into 'master'
* add params

See merge request easycorp/zentaopms!2503
2022-03-24 04:03:18 +00:00
Zongjun Lan 59d40ac278 * add params 2022-03-24 12:02:57 +08:00
Zongjun Lan f26146493c * add params 2022-03-24 11:33:41 +08:00
孙华伟 cbbc6be340 *Optimize the code. 2022-03-24 11:29:55 +08:00
孙华伟 4282c9ebc2 *Fix bug #20863. 2022-03-24 11:11:02 +08:00
tianshujie 69bac81a9d * Fix bug #17395. 2022-03-24 11:01:00 +08:00
孙广明 043e9ac9ea Merge branch 'autotest_ly' into 'master'
add storyreview data

See merge request easycorp/zentaopms!2500
2022-03-24 02:59:25 +00:00
liyang 953ec89f2d add storyreview data 2022-03-24 10:56:43 +08:00
李玉春 939d7664ff Merge branch 'sprint/sunhao/optimize_kanban' into 'master'
* fix issue for drag-and-drop cards in kanban.

See merge request easycorp/zentaopms!2497
2022-03-24 02:41:19 +00:00
李玉春 c458dab32a Merge branch 'sprint/tianshujie_bug_19072' into 'master'
Sprint/tianshujie bug 19072

See merge request easycorp/zentaopms!2496
2022-03-24 02:40:57 +00:00
tianshujie 9178a6e3b3 * Modify variable name. 2022-03-24 10:27:42 +08:00
Hao Sun fcbafd57f0 * fix issue for drag-and-drop cards in kanban. 2022-03-24 09:46:24 +08:00