 wangyuting2
|
55c4c1233b
|
* Fix noDesc lang undefined.
|
2023-02-23 14:51:35 +08:00 |
|
|
綦新志
|
b1ab4dcc34
|
Merge branch 'revert-1f917ba2' into 'sprint/biz17'
Revert "* Update goview js"
See merge request easycorp/zentaopms!7054
|
2023-02-23 06:39:56 +00:00 |
|
|
綦新志
|
dc3a7596da
|
Revert "* Update goview js"
This reverts commit 1f917ba2aa
|
2023-02-23 06:39:23 +00:00 |
|
|
wangyuting2
|
43d2182574
|
* Add screen status data.
|
2023-02-23 14:14:35 +08:00 |
|
|
qixinzhi
|
1f917ba2aa
|
* Update goview js
|
2023-02-23 13:56:29 +08:00 |
|
|
wangyuting2
|
75abf27b0d
|
* Finish task #85197.
|
2023-02-23 08:51:42 +08:00 |
|
|
wangyuting2
|
d99b84dfb2
|
* Add sql.
|
2023-02-22 16:28:30 +08:00 |
|
|
wangyuting2
|
42635e7669
|
* Optimize screen browse page css.
|
2023-02-22 16:00:45 +08:00 |
|
|
宋辰轩
|
bae5fc00fc
|
Merge branch 'master' into sprint/biz17
|
2023-02-17 15:57:51 +08:00 |
|
|
孙广明
|
74a7615cca
|
Merge branch 'sprint/scx_addIcon' into 'master'
* Update zui fonts and css.
See merge request easycorp/zentaopms!6988
|
2023-02-17 07:54:25 +00:00 |
|
|
宋辰轩
|
6dfbdbdab6
|
* Update zui fonts and css.
|
2023-02-17 15:53:11 +08:00 |
|
|
Yagami
|
1e13b25094
|
* Code for task #84590.
|
2023-02-17 15:46:16 +08:00 |
|
|
Yagami
|
80f3e0e3a0
|
* Code for batch edit execution error.
|
2023-02-17 15:30:52 +08:00 |
|
|
qixinzhi
|
4580fb13ed
|
Merge branch 'master' into sprint/biz17
|
2023-02-17 15:24:51 +08:00 |
|
|
qixinzhi
|
e16b2a4275
|
* Update zui datagrid lib.
|
2023-02-17 15:24:18 +08:00 |
|
|
wangyidong
|
9f0f6014d8
|
* fix bug #32109.
|
2023-02-17 15:17:06 +08:00 |
|
|
王怡栋
|
60df9f7ee6
|
Merge branch 'zentaopms_wangyuting' into 'master'
* Optimize processFile4Object.
See merge request easycorp/zentaopms!6985
|
2023-02-17 06:18:52 +00:00 |
|
|
王怡栋
|
99c3514e5a
|
Merge branch 'sprint/tsj_compatibility' into 'master'
Sprint/tsj compatibility
See merge request easycorp/zentaopms!6984
|
2023-02-17 06:17:08 +00:00 |
|
|
wangyidong
|
2b75166e7c
|
* fix bug #32030.
|
2023-02-17 14:12:04 +08:00 |
|
|
wangyuting2
|
89c722f12a
|
* Optimize processFile4Object.
|
2023-02-17 14:06:04 +08:00 |
|
|
tianshujie
|
13be8ec1a7
|
* Modify the language entry of the execution permission.
|
2023-02-17 14:04:54 +08:00 |
|
|
tianshujie
|
cb3a0faa9c
|
* Added mandatory execution items config.
|
2023-02-17 14:02:01 +08:00 |
|
|
Yagami
|
fcf56a2c8c
|
* Remove unused code.
|
2023-02-17 13:52:58 +08:00 |
|
|
wangyidong
|
28537381dd
|
* fix bug #32172.
|
2023-02-17 13:22:32 +08:00 |
|
|
wangyidong
|
e3a75c6b80
|
* fix bug #32246.
|
2023-02-17 11:48:30 +08:00 |
|
|
tianshujie
|
0e7556ab18
|
* Compatible with php version.
|
2023-02-17 11:22:49 +08:00 |
|
|
tianshujie
|
0b8466a565
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-02-17 11:20:55 +08:00 |
|
|
Yagami
|
c4fad607e8
|
* Add upgrade sql.
|
2023-02-17 11:12:22 +08:00 |
|
|
tianshujie
|
baf96b549a
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-02-17 10:57:44 +08:00 |
|
|
王怡栋
|
629bd1357a
|
Merge branch 'sprint/285' into 'master'
Sprint/285
See merge request easycorp/zentaopms!6983
|
2023-02-17 02:47:29 +00:00 |
|
|
Yagami
|
d85c350479
|
* Code for task #84589.
|
2023-02-17 10:44:21 +08:00 |
|
|
guofeilong
|
67d4f66492
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-17 10:24:44 +08:00 |
|
|
guofeilong
|
ffd36c4499
|
* Code for custom-set css refactors.
|
2023-02-17 10:23:45 +08:00 |
|
|
tianshujie
|
86437d5352
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-02-17 10:18:01 +08:00 |
|
|
王怡栋
|
53cbb81aaa
|
Merge branch 'sprint/290_liumengyi_fixbug' into 'master'
* Fix bug of create waterfallplus's execution.
See merge request easycorp/zentaopms!6981
|
2023-02-17 02:01:40 +00:00 |
|
|
王怡栋
|
361568a575
|
Merge branch 'sprint/tsj_fixbug' into 'master'
Sprint/tsj fixbug
See merge request easycorp/zentaopms!6980
|
2023-02-17 02:00:33 +00:00 |
|
|
王怡栋
|
4be9a95e11
|
Merge branch 'sprint/285' into 'master'
Sprint/285
See merge request easycorp/zentaopms!6982
|
2023-02-17 02:00:05 +00:00 |
|
|
liumengyi
|
a0511e7710
|
* Fix bug of create waterfallplus's execution.
|
2023-02-17 01:51:06 +00:00 |
|
|
tianshujie
|
447bf12f2b
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-02-17 09:35:03 +08:00 |
|
|
guofeilong
|
ed286fc69f
|
Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-17 09:33:59 +08:00 |
|
|
guofeilong
|
0d4a09fb42
|
* Code for style refactors in holiday.
|
2023-02-17 09:33:54 +08:00 |
|
|
tianshujie
|
d9322e91e2
|
* Code for finish task#84576.
|
2023-02-17 09:33:34 +08:00 |
|
|
wangyidong
|
427406aa36
|
Merge branch 'sprint/285'
|
2023-02-17 09:26:51 +08:00 |
|
|
wangyidong
|
7bc1b0da56
|
* fix bug #32203.
|
2023-02-17 09:25:07 +08:00 |
|
|
wangyidong
|
72b51603f4
|
* fix bug #32214.
|
2023-02-17 09:25:07 +08:00 |
|
|
guofeilong
|
6943902abc
|
* Code for style in hours.html.
|
2023-02-17 09:16:10 +08:00 |
|
|
guofeilong
|
553f1157ac
|
* Code for css in hours.
|
2023-02-17 09:07:22 +08:00 |
|
|
tianshujie
|
14fb444fcf
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-02-17 08:55:55 +08:00 |
|
|
tianshujie
|
792f1c5a98
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-17 08:33:25 +08:00 |
|
|
Yagami
|
f6dfccc9cd
|
Merge branch 'zentaopms_284'
|
2023-02-16 17:22:15 +08:00 |
|