Commit Graph
52735 Commits
Author SHA1 Message Date
tianshujie 00939ba9a7 * Change the pop-up location of the search box. 2023-03-23 08:52:46 +08:00
tianshujie e2cae41434 * Remove class for doc list. 2023-03-23 08:38:45 +08:00
caoyanyi e2526cd379 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-23 08:37:45 +08:00
王怡栋 0afcc911e3 Merge branch 'ticket_474' into 'master'
* Fix ticket_474 for product changed when edit requirement on site.

See merge request easycorp/zentaopms!7262
2023-03-22 09:31:15 +00:00
tianshujie 73fc9ad0e3 * Add test case for doc module. 2023-03-22 17:20:14 +08:00
tianshujie c5d7dc15ee * Modify array key for print doc tree. 2023-03-22 16:43:43 +08:00
tianshujie f7936b7f74 * Modify title style for doc list. 2023-03-22 16:37:45 +08:00
tianshujie 04dc2c83c9 * Modify title color for doc list. 2023-03-22 16:36:11 +08:00
tianshujie 1566303cff Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-22 16:36:07 +08:00
tianshujie c23bfa63ea * Modify test case for doc module. 2023-03-22 16:35:47 +08:00
caoyanyi c5c29160c7 * Add edit module modal. 2023-03-22 15:51:10 +08:00
guofeilong b6c859629a * Adjust code . 2023-03-22 15:29:06 +08:00
tianshujie 703efde24e Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-22 14:57:46 +08:00
tianshujie fbcca8e708 * Code for finish task #87405. 2023-03-22 14:57:34 +08:00
guofeilong 0de87f1c77 * Adjust code . 2023-03-22 14:43:20 +08:00
tianshujie c7cd5080e8 * Code for finish task #87405. 2023-03-22 14:38:08 +08:00
liuhong 1e195ef0a2 * Fix ticket_474 for product changed when edit requirement on site. 2023-03-22 06:26:29 +00:00
tianshujie 34f4a61fd3 * Code for finish task #87405. 2023-03-22 14:18:52 +08:00
tianshujie a7a1ff52bf * Code for finish task #87405. 2023-03-22 13:57:36 +08:00
tianshujie dbb17e187a * Code for finish task #87405. 2023-03-22 13:51:46 +08:00
guofeilong d761a31c32 * Adjust code . 2023-03-22 13:28:52 +08:00
guofeilong dfa08ce91e * Adjust code . 2023-03-22 13:13:58 +08:00
caoyanyi 8451e4b13e * Add locate params. 2023-03-22 11:25:04 +08:00
guofeilong db55553f00 * Adjust code . 2023-03-22 11:08:18 +08:00
tianshujie 54c532bdda Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-22 10:48:25 +08:00
tianshujie cdd6b554d4 * Change the link type document to text type. 2023-03-22 10:47:42 +08:00
caoyanyi a8ae5f0813 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-22 10:44:35 +08:00
caoyanyi f6cad26977 * Add locate. 2023-03-22 10:44:26 +08:00
guofeilong 83ba0f4755 * Adjust code . 2023-03-22 10:20:11 +08:00
guofeilong c4d670b812 * Adjust code . 2023-03-22 10:11:27 +08:00
tianshujie f48c9e1b97 * Code for finish task #87406. 2023-03-22 10:10:53 +08:00
caoyanyi 63a02516bc * Add priv check for module tree. 2023-03-22 10:03:24 +08:00
guofeilong 4e49095d73 * Adjust code . 2023-03-22 09:54:40 +08:00
王怡栋 a4b69c17bc Merge branch 'dev/bug_#33115' into 'master'
* Adjust code .

See merge request easycorp/zentaopms!7259
2023-03-22 01:17:23 +00:00
guofeilong 1a0c7fae19 * Adjust code . 2023-03-22 09:08:14 +08:00
guofeilong e276eeb883 * Adjust code / 2023-03-22 09:01:39 +08:00
guofeilong b5d3b6468a * Code for task#99371 2023-03-21 17:16:57 +08:00
caoyanyi c7cb7e96c2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-21 17:00:05 +08:00
tianshujie a99b3fea8c * Modify module locate. 2023-03-21 16:57:46 +08:00
tianshujie 61a44bc7f4 * Code for finish task #87406. 2023-03-21 16:24:34 +08:00
tianshujie 4297764947 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-21 16:02:27 +08:00
tianshujie 8944424005 * Code for finish task #87405. 2023-03-21 16:01:35 +08:00
wangyidong 6ecac70d85 * fix bug #33172. zentaopms_18.3 2023-03-21 15:44:47 +08:00
guofeilong c19937a56d * Adjust code . 2023-03-21 15:04:01 +08:00
caoyanyi 0362953766 * Modify annex lib locate. 2023-03-21 14:41:15 +08:00
guofeilong acc21a3a4f * Adjust code . 2023-03-21 14:36:32 +08:00
hufangzhou 8660cc9663 * Remove the unsed code. 2023-03-21 14:18:26 +08:00
孙广明 da041f4b6c Merge branch 'sprint/hufangzhou_bug_closeBtn' into 'master'
* Fix bug for double close button.

See merge request easycorp/zentaopms!7258
2023-03-21 06:14:00 +00:00
hufangzhou 94d2b4de67 * Fix bug for double close button. 2023-03-21 14:12:50 +08:00
caoyanyi f01144ae0a * Modify api lib param. 2023-03-21 14:07:16 +08:00