tianshujie
|
16c28d0f70
|
* Add skip stash class.
|
2023-03-13 14:30:09 +08:00 |
|
tianshujie
|
cd7195892c
|
* Fix bug 32831.
|
2023-03-13 10:37:30 +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 |
|
曾刚
|
2da060b171
|
Gitlab optimize
|
2023-03-09 08:05:10 +00:00 |
|
tianshujie
|
ac3cf573b7
|
* Modify language items for execution common.
|
2023-03-09 14:00:31 +08:00 |
|
caoyanyi
|
cea165d8bb
|
* Update product common lang.
|
2023-03-08 10:06:49 +08:00 |
|
caoyanyi
|
2e35bcb624
|
* Update project common lang.
|
2023-03-08 09:58:33 +08:00 |
|
孙广明
|
59c05f91c7
|
Merge branch 'fixbug_liumengyi_32633' into 'master'
* Fix bug 32603 32632 32633.
See merge request easycorp/zentaopms!7142
|
2023-03-08 01:24:54 +00:00 |
|
liumengyi
|
3f63404953
|
* Finish task #86258.
|
2023-03-06 06:09:13 +00:00 |
|
王怡栋
|
3438722a8c
|
Merge branch 'master' into 'zentaopms_289'
# Conflicts:
# db/update18.2.sql
|
2023-03-06 03:26:34 +00:00 |
|
liumengyi
|
47c874ae0c
|
* Fix bug #32633.
|
2023-03-06 00:41:04 +00:00 |
|
Yagami
|
f95691948a
|
Merge branch 'zentaopms_294'
|
2023-03-06 08:37:11 +08:00 |
|
caoyanyi
|
58fb43d90a
|
* Modify devops sub menu.
|
2023-03-02 11:17:09 +08:00 |
|
王怡栋
|
58ec6b30a6
|
Merge branch 'zentaopms_289_85502_gfl' into 'zentaopms_289'
Zentaopms 289 85502 gfl
See merge request easycorp/zentaopms!7123
|
2023-03-02 02:20:02 +00:00 |
|
guofeilong
|
40015657cc
|
* Code for task #85502
|
2023-03-02 10:16:48 +08:00 |
|
tianshujie
|
3886a5f25b
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-03-02 08:27:28 +08:00 |
|
liumengyi
|
bc5bdab5d4
|
* Fix bug #32569.
|
2023-03-01 08:22:01 +00:00 |
|
wangyidong
|
cdb476bc4b
|
* adjust for safe file timeout.
|
2023-03-01 15:58:56 +08:00 |
|
guofeilong
|
68e10e515e
|
* Code for task #85502
|
2023-03-01 13:54:45 +08:00 |
|
wangyidong
|
01bb8130dd
|
Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-03-01 08:50:31 +08:00 |
|
wangyidong
|
1a352410a6
|
* code for task #85503.
|
2023-03-01 08:49:44 +08:00 |
|
tianshujie
|
eef2c1c356
|
* Change the order of the custom navigation.
|
2023-02-28 15:36:04 +08:00 |
|
tianshujie
|
2a003865f4
|
* Code for finish task #84526.
|
2023-02-28 09:09:16 +08:00 |
|
caoyanyi
|
f2441f7197
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-27 15:28:14 +08:00 |
|
孙广明
|
167539f822
|
Merge branch 'sprint/294_liumengyi_fixbug' into 'master'
* Modify menu name.
See merge request easycorp/zentaopms!7076
|
2023-02-27 06:59:14 +00:00 |
|
liumengyi
|
4912b2004e
|
* Finish task #85630.
|
2023-02-27 06:54:39 +00:00 |
|
liugang
|
c9115f7a21
|
* Revert menus, privileges and pages of report.
|
2023-02-27 06:39:37 +00:00 |
|
liumengyi
|
a23d205435
|
* Modify menu name.
|
2023-02-27 06:24:08 +00:00 |
|
caoyanyi
|
a576a06b3f
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-27 09:05:16 +08:00 |
|
Yagami
|
b151d1fb32
|
* Finish task #85459.
|
2023-02-24 14:50:37 +08:00 |
|
guofeilong
|
c62dbb7792
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-24 13:47:19 +08:00 |
|
zhujinyong
|
7de18de447
|
* Fix bug: No 'more' menu.
|
2023-02-24 11:27:45 +08:00 |
|
caoyanyi
|
83a64cb3cf
|
* Update home button text.
|
2023-02-24 09:02:48 +08:00 |
|
caoyanyi
|
1be6a534a8
|
* Modify home btn title.
|
2023-02-23 17:20:17 +08:00 |
|
caoyanyi
|
e7c8ceed8d
|
* Modify dynamic language.
|
2023-02-23 10:10:11 +08:00 |
|
caoyanyi
|
6caaf4c316
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-23 08:32:25 +08:00 |
|
tianshujie
|
12cdb2f6d7
|
* Modify menu param.
|
2023-02-22 16:11:21 +08:00 |
|
caoyanyi
|
7c257b5e1e
|
* Code for issue #762.
|
2023-02-22 15:16:48 +08:00 |
|
tianshujie
|
5b2cafa380
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-21 14:13:51 +08:00 |
|
孙广明
|
6c1ed365ab
|
Merge branch 'sprint/292_liumengyi_85038' into 'master'
* Finish task #85038, #85039, #85040.
See merge request easycorp/zentaopms!7010
|
2023-02-21 05:50:04 +00:00 |
|
tianshujie
|
517fb3c796
|
* Code for finish task #85046.
|
2023-02-21 13:13:13 +08:00 |
|
liumengyi
|
95e3978fb0
|
* Finish task #85038, #85039.
|
2023-02-21 01:05:24 +00:00 |
|
caoyanyi
|
653c393eb1
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-21 09:01:07 +08:00 |
|
tianshujie
|
3962b7a087
|
* Code for finish task #84575.
|
2023-02-20 08:40:32 +08:00 |
|
tianshujie
|
5aee651454
|
* Code for finish task #84575.
|
2023-02-18 18:39:07 +08:00 |
|
caoyanyi
|
c8374b1e14
|
Merge branch 'master' into zentaopms_289
|
2023-02-17 10:11:16 +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 |
|
wangyidong
|
9e1cfb2b25
|
* code for task #84532.
|
2023-02-16 14:53:30 +08:00 |
|
tianshujie
|
ad1d1631a3
|
* Code for finish task #84593.
|
2023-02-16 14:42:27 +08:00 |
|
wangyidong
|
1b70d6e8a4
|
* code for task #84532.
|
2023-02-16 13:55:23 +08:00 |
|