Commit Graph
52139 Commits
Author SHA1 Message Date
tianshujie cd7d8f4ff6 * Modify language item for product common. 2023-03-06 15:27:45 +08:00
tianshujie 42a77e1f7c * Modify language item for execution page. 2023-03-06 14:57:38 +08:00
caoyanyi fb0c24ee9e * Modify project to variable. 2023-03-06 14:46:56 +08:00
tianshujie 74da0c9b72 Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-06 14:02:30 +08:00
tianshujie e1b6e852af * Unified filter label format. 2023-03-06 14:02:09 +08:00
caoyanyi 1b31d7a3b4 Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-06 13:36:56 +08:00
caoyanyi 10ed1c9cb1 * Get the three-level menu under the drop menu. 2023-03-06 13:34:12 +08:00
wangyidong f42686f080 Merge branch 'zentaopms_289' 2023-03-06 11:27:55 +08:00
王怡栋 3438722a8c Merge branch 'master' into 'zentaopms_289'
# Conflicts:
#   db/update18.2.sql
2023-03-06 03:26:34 +00:00
tianshujie 7c702fc97c * Modify the logic of the constructor subtree. 2023-03-06 10:45:56 +08:00
tianshujie 69b58d1646 * Add logical judgment. 2023-03-06 10:45:39 +08:00
tianshujie 462e737432 * Fixed the issue of initializing more drop-down language items. 2023-03-06 10:45:12 +08:00
tianshujie f996230e1f * Added Kanban Filter tag language entry. 2023-03-06 10:43:43 +08:00
caoyanyi 9ffce9d8a7 * Modify project lang to variable. 2023-03-06 10:19:48 +08:00
Yagami f95691948a Merge branch 'zentaopms_294' 2023-03-06 08:37:11 +08:00
tianshujie f9a666909c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-06 08:30:49 +08:00
wangyidong 3aa7bc5a1b * fix for get class name by path. 2023-03-03 17:34:05 +08:00
tianshujie 4d400723ce * Modify more select display method. 2023-03-03 15:54:33 +08:00
Yagami eebc016b4a * Remove unused code. 2023-03-03 15:18:41 +08:00
wangxuepeng f5699a3420 * Fix bug #85660. 2023-03-03 06:58:17 +00:00
wangxuepeng b611790d8c * Fix bug #85660. 2023-03-03 06:52:39 +00:00
caoyanyi a6e235f0d6 Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-03 14:47:34 +08:00
caoyanyi f2c4d28c5e * Modify kanban feature bar language. 2023-03-03 14:46:56 +08:00
wangyidong 1064bef3a7 * adjust code for editor. 2023-03-03 14:19:31 +08:00
caoyanyi a42b9ed4c0 * Hide execution route to lite vision. 2023-03-03 13:40:13 +08:00
tianshujie 3387bf56e3 * Code for finish task 84527. 2023-03-03 13:03:53 +08:00
tianshujie e9d3886dac Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-03 13:03:16 +08:00
tianshujie c6cd9a6077 * Code for finish task 84527. 2023-03-03 13:01:50 +08:00
caoyanyi 4ef52ab414 Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-03 11:29:32 +08:00
caoyanyi 25fafa5a86 * Modify lite vision language. 2023-03-03 11:29:15 +08:00
liumengyi 7851944450 * Finish task #85640. 2023-03-03 03:19:04 +00:00
wangyidong 7f2f970bd5 * delete dev-editor priv. 2023-03-03 10:28:19 +08:00
caoyanyi 935f0a764c * Modify page error. 2023-03-03 10:24:00 +08:00
guofeilong 079d6a1821 * Fix bug in func filterChildren . 2023-03-03 10:18:48 +08:00
孙广明 9d3a52f0af Merge branch 'lyk_fixbug' into 'master'
* Fix bug #32374.

See merge request easycorp/zentaopms!7138
zentaopms_18.2
2023-03-03 02:15:41 +00:00
liuyongkai 10478231d8 * Fix bug #32374. 2023-03-03 10:11:06 +08:00
tianshujie 8dc3d3b291 * Code for finish task 84525. 2023-03-03 10:03:32 +08:00
王怡栋 b80d37fcfb Merge branch 'daitingting_bug_postparentisempty' into 'master'
* Fix bug for the post parent is empty.

See merge request easycorp/zentaopms!7136
2023-03-03 02:03:05 +00:00
孙广明 dc2e0858af Merge branch 'lyk_fixbug' into 'master'
* Fix bug #32374.

See merge request easycorp/zentaopms!7137
2023-03-03 01:59:31 +00:00
Yagami 46661419f6 * Code for stage path. 2023-03-03 09:59:15 +08:00
liuyongkai c2bfa8c8ab * Fix bug #32374. 2023-03-03 09:56:31 +08:00
daitingting 6880b7428b * Fix bug for the post parent is empty. 2023-03-03 01:53:23 +00:00
tianshujie 5a2ffd541d * Code for task 84525. 2023-03-03 09:07:21 +08:00
caoyanyi 86c6968243 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-03 08:48:41 +08:00
孙广明 6c22d36b40 Merge branch 'lyk_fixbug_32374' into 'master'
* Fix bug #32374.

See merge request easycorp/zentaopms!7135
2023-03-02 12:19:37 +00:00
Yagami 1ce1a24f1d * Fix execution-stage list bug. 2023-03-02 17:40:47 +08:00
liuyongkai 846129297d * Fix bug #32374. 2023-03-02 17:32:47 +08:00
liuyongkai bc54729fff * Fix bug #32374. 2023-03-02 17:27:44 +08:00
王怡栋 179d3998f2 Merge branch 'dev/gfl_views_refacotrs_admin' into 'master'
* Adjust code in admin.

See merge request easycorp/zentaopms!7133
2023-03-02 09:08:27 +00:00
王怡栋 2534dd97e4 Merge branch 'admin_bug_32593' into 'master'
Admin bug 32593

See merge request easycorp/zentaopms!7134
2023-03-02 09:08:12 +00:00