tianshujie
|
88226af4ee
|
Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug
|
2023-03-10 12:48:23 +08:00 |
|
tianshujie
|
b3f7c73aab
|
* Fix bug 32751.
|
2023-03-10 12:48:07 +08:00 |
|
caoyanyi
|
d83c6d7289
|
* Modify editor tips.
|
2023-03-10 12:21:02 +08:00 |
|
王怡栋
|
d8c221b156
|
Merge branch 'tsj_fixbug' into 'master'
Tsj fixbug
See merge request easycorp/zentaopms!7167
|
2023-03-10 03:17:29 +00:00 |
|
caoyanyi
|
faf078cb59
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug
|
2023-03-10 11:14:53 +08:00 |
|
caoyanyi
|
93b8983cb4
|
* Fix bug #32745.
|
2023-03-10 11:12:47 +08:00 |
|
tianshujie
|
140d93ae5d
|
Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug
|
2023-03-10 10:24:04 +08:00 |
|
tianshujie
|
a0a895be03
|
* Fix bug 32749.
|
2023-03-10 10:23:23 +08:00 |
|
caoyanyi
|
7d40afc496
|
* Fix bug 29433.
|
2023-03-10 10:16:07 +08:00 |
|
caoyanyi
|
723dec97eb
|
* Fix bug #32759.
|
2023-03-10 10:15:47 +08:00 |
|
王怡栋
|
a1f06b754c
|
Merge branch 'dev/gfl_theme_refactors' into 'master'
* Code for add important to text-primary .
See merge request easycorp/zentaopms!7169
|
2023-03-10 02:11:02 +00: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 |
|
王怡栋
|
53bec70c14
|
Merge branch 'dev/gfl_bug#32763' into 'master'
* Adjust code for bug #32763 .
See merge request easycorp/zentaopms!7168
|
2023-03-10 01:03:18 +00:00 |
|
guofeilong
|
071837a855
|
* Adjust code for bug #32763 .
|
2023-03-10 08:58:01 +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 |
|