 caoyanyi
|
38c7d708f1
|
* Modify repo branch style.
|
2022-11-18 13:06:29 +08:00 |
|
|
caoyanyi
|
f551d44dc8
|
* Modify pri style.
|
2022-11-18 11:26:18 +08:00 |
|
|
caoyanyi
|
8e74c1b335
|
Merge branch 'master' into cyy_bug
|
2022-11-18 11:24:23 +08:00 |
|
|
caoyanyi
|
fa03cbe0fc
|
* Fix bug #29974.
|
2022-11-18 11:23:33 +08: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 |
|
|
王怡栋
|
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 |
|
|
孙广明
|
40cc794db9
|
Merge branch 'master_xieqiyu_29941' into 'master'
* Fix bug#29941.
See merge request easycorp/zentaopms!6228
|
2022-11-17 08:08:31 +00:00 |
|
|
mayue
|
3ef1c553c4
|
* Fix bug #29755.
|
2022-11-17 16:04:56 +08:00 |
|
|
lanzongjun
|
85a5d00a53
|
* Fix bug #29947
|
2022-11-17 16:03:27 +08:00 |
|
|
wangyuting
|
532bef39f3
|
* Finish task #76434.
|
2022-11-17 08:03:03 +00:00 |
|
|
caoyanyi
|
7d80105cff
|
* Code for bug #29355.
|
2022-11-17 16:00:46 +08:00 |
|
|
Lufei
|
5233ebd813
|
* Optimize checkSafeFile tips for backup.
|
2022-11-17 15:50:55 +08:00 |
|
|
tianshujie
|
e31283d2f9
|
* Modified Obtain the configuration information about the workweek.
|
2022-11-17 15:47:12 +08:00 |
|
|
xieqiyu
|
67017be897
|
* Fix bug#29883.
|
2022-11-17 15:41:39 +08:00 |
|
|
tanghucheng
|
0428c7e973
|
* Finish ticket #043.
|
2022-11-17 15:25:52 +08:00 |
|
|
xieqiyu
|
d2771d367b
|
* Fix bug#29941.
|
2022-11-17 15:15:20 +08:00 |
|
|
王怡栋
|
6c72e8755c
|
Merge branch 'sprint/hufangzhou_xuan_commit' into 'master'
* Adjust xuanxuan commit.
See merge request easycorp/zentaopms!6224
|
2022-11-17 06:54:23 +00:00 |
|
|
王怡栋
|
f2a619e7f2
|
Merge branch 'xuan_fix_global_search' into 'master'
* fix getBoundingClientRect of undefined.
See merge request easycorp/zentaopms!6225
|
2022-11-17 06:54:09 +00:00 |
|
|
王怡栋
|
93106a919b
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix task #76407#76411
See merge request easycorp/zentaopms!6223
|
2022-11-17 06:53:02 +00:00 |
|
|
王怡栋
|
6146fb46bd
|
Merge branch 'zentaopms_258_bug#29924' into 'master'
* Fix bug #29924.
See merge request easycorp/zentaopms!6219
|
2022-11-17 06:52:10 +00:00 |
|
|
王怡栋
|
4594970a5b
|
Merge branch 'zentaopms_258_bug#29636' into 'master'
Zentaopms 258 bug#29636
See merge request easycorp/zentaopms!6217
|
2022-11-17 06:51:50 +00:00 |
|
|
王怡栋
|
bd06894530
|
Merge branch 'zentaopms_258_bug#29929' into 'master'
* Fix bug #29929.
See merge request easycorp/zentaopms!6216
|
2022-11-17 06:51:38 +00:00 |
|
|
王怡栋
|
515ee5c5c1
|
Merge branch 'sprint/zentaopms262_mayue_bug#29428' into 'master'
* Fix bug #29428.
See merge request easycorp/zentaopms!6226
|
2022-11-17 06:51:22 +00:00 |
|
|
王怡栋
|
6d2f954054
|
Merge branch 'sprint/zentaopms262_mayue_bug#29468' into 'master'
* Fix bug #29468.
See merge request easycorp/zentaopms!6221
|
2022-11-17 06:50:51 +00:00 |
|