 王怡栋
|
abfdcaa4f5
|
Merge branch 'zentaopms_261_bug_#29948' into 'master'
* Fix bug #29948.
See merge request easycorp/zentaopms!6247
|
2022-11-18 07:19:49 +00:00 |
|
|
王怡栋
|
c291211ac9
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix task #76459
See merge request easycorp/zentaopms!6246
|
2022-11-18 07:19:36 +00:00 |
|
|
王怡栋
|
47dd0a2a4d
|
Merge branch 'zentaopms_258_bug#29942' into 'master'
* Fix bug #29942.
See merge request easycorp/zentaopms!6245
|
2022-11-18 07:19:03 +00:00 |
|
|
lanzongjun
|
0b2bb1a273
|
* Fix bug #29442#29695
|
2022-11-18 15:18:57 +08:00 |
|
|
王怡栋
|
a8e22a8884
|
Merge branch 'zentaopms_261_bug_#29653' into 'master'
* Fix bug #29653.
See merge request easycorp/zentaopms!6244
|
2022-11-18 07:18:49 +00:00 |
|
|
王怡栋
|
6164fa0c69
|
Merge branch 'zentaopms_258_bug#29959' into 'master'
* Fix bug #29959.
See merge request easycorp/zentaopms!6243
|
2022-11-18 07:18:30 +00:00 |
|
|
王怡栋
|
07117610a7
|
Merge branch 'zentaopms_261_bug_#29931' into 'master'
* Fix bug #29931.
See merge request easycorp/zentaopms!6242
|
2022-11-18 07:17:53 +00:00 |
|
|
王怡栋
|
988f80e133
|
Merge branch 'zentaopms261_wyd' into 'master'
* adjust for create release.
See merge request easycorp/zentaopms!6257
|
2022-11-18 07:10:55 +00:00 |
|
|
王怡栋
|
07c1b0cc45
|
* adjust for create release.
|
2022-11-18 15:09:21 +08:00 |
|
|
lanzongjun
|
35fd254797
|
* Fix bug create execution
|
2022-11-18 14:57:52 +08:00 |
|
|
王怡栋
|
8aeb743c8f
|
Merge branch 'zentaopms261_wyd' into 'master'
Zentaopms261 wyd
See merge request easycorp/zentaopms!6255
|
2022-11-18 06:42:59 +00:00 |
|
|
Yagami
|
427d5947c5
|
* Fix bug #29443.
|
2022-11-18 14:41:25 +08:00 |
|
|
王怡栋
|
1c0129945c
|
* code for task #76439,76440.
|
2022-11-18 14:25:24 +08:00 |
|
|
lanzongjun
|
da5f7e860b
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug
|
2022-11-18 14:07:23 +08:00 |
|
|
daitingting
|
8bc0455d36
|
* Fix bug #29948.
|
2022-11-18 03:21:58 +00:00 |
|
|
lanzongjun
|
a105dc7845
|
* Fix task #76459
|
2022-11-18 11:17:09 +08:00 |
|
|
wangyuting
|
ff6730dcbd
|
* Fix bug #29942.
|
2022-11-18 03:01:40 +00:00 |
|
|
王怡栋
|
fb9aa7d0dd
|
* code for task #76438.
|
2022-11-18 10:57:15 +08:00 |
|
|
daitingting
|
ef60d89f47
|
* Fix bug #29653.
|
2022-11-18 02:55:33 +00:00 |
|
|
王怡栋
|
db540eb67a
|
* code for task #76438.
|
2022-11-18 10:53:30 +08:00 |
|
|
wangyuting
|
5df0b941b1
|
* Fix bug #29959.
|
2022-11-18 02:51:50 +00:00 |
|
|
朱金勇
|
7d92169194
|
Merge branch 'sprint/xuanxuan-header' into 'master'
* Hide logout and user-deny page's footer in xuanxuan client mode.
See merge request easycorp/zentaopms!6192
|
2022-11-18 02:43:51 +00:00 |
|
|
鲁飞
|
fa166ed6e1
|
* Hide logout and user-deny page's footer in xuanxuan client mode.
|
2022-11-18 02:43:51 +00:00 |
|
|
daitingting
|
6743a6e779
|
* Fix bug #29931.
|
2022-11-18 02:40:02 +00:00 |
|
|
王怡栋
|
cd0500cdf9
|
Merge branch 'zentaopms_258_wangyuting' into 'master'
* Fix unlink btn class bug.
See merge request easycorp/zentaopms!6240
|
2022-11-18 02:35:25 +00:00 |
|
|
王怡栋
|
94d49f0799
|
Merge branch 'master_xieqiyu_76453' into 'master'
* Fix bug#29969.
See merge request easycorp/zentaopms!6238
|
2022-11-18 02:34:21 +00:00 |
|
|
王怡栋
|
b0d617966e
|
Merge branch 'sprint/zentaopms262_mayue_bug#29944' into 'master'
* Fix bug #29944.
See merge request easycorp/zentaopms!6241
|
2022-11-18 02:34:04 +00:00 |
|
|
mayue
|
8d97e96399
|
* Fix bug #29944.
|
2022-11-18 10:31:15 +08:00 |
|
|
wangyuting
|
a35818ef8c
|
* Fix unlink btn class bug.
|
2022-11-18 02:27:28 +00:00 |
|
|
xieqiyu
|
1757b9ab9d
|
* Fix bug#29969.
|
2022-11-18 10:16:31 +08:00 |
|
|
王怡栋
|
a73719e9ed
|
Merge branch 'master_xieqiyu_76419' into 'master'
* Fix bug#29742.
See merge request easycorp/zentaopms!6237
|
2022-11-18 02:11:06 +00:00 |
|
|
王怡栋
|
787128c30e
|
Merge branch 'cyy_bug' into 'master'
Cyy bug
See merge request easycorp/zentaopms!6235
|
2022-11-18 02:10:53 +00:00 |
|
|
王怡栋
|
d599d1849e
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix bug #29947 task #76414
See merge request easycorp/zentaopms!6232
|
2022-11-18 02:10:34 +00:00 |
|
|
王怡栋
|
d51ac9506a
|
Merge branch 'tianshujie_bug' into 'master'
* Modified Obtain the configuration information about the workweek.
See merge request easycorp/zentaopms!6229
|
2022-11-18 02:09:50 +00:00 |
|
|
王怡栋
|
028547730b
|
Merge branch 'fixbug' into 'master'
* Finish ticket #043.
See merge request easycorp/zentaopms!6227
|
2022-11-18 02:09:38 +00:00 |
|
|
王怡栋
|
f2502c5737
|
Merge branch 'sprint/xuanxuan_121' into 'master'
Sprint/xuanxuan 121
See merge request easycorp/zentaopms!5825
|
2022-11-18 02:08:40 +00:00 |
|
|
lanzongjun
|
ccbf2ee9eb
|
* Fix task #76414
|
2022-11-18 09:59:39 +08:00 |
|
|
朱金勇
|
927e7f7b57
|
Merge branch 'sprint/gh-104' into 'master'
* Fix GH-104, Get extension removePath error.
See merge request easycorp/zentaopms!6236
|
2022-11-18 01:40:11 +00:00 |
|
|
tanghucheng
|
803cd49450
|
Merge branch 'master' into fixbug
|
2022-11-18 09:32:53 +08:00 |
|
|
xieqiyu
|
86812c33bf
|
* Fix bug#29742.
|
2022-11-18 09:17:39 +08:00 |
|
|
Lufei
|
4fe09fb507
|
* Fix GH-104, Get extension removePath error.
|
2022-11-18 08:49:38 +08:00 |
|
|
王怡栋
|
2f270f3808
|
Merge branch 'sprint/zentaopms262_mayue_bug#29755' into 'master'
* Fix bug #29755.
See merge request easycorp/zentaopms!6233
|
2022-11-18 00:37:39 +00:00 |
|
|
朱金勇
|
2db6b1eb35
|
Merge branch 'sprint/backup' into 'master'
* Optimize checkSafeFile tips for backup.
See merge request easycorp/zentaopms!6230
|
2022-11-17 14:38:54 +00:00 |
|
|
朱金勇
|
972cf6fc6e
|
Merge branch 'sprint/copyright' into 'master'
* Update copyright and remove config url items.
See merge request easycorp/zentaopms!6222
|
2022-11-17 10:53:29 +00:00 |
|
|
caoyanyi
|
05d9cef073
|
* Fix bug #29957.
|
2022-11-17 16:52:31 +08:00 |
|
|
王怡栋
|
e4c02e2857
|
Merge branch 'zentaopms_258_task#76435' into 'master'
* Finish task #76435、76436、76437.
See merge request easycorp/zentaopms!6234
|
2022-11-17 08:47:30 +00:00 |
|
|
王怡栋
|
9d7b30f699
|
Merge branch 'zentaopms_258_task#76434' into 'master'
* Finish task #76434.
See merge request easycorp/zentaopms!6231
|
2022-11-17 08:47:11 +00:00 |
|
|
wangyuting
|
97073567df
|
* Finish task #76435、76436、76437.
|
2022-11-17 08:42:31 +00:00 |
|
|
孙广明
|
9e573b74d7
|
Merge branch 'master_xieqiyu_76423' into 'master'
* Fix bug#29430.
See merge request easycorp/zentaopms!6218
|
2022-11-17 08:09:01 +00:00 |
|
|
孙广明
|
0e8063d20c
|
Merge branch 'master_xieqiyu_29909' into 'master'
* Fix bug#29909.
See merge request easycorp/zentaopms!6220
|
2022-11-17 08:08:49 +00:00 |
|