Commit Graph
474 Commits
Author SHA1 Message Date
tianshujie beffe82709 * Code for task #43816. 2023-04-14 16:11:06 +08:00
tianshujie 2c1fb2826b * Code for story #43815. 2023-04-14 15:31:41 +08:00
tianshujie 263b5d650a * Code for task #90782. 2023-04-12 15:34:46 +08:00
tianshujie 5444be8677 * Code for task #90782. 2023-04-12 15:08:32 +08:00
tianshujie 2a71bcf16b * Code for task #90782. 2023-04-12 14:43:47 +08:00
tianshujie c7c7e55d0c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_task 2023-04-12 14:32:47 +08:00
caoyanyi 875aee00b1 * Modify doc priv style. 2023-04-12 14:31:37 +08:00
tianshujie 9a4c5d2ac8 * Code for task #90782. 2023-04-12 13:15:55 +08:00
caoyanyi c6cf7c6f35 * Code for task #90781. 2023-04-12 10:10:29 +08:00
caoyanyi 4e888b8f3d Merge branch 'tsj_task' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_90779 2023-04-12 09:00:04 +08:00
tianshujie 1d2a069f12 * Rename block. 2023-04-12 08:44:40 +08:00
caoyanyi f194177369 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_90779 2023-04-11 17:13:05 +08:00
caoyanyi 185550fcf4 * Code for task #90779. 2023-04-11 16:11:55 +08:00
tianshujie 1f026f246a * Code for task #90780. 2023-04-11 15:38:44 +08:00
tianshujie 95998c1f2a * Remove useless code. 2023-04-11 09:19:11 +08:00
tianshujie 66d0694599 * Code for task #90778. 2023-04-10 17:15:26 +08:00
朱金勇 2b9e5f4d95 Fix bug#33806. 2023-04-07 01:21:31 +00:00
朱金勇 7f9d638d28 * Fix sql for dmdb. 2023-04-05 14:18:24 +00:00
liumengyi 2fd93bcb08 * Fix bug #32495. 2023-02-28 08:14:08 +00:00
Yagami 290487a68a * Fix bug #32263. 2023-02-23 10:19:19 +08:00
tianshujie d6266bc607 * Code for finish task #85047. 2023-02-20 14:47:10 +08:00
tianshujie 484f34396c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-16 08:59:00 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
tianshujie 4f65445e8e * Code for finish task #84576. 2023-02-15 16:31:18 +08:00
liumengyi ba1f64daf9 * Fix bug #31808. 2023-01-30 08:29:51 +08:00
wangyidong ccec9bcc16 Merge branch 'zentaopms279' 2023-01-03 08:39:33 +08:00
wangyidong 56c5cac759 * code for task #81410. 2022-12-28 14:32:22 +08:00
田淑杰 7aff4d599e * Fixed positioning issues of guide block. 2022-12-21 10:17:32 +08:00
田淑杰 cbd8fa5706 * Refactor. 2022-12-20 14:06:30 +08:00
田淑杰 86a21acfb0 * Finish task #79627. 2022-12-20 11:29:13 +08:00
caoyanyi ae05ef1601 * Modify page error. 2022-12-20 09:01:28 +08:00
tianshujie 992dacbe2c * Finish task #79625. 2022-12-13 16:27:15 +08:00
tianshujie 234d212b88 * Finish task #79630. 2022-12-13 15:46:22 +08:00
wangyidong 68973d2a19 * fix bug #30753. 2022-12-09 13:20:40 +08:00
wangyuting cf769403ea * Fix bug #30132. 2022-11-24 06:17:14 +00:00
wangyuting 32589ea897 * Fix bug #30132. 2022-11-24 01:14:35 +00:00
wangyidong d354c68adf * adjust for task #74928. 2022-11-07 15:19:58 +08:00
wangyuting2 0cefde5d28 * Optimize code for review code. 2022-11-04 06:35:21 +00:00
wangyuting2 b7ebe4ee2b * Optimize code. 2022-10-28 08:05:21 +00:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
wangyidong 6854d16d4e * code for task #71672. 2022-10-24 14:44:20 +08:00
lanzongjun aa6546a2ee resolve conflict 2022-10-18 09:26:14 +08:00
Lufei 261c3a0217 * Fix GH-92: Uncaught TypeError: Unsupported operand types: array + null. 2022-10-13 10:36:39 +08:00
zhouxin c25d5827dc * Fix bugs. 2022-10-11 11:32:45 +08:00
王怡栋 b7ae9696e3 Merge branch 'zentaopms_239_task#71588' into 'zentaopms_239'
* Finish task #71588,#71589,#71590,#71591.

See merge request easycorp/zentaopms!5714
2022-10-10 09:24:04 +00:00
daitingting 1e7ad8f0f2 * Finish task #71588,#71589,#71590,#71591. 2022-10-10 08:22:50 +00:00
wangyuting2 aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
zhouxin 0cfb69ac5b * Finish task #71836. 2022-10-10 15:23:22 +08:00
王怡栋 2d6460f443 Merge branch 'zentaopms_239_task#71654' into 'zentaopms_239'
* Finish task #71654.

See merge request easycorp/zentaopms!5679
2022-10-09 05:12:30 +00:00
wangyuting2 40634e6d14 * Finish task #71654. 2022-10-09 03:04:41 +00:00