Commit Graph
52278 Commits
Author SHA1 Message Date
caoyanyi 723dec97eb * Fix bug #32759. 2023-03-10 10:15:47 +08:00
caoyanyi ef62dca574 Merge branch 'dev/gfl_theme_refactors' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-10 10:04:06 +08:00
guofeilong 00571440fb * Code for add important to text-primary . 2023-03-10 09:59:57 +08:00
tianshujie 71db1e3c2e * Fix bug 31232. 2023-03-10 09:45:36 +08:00
tianshujie 5c84a44f0d * Fix bug 31232. 2023-03-10 09:42:07 +08:00
caoyanyi 3eb831772e * Optimize print kanban page checkbox style. 2023-03-10 08:48:14 +08:00
tianshujie 9ecacd2ad1 * Fix bug 32769. 2023-03-09 17:13:46 +08:00
tianshujie 665422c7ce * Fix bug #32761. 2023-03-09 16:50:22 +08:00
tianshujie 4c944d0ce4 * Fix bug #32766. 2023-03-09 16:42:47 +08:00
孙广明 806e3a4742 Merge branch 'sprint/295_liumengyi_86258' into 'master'
* Finish task #86281 86258.

See merge request easycorp/zentaopms!7166
2023-03-09 08:07:59 +00:00
王怡栋 bae7857455 Merge branch 'gitlab_optimize' into 'master'
Gitlab optimize

See merge request easycorp/zentaopms!7148
2023-03-09 08:05:10 +00:00
曾刚 2da060b171 Gitlab optimize 2023-03-09 08:05:10 +00:00
王怡栋 549c1a66be Merge branch 'tsj_fixbug' into 'master'
* Modify font size for custom language item.

See merge request easycorp/zentaopms!7164
2023-03-09 08:02:44 +00:00
王怡栋 3dc3f135bd Merge branch 'dev/gfl_langItem' into 'master'
* Adjust Code .

See merge request easycorp/zentaopms!7165
2023-03-09 08:02:30 +00:00
guofeilong ff02823804 * Adjust Code . 2023-03-09 15:50:20 +08:00
tianshujie 375c9d4f93 * Modify font size for custom language item. 2023-03-09 15:29:53 +08:00
王怡栋 d4b93bccf4 Merge branch 'tsj_fixbug' into 'master'
Tsj fixbug

See merge request easycorp/zentaopms!7162
2023-03-09 06:57:48 +00:00
tianshujie 6c4eb8b8c3 * Changed the default jump link of the personnel management block. 2023-03-09 14:56:17 +08:00
王怡栋 298bd4150b Merge branch 'dev/gfl_handleSaveFormDraft_refactors' into 'master'
* Adjust code .

See merge request easycorp/zentaopms!7163
2023-03-09 06:54:16 +00:00
guofeilong f28595bbac * Adjust code . 2023-03-09 14:51:19 +08:00
wangyidong cad1498860 * fix bug for module list. 2023-03-09 14:50:22 +08:00
wangyidong f99fba7c50 * fix bug. 2023-03-09 14:12:13 +08:00
tianshujie 17716e6ed9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-09 14:09:50 +08:00
wangyidong 7ed3f67bb5 * fix bug for php 5.6. 2023-03-09 14:01:58 +08:00
tianshujie ac3cf573b7 * Modify language items for execution common. 2023-03-09 14:00:31 +08:00
tianshujie defdba9e6f Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-09 13:25:21 +08:00
tianshujie 587ff87934 * Fix bug #29843. 2023-03-09 13:25:06 +08:00
tianshujie 1502801e71 * Fix bug #29497. 2023-03-09 13:19:40 +08:00
caoyanyi b6f0e594c6 * Fix bug #31434. 2023-03-09 13:12:25 +08:00
tianshujie 868a896ae4 * Fix bug #32746. 2023-03-09 11:33:03 +08:00
wangyidong 4549e19e5d * adjust for editor. 2023-03-09 11:30:39 +08:00
tianshujie 7a77fce8e4 * Fix bug #29923. 2023-03-09 11:05:26 +08:00
wangyidong 99f54fc955 * fix bug #32738. 2023-03-09 10:54:41 +08:00
tianshujie 13ce2eac8d * Fix bug #31975. 2023-03-09 10:32:05 +08:00
tianshujie b924688fe8 * Fix bug #32711. 2023-03-09 10:20:20 +08:00
孙广明 7e917498bf Merge branch 'lyk_fixbug' into 'master'
* Fix undefined variable.

See merge request easycorp/zentaopms!7160
2023-03-09 01:52:51 +00:00
liuyongkai f69af0f62c * Fix undefined variable. 2023-03-09 09:50:51 +08:00
liuyongkai a71560aa80 * Fix undefined variable. 2023-03-09 09:47:01 +08:00
王怡栋 eb72039581 Merge branch 'cyy_bug' into 'master'
* Fix bug #28114.

See merge request easycorp/zentaopms!7159
2023-03-09 01:46:26 +00:00
caoyanyi 3c40d95b62 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_bug 2023-03-09 09:44:55 +08:00
liuyongkai 7e8b3cceb4 * Fix undefined variable. 2023-03-09 09:42:25 +08:00
孙广明 100b668d66 Merge branch 'wxp_bug86289' into 'master'
Fix bug #86289.

See merge request easycorp/zentaopms!7149
2023-03-09 01:33:34 +00:00
孙广明 a46387b590 Merge branch 'sprint/295_liumengyi_85648' into 'master'
* Finish task #85648.

See merge request easycorp/zentaopms!7155
2023-03-09 01:33:19 +00:00
caoyanyi eeafdf7671 * Revmoe console code. 2023-03-08 17:18:26 +08:00
caoyanyi 7e5fc5ade4 * Code for bug #28726. 2023-03-08 17:11:44 +08:00
caoyanyi e409352d47 * Code for bug #28726. 2023-03-08 17:09:27 +08:00
caoyanyi beaa4768b1 * Fix bug #28726. 2023-03-08 17:06:31 +08:00
caoyanyi 1364c7923b * Fix bug #28114. 2023-03-08 16:41:51 +08:00
王怡栋 4b10b5abeb Merge branch 'sprint/tsj_case' into 'master'
* Modify menu tree.

See merge request easycorp/zentaopms!7157
2023-03-08 08:26:46 +00:00
王怡栋 46601ba53e Merge branch 'dev/gfl_handleSaveFormDraft_refactors' into 'master'
* Adjust code for handleSaveFormDraft .

See merge request easycorp/zentaopms!7158
2023-03-08 08:26:25 +00:00