 liumengyi
|
8900769999
|
* Finish task #63455.
|
2022-08-04 09:47:16 +08:00 |
|
|
wangyidong
|
0ed8c8bd03
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-04 09:41:48 +08:00 |
|
|
wangyidong
|
c98ee9e323
|
* fix for searchindex table fulltext index.
|
2022-08-04 09:40:58 +08:00 |
|
|
李玉春
|
298342fedf
|
Merge branch 'testta_ly' into 'master'
Testta ly
See merge request easycorp/zentaopms!4777
|
2022-08-04 01:37:56 +00:00 |
|
|
liyang
|
40ba4c8a9e
|
* Fix copyDB function for unittest.
|
2022-08-04 09:34:25 +08:00 |
|
|
王怡栋
|
204336881b
|
Merge branch 'sprint/master_zhouxudong_60388' into 'master'
Sprint/master zhouxudong 60388
See merge request easycorp/zentaopms!4771
|
2022-08-04 01:21:52 +00:00 |
|
|
王怡栋
|
be74cdc536
|
Merge branch 'sprint/ZUI_guofeilong_update_icon' into 'master'
* Fix icon ztf and draft_edit
See merge request easycorp/zentaopms!4774
|
2022-08-04 01:17:04 +00:00 |
|
|
王怡栋
|
d2e9893c45
|
Merge branch 'sprint/devplat_30' into 'master'
Sprint/devplat 30
See merge request easycorp/zentaopms!4767
|
2022-08-04 01:15:36 +00:00 |
|
|
王怡栋
|
47954aefa5
|
Merge branch 'sprint/max_changelog' into 'master'
* Add the story of zentaomax to changelog.
See merge request easycorp/zentaopms!4775
|
2022-08-04 01:15:17 +00:00 |
|
|
wangyidong
|
d4c95e6e9c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-04 09:14:41 +08:00 |
|
|
wangyuting2
|
97e36551a1
|
* Finish task #63380.
|
2022-08-04 09:14:20 +08:00 |
|
|
wangyidong
|
f5b6edef01
|
Merge branch 'sprint/devplat_30'
|
2022-08-04 09:13:53 +08:00 |
|
|
liyang
|
a15d5f3510
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-04 09:12:46 +08:00 |
|
|
hufangzhou
|
b964a90680
|
* Add the story of zentaomax to changelog.
|
2022-08-04 09:12:11 +08:00 |
|
|
guofeilong
|
164e6a99d4
|
* Fix icon ztf and draft_edit
|
2022-08-04 01:03:55 +00:00 |
|
|
王怡栋
|
b6869b0602
|
Merge branch 'sgm_block' into 'master'
Sgm block
See merge request easycorp/zentaopms!4772
|
2022-08-04 01:01:35 +00:00 |
|
|
liuruogu
|
5f57574e75
|
* Finish task #63387.
|
2022-08-04 00:40:25 +00:00 |
|
|
sunguangming
|
9d1ce4c9d5
|
* Code for project export program name.
|
2022-08-04 08:39:15 +08:00 |
|
|
胡方舟
|
4c52cdadb3
|
Merge branch 'sprint/221_dongli_bug25837' into 'master'
* Fix bug #25837.
See merge request easycorp/zentaopms!4770
|
2022-08-03 09:41:09 +00:00 |
|
|
dongli
|
8b74ed5ddc
|
* Fix bug #25837.
|
2022-08-03 09:38:21 +00:00 |
|
|
dongli
|
4f1492221a
|
* Fix bug #25837.
|
2022-08-03 09:26:18 +00:00 |
|
|
王怡栋
|
60feb4cb34
|
Merge branch 'sprint/221_liumengyi_25994' into 'master'
* Fix bug #25994.
See merge request easycorp/zentaopms!4769
|
2022-08-03 09:17:57 +00:00 |
|
|
liumengyi
|
1fe596b022
|
* Fix bug #25994.
|
2022-08-03 17:17:16 +08:00 |
|
|
王怡栋
|
21e2ad2c96
|
Merge branch 'sprint/221_tianshujie_62936' into 'master'
* Finish task #62936.
See merge request easycorp/zentaopms!4768
|
2022-08-03 09:16:34 +00:00 |
|
|
王怡栋
|
54cd872f2a
|
Merge branch 'sprint/221_liumengyi_25988' into 'master'
* Fix bug #25988.
See merge request easycorp/zentaopms!4766
|
2022-08-03 09:16:15 +00:00 |
|
|
tianshujie
|
a09b7662d7
|
* Finish task #62936.
|
2022-08-03 17:15:49 +08:00 |
|
|
liumengyi
|
5acd4b9127
|
* Fix bug #25994.
|
2022-08-03 17:12:07 +08:00 |
|
|
tianshujie
|
175fd06bc2
|
* Finish task #62936.
|
2022-08-03 17:07:23 +08:00 |
|
|
wangyuting2
|
5bc8123a58
|
* Add note.
|
2022-08-03 17:06:56 +08:00 |
|
|
liuruogu
|
653f238cac
|
* Finish task #63386.
|
2022-08-03 09:05:13 +00:00 |
|
|
wangyuting2
|
afba28db68
|
* Add project execution approval menu.
|
2022-08-03 16:48:10 +08:00 |
|
|
liumengyi
|
7584e9523e
|
* Fix bug #25988.
|
2022-08-03 16:46:03 +08:00 |
|
|
wangyuting2
|
0747b43672
|
* Add projectrelease approval menu.
|
2022-08-03 16:31:59 +08:00 |
|
|
李玉春
|
75ab21f5a6
|
Merge branch 'zhouxin_fixbug_25995' into 'master'
* Fix bug #25995.
See merge request easycorp/zentaopms!4765
|
2022-08-03 08:27:24 +00:00 |
|
|
zhouxin
|
d55a19884c
|
* Fix bug #25995.
|
2022-08-03 08:25:11 +00:00 |
|
|
liyang
|
6f1b4c5aeb
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-03 16:23:12 +08:00 |
|
|
李玉春
|
f54810c6aa
|
Merge branch 'sprint/zentaoat_liyang' into 'master'
* Fix test of createbycycle.
See merge request easycorp/zentaopms!4764
|
2022-08-03 08:22:17 +00:00 |
|
|
liuruogu
|
a28d225da9
|
* Finish task #63381.
|
2022-08-03 08:21:44 +00:00 |
|
|
liyang
|
d67f60554d
|
* Fix test of createbycycle.
|
2022-08-03 16:20:19 +08:00 |
|
|
liugang
|
2b7833e0f9
|
* Finish task #63385.
|
2022-08-03 16:16:26 +08:00 |
|
|
liugang
|
d17ea74a91
|
* Finish task #63390.
|
2022-08-03 16:16:26 +08:00 |
|
|
liugang
|
0f3fe6e4a9
|
* Finish task #63390.
|
2022-08-03 16:16:26 +08:00 |
|
|
liugang
|
af464df513
|
* Finish task #63391.
|
2022-08-03 16:16:26 +08:00 |
|
|
liyang
|
e591b48f00
|
* Fix test of createbycycle.
|
2022-08-03 16:16:03 +08:00 |
|
|
liumengyi
|
69eb942fa4
|
* Fix bug #25988.
|
2022-08-03 16:13:59 +08:00 |
|
|
wangyuting2
|
39e507111c
|
* Finish task #63379.
|
2022-08-03 16:04:40 +08:00 |
|
|
王怡栋
|
b9ba15e223
|
Merge branch 'sprint/221_25897' into 'master'
* Fix bug#25897,22882
See merge request easycorp/zentaopms!4763
|
2022-08-03 07:52:50 +00:00 |
|
|
王怡栋
|
77e01714d2
|
Merge branch 'sprint/211_liumengyi_62958' into 'master'
* Finish task #62957, #62958.
See merge request easycorp/zentaopms!4760
|
2022-08-03 07:46:59 +00:00 |
|
|
liuruogu
|
37e55ee3c9
|
* Finish task #63392.
|
2022-08-03 07:31:11 +00:00 |
|
|
zenggang
|
3a9f4d8ada
|
* Fix bug#25897,22882
|
2022-08-03 07:16:28 +00:00 |
|