Commit Graph
53739 Commits
Author SHA1 Message Date
宋辰轩 f8f4c3363e * Add inside and outside query button. 2023-04-12 16:21:52 +08:00
qixinzhi b5aabadf8b * Change chart ajax to async. 2023-04-12 15:41:47 +08:00
王怡栋 54d50f0f02 Merge branch 'tsj_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!7382
2023-04-12 06:37:24 +00:00
tianshujie b22fb42a7a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-04-12 14:36:01 +08:00
刘刚 a69a90c0b3 Merge branch 'sprint/scx_apibug' into 'master'
* Fix testcase api bug and modify bug api data consistent.

See merge request easycorp/zentaopms!7383
2023-04-12 06:32:55 +00:00
王怡栋 5b8c3d09d9 Merge branch 'cyy_90779' into 'master'
Cyy 90779

See merge request easycorp/zentaopms!7381
2023-04-12 06:32:19 +00:00
caoyanyi 75ac945109 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_90779 2023-04-12 14:31:56 +08:00
caoyanyi 875aee00b1 * Modify doc priv style. 2023-04-12 14:31:37 +08:00
tianshujie 1f56b05cea * Fix bug #34076. 2023-04-12 14:13:15 +08:00
tianshujie 754928d906 * Fix bug #34066. 2023-04-12 14:09:41 +08:00
tianshujie f0d405aebf * Fix bug #34076. 2023-04-12 14:04:15 +08:00
宋辰轩 fe9b40629a * Fix testcase api bug and modify bug api data consistent. 2023-04-12 14:02:07 +08:00
王怡栋 bfe60c4926 Merge branch 'dev/gfl_task' into 'master'
* Adjust code for style in crumbs .

See merge request easycorp/zentaopms!7379
2023-04-12 05:52:16 +00:00
tianshujie ea8ee0faf5 * Fix bug #34076. 2023-04-12 13:42:08 +08:00
guofeilong e8d43fe0b0 * Code for task #90776 . 2023-04-12 13:37:48 +08:00
朱金勇 ef7d112212 * Fix create user. 2023-04-12 13:37:48 +08:00
朱金勇 5efdffbaf5 * Fix bug: no project in zt_usergroup. 2023-04-12 13:37:48 +08:00
朱金勇 b837d7f7cc * Fix setItem value. 2023-04-12 13:37:48 +08:00
朱金勇 43aee910e2 * Fix setItem to zt_config. 2023-04-12 13:37:48 +08:00
qixinzhi 9e0f6bdfcc * Fix sql for dameng database again. 2023-04-12 13:37:48 +08:00
朱金勇 399ada46a3 - Remove charset in sql. 2023-04-12 13:37:47 +08:00
qixinzhi 9896b4f6ac * Fix sql for dameng database. 2023-04-12 13:37:47 +08:00
tianshujie f489571e37 * Fix bug #34077. 2023-04-12 13:28:47 +08:00
tianshujie 1d0b30eee4 * Fix bug #34073. 2023-04-12 13:17:46 +08:00
朱金勇 14a560aeb1 * Fix create user. 2023-04-12 05:10:18 +00:00
朱金勇 e39b1143e3 * Fix bug: no project in zt_usergroup. 2023-04-12 05:07:37 +00:00
caoyanyi 1b9bbe097d * Code for bug #34060. 2023-04-12 11:23:05 +08:00
tianshujie 6ef8f58a4f * Fix bug #34066. 2023-04-12 11:13:11 +08:00
caoyanyi 493e4a8589 * Modify no data tips. 2023-04-12 11:10:01 +08:00
tianshujie 38b99d75ed * Code for task #89927. 2023-04-12 11:09:20 +08:00
tianshujie b9fce15bfd * Fixed tree highlighting on the left side of my space. 2023-04-12 10:59:09 +08:00
朱金勇 77b6e791d2 * Fix setItem value. 2023-04-12 02:57:43 +00:00
tianshujie b8fc22feee * Fix bug #34066. 2023-04-12 10:57:08 +08:00
朱金勇 4ece1e7e79 * Fix setItem to zt_config. 2023-04-12 02:51:28 +00:00
朱金勇 4263aeaa16 Merge branch 'fix_dameng_database' into 'master'
* Fix sql for dameng database again.

See merge request easycorp/zentaopms!7380
2023-04-12 02:42:20 +00:00
qixinzhi 14b853c060 * Fix sql for dameng database again. 2023-04-12 10:39:28 +08:00
caoyanyi 26b79296d4 * Code for bug #34013, task #90781. 2023-04-12 10:38:22 +08:00
朱金勇 884de3724c - Remove charset in sql. 2023-04-12 02:34:27 +00:00
朱金勇 c44b230517 Merge branch 'fix_dameng_database' into 'master'
* Fix sql for dameng database.

See merge request easycorp/zentaopms!7378
2023-04-12 02:34:26 +00:00
guofeilong 685b9489b2 * Adjust code for style in crumbs . 2023-04-12 10:34:14 +08:00
qixinzhi dfe860296a * Fix sql for dameng database. 2023-04-12 10:28:17 +08:00
caoyanyi b1a50734f2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_90779 2023-04-12 10:20:48 +08:00
caoyanyi bc4de003db * Code for bug #34052. 2023-04-12 10:20:11 +08:00
王怡栋 bda285d84b Merge branch 'cyy_90779' into 'master'
Cyy 90779

See merge request easycorp/zentaopms!7377
2023-04-12 02:17:49 +00:00
caoyanyi 021dbcc7eb Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_90779 2023-04-12 10:10:59 +08:00
caoyanyi c6cf7c6f35 * Code for task #90781. 2023-04-12 10:10:29 +08:00
朱金勇 738df10b4c * Fix install steps. 2023-04-12 02:03:23 +00:00
王怡栋 0fa6aff4f4 Merge branch 'dev/gfl_task' into 'master'
* Adjust code for fix icon-name error .

See merge request easycorp/zentaopms!7376
2023-04-12 02:00:46 +00:00
guofeilong 15392a7c8e * Adjust code for fix icon-name error . 2023-04-12 09:57:00 +08:00
王怡栋 78a9facdb3 Merge branch 'tsj_task' into 'master'
* Code f or dynamic

See merge request easycorp/zentaopms!7374
2023-04-12 01:55:43 +00:00