 wangyidong
|
1a29a5abb9
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-02-20 09:19:33 +08:00 |
|
|
wangyidong
|
cca77bda34
|
Merge branch 'sprint/tsj_task'
|
2023-02-20 09:19:21 +08:00 |
|
|
王怡栋
|
c004967af9
|
Merge branch 'sprint/290_liumengyi_32244' into 'master'
* Fix bug #32244, #32245, #32249, #32251, #32255, #32179, @32167.
See merge request easycorp/zentaopms!6989
|
2023-02-20 01:16:52 +00:00 |
|
|
王怡栋
|
bc4efa791c
|
Merge branch 'sprint/290_liumengyi_84586' into 'master'
* Finish task #84586.
See merge request easycorp/zentaopms!6987
|
2023-02-20 01:15:52 +00:00 |
|
|
王怡栋
|
5d7f729008
|
Merge branch 'sprint/290_liumengyi_fixbug' into 'master'
* Fix bug #32243.
See merge request easycorp/zentaopms!6986
|
2023-02-20 01:15:22 +00:00 |
|
|
tianshujie
|
3962b7a087
|
* Code for finish task #84575.
|
2023-02-20 08:40:32 +08:00 |
|
|
Yagami
|
06220e4f1f
|
* Fix lower php version error.
|
2023-02-20 08:34:19 +08:00 |
|
|
孙广明
|
59dfbd7909
|
Merge branch 'spring/hufangzhou_task_84583' into 'master'
* Code for task #84583.
See merge request easycorp/zentaopms!6992
|
2023-02-19 10:46:34 +00:00 |
|
|
hufangzhou
|
aaeeb9372d
|
* Code for task #84583.
|
2023-02-19 09:17:49 +00:00 |
|
|
孙广明
|
58d20833c7
|
Merge branch 'sprint/hufangzhou_task_84583' into 'master'
* Finish task #84583.
See merge request easycorp/zentaopms!6991
|
2023-02-19 04:03:33 +00:00 |
|
|
hufangzhou
|
75b5b2562c
|
* Finish task #84583.
|
2023-02-18 16:04:53 +00:00 |
|
|
tianshujie
|
b05cad4add
|
* Add case of execution method.
|
2023-02-18 20:16:52 +08:00 |
|
|
tianshujie
|
73077a3615
|
* Code for finish task #84575.
|
2023-02-18 18:55:59 +08:00 |
|
|
tianshujie
|
5aee651454
|
* Code for finish task #84575.
|
2023-02-18 18:39:07 +08:00 |
|
|
liumengyi
|
fb57e0f994
|
* Fix bug #32167.
|
2023-02-18 09:42:58 +00:00 |
|
|
liumengyi
|
09cb859c5e
|
* Fix bug #32179.
|
2023-02-18 09:30:25 +00:00 |
|
|
liumengyi
|
c28161fb0d
|
* Fix bug of create project.
|
2023-02-18 09:15:04 +00:00 |
|
|
liumengyi
|
0ad1aba2ee
|
* Fix bug #32255.
|
2023-02-18 08:38:13 +00:00 |
|
|
liumengyi
|
1eb1f7ad7b
|
* Fix bug of create waterfallplus's execution.
|
2023-02-18 07:28:22 +00:00 |
|
|
liumengyi
|
02adc7454f
|
* Fix bug #32251.
|
2023-02-18 07:27:40 +00:00 |
|
|
tianshujie
|
2285275a52
|
* Remove useless code.
|
2023-02-18 15:20:29 +08:00 |
|
|
tianshujie
|
4e7f8247e3
|
* Code for finish task #84593.
|
2023-02-18 15:16:29 +08:00 |
|
|
tianshujie
|
8208608430
|
* Compatible with earlier versions of php.
|
2023-02-17 17:32:46 +08:00 |
|
|
tianshujie
|
234f62bb6a
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-02-17 15:58:51 +08:00 |
|
|
liumengyi
|
61e824c548
|
* Fix bug #32249.
|
2023-02-17 07:54:54 +00: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 |
|
|
liumengyi
|
b1f57ce0da
|
* Fix bug #32244, #32245.
|
2023-02-17 07:50:45 +00: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 |
|
|
wangyidong
|
9f0f6014d8
|
* fix bug #32109.
|
2023-02-17 15:17:06 +08:00 |
|
|
liumengyi
|
1fb012e889
|
* Optimize code of bug #32243.
|
2023-02-17 06:28:43 +00:00 |
|
|
liumengyi
|
6a9b3fc6e4
|
* Fix bug #32243.
|
2023-02-17 06:26:19 +00:00 |
|
|
tianshujie
|
0bfeecdfae
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-02-17 14:25:03 +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 |
|
|
tianshujie
|
eb2b772347
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-02-17 13:14:12 +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 |
|