42767 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
liumengyi	08ffbda087	* Optimize code for task #62949.	2022-08-03 09:03:19 +08:00
王怡栋	902fe36227	Merge branch 'sprint/221_liumengyi_62949' into 'master' ... * Finish task #62949. See merge request easycorp/zentaopms!4745	2022-08-02 09:25:15 +00:00
王怡栋	62f02d288c	Merge branch 'sprint/221_liumengyi_62939' into 'master' ... * Finish task #62939. See merge request easycorp/zentaopms!4744	2022-08-02 09:24:21 +00:00
王怡栋	1a13bf3fb0	Merge branch 'sprint/221_liumengyi_62938' into 'master' ... * Finish task #62938. See merge request easycorp/zentaopms!4743	2022-08-02 09:24:01 +00:00
王怡栋	62038c368a	Merge branch 'sprint/221_liumengyi_62944' into 'master' ... * Finish task #62944. See merge request easycorp/zentaopms!4742	2022-08-02 09:21:11 +00:00
王怡栋	42f9f1d561	Merge branch 'fixbug' into 'master' ... * Code for action. See merge request easycorp/zentaopms!4734	2022-08-02 08:20:58 +00:00
王怡栋	6cc611635c	Merge branch 'sprint/221' into 'master' ... Sprint/221 See merge request easycorp/zentaopms!4740	2022-08-02 08:20:39 +00:00
wangyidong	99c5aab19a	* code for task #62739.	2022-08-02 16:18:38 +08:00
王怡栋	b76ebc1857	Merge branch 'bugfix/liwenrui/headermenu' into 'master' ... * fix header menu unable to maintain hover state in zentaoclient. See merge request easycorp/zentaopms!4741	2022-08-02 08:14:29 +00:00
Wenrui LI	da9d8249b5	* fix header menu unable to maintain hover state in zentaoclient.	2022-08-02 16:11:00 +08:00
liumengyi	7c8df39c3c	* Finish task #62949.	2022-08-02 16:08:10 +08:00
Guan Xiying	4d34304c1d	Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms	2022-08-02 15:40:51 +08:00
Guan Xiying	d089fff6bb	* Use find delete instead rm.	2022-08-02 15:28:45 +08:00
王怡栋	e02eabb6b1	Merge branch 'sprint/221_dongli_62948' into 'sprint/221' ... * Fix bug #25851. See merge request easycorp/zentaopms!4738	2022-08-02 07:17:25 +00:00
dongli	b664ed8b43	* Fix bug #25851	2022-08-02 07:03:57 +00:00
dongli	80753ec1f0	* Fix bug #25851.	2022-08-02 06:41:48 +00:00
liumengyi	aff5aa5668	* Finish task #62938.	2022-08-02 09:48:20 +08:00
王怡栋	6c223d9cb5	Merge branch 'tianshujie_bug25911' into 'master' ... * Fix bug #25911. See merge request easycorp/zentaopms!4735	2022-08-02 01:22:15 +00:00
tianshujie	324ec42a34	* Fix bug #25911.	2022-08-02 09:20:08 +08:00
liumengyi	a90490cc26	* Finish task #62939.	2022-08-02 09:05:55 +08:00
tanghucheng	b88cbfa913	* Code for get history log.	2022-08-02 08:54:40 +08:00
胡方舟	5fe8857cae	Merge branch 'tianshujie_fixbug' into 'master' ... * Fix the problem of no project executing after data merging. See merge request easycorp/zentaopms!4733 zentaopms_17.4	2022-08-01 23:30:14 +00:00
tianshujie	8f62881ec6	* Fix the problem of no project executing after data merging.	2022-08-01 17:22:54 +08:00
liumengyi	de29183b2c	* Finish task #62944.	2022-08-01 16:16:25 +08:00
王怡栋	30ef6f2b21	Merge branch 'sprint/hufangzhou_xuanChangelog' into 'master' ... * Add the xuanxuan changelog. See merge request easycorp/zentaopms!4731	2022-08-01 08:12:47 +00:00
hufangzhou	81179e94bc	* Add the xuanxuan changelog.	2022-08-01 16:12:03 +08:00
李玉春	f22d1c89c3	Merge branch 'cyy_bug' into 'master' ... * Modify gitea download url See merge request easycorp/zentaopms!4729	2022-08-01 08:01:04 +00:00
caoyanyi	ef22c5c4e4	* Modify gitea download url	2022-08-01 15:59:53 +08:00
李玉春	46fb425f9e	Merge branch 'cyy_bug' into 'master' ... * Fix bug for gitea code download. See merge request easycorp/zentaopms!4727	2022-08-01 07:45:33 +00:00
caoyanyi	1372ff2952	* Fix bug for gitea code download.	2022-08-01 15:44:06 +08:00
王怡栋	208d96b8e0	Merge branch 'sprint/hufangzhou_assignedto' into 'master' ... * Adjust the code. See merge request easycorp/zentaopms!4726	2022-08-01 07:04:44 +00:00
hufangzhou	af13d9bdb4	* Adjust the code.	2022-08-01 15:03:52 +08:00
朱金勇	d73e628563	Merge branch 'sprint/hufangzhou_changelog' into 'master' ... * Add the story record of xuan to changelog. See merge request easycorp/zentaopms!4724	2022-08-01 00:18:29 +00:00
hufangzhou	64d62939df	* Add the story record of xuan to changelog.	2022-07-29 17:50:34 +08:00
王怡栋	84d0f7388b	Merge branch 'sprint/220_tianshujie_bug25849' into 'master' ... * Fix bug #25849. See merge request easycorp/zentaopms!4723	2022-07-29 05:22:48 +00:00
tianshujie	b0e4873f87	* Fix bug #25849.	2022-07-29 13:17:34 +08:00
李玉春	c5e1af2872	Merge branch 'sprint/ZUI_guofeilong_change_Icon_ZTF_to_ztf' into 'master' ... * Change icon-ZTF to icon-ztf See merge request easycorp/zentaopms!4721	2022-07-29 00:38:02 +00:00
王怡栋	3d269cd837	Merge branch 'sprint/dev_guofeilong_fix_bug_unreload' into 'master' ... * Fix bug unrefresh while add action to workFlow See merge request easycorp/zentaopms!4722	2022-07-29 00:31:22 +00:00
guofeilong	736ecf9882	* Change icon-ZTF to icon-ztf	2022-07-28 09:44:23 +00:00
guofeilong	680c5a65e3	* Fix bug unrefresh while add action to workFlow	2022-07-28 09:36:35 +00:00
李玉春	087fae02ed	Merge branch 'cyy_bug' into 'master' ... Cyy bug See merge request easycorp/zentaopms!4705	2022-07-28 09:17:53 +00:00
caoyanyi	152c7e5a28	* Adjust code.	2022-07-28 17:17:18 +08:00
王怡栋	371a7bf713	Merge branch 'sprint/ZUI_guofeilong_add_icon_log' into 'master' ... * Add Icon file-log and draft-edit See merge request easycorp/zentaopms!4720	2022-07-28 08:55:09 +00:00
王怡栋	9f7bbb08f8	Merge branch 'sprint/master_zhouxudong_25841' into 'master' ... * Fix bug #25841. See merge request easycorp/zentaopms!4718	2022-07-28 08:51:09 +00:00
guofeilong	f47e82579e	* Add Icon file-log and draft-edit	2022-07-28 08:50:58 +00:00
王怡栋	4f565e25f4	Merge branch 'sprint220_zg_23205' into 'master' ... * Fix bug#62106 See merge request easycorp/zentaopms!4717	2022-07-28 08:50:56 +00:00
王怡栋	1d43fd686d	Merge branch 'sprint/hufangzhou_25842' into 'master' ... * Fix bug #25842. See merge request easycorp/zentaopms!4719	2022-07-28 08:49:15 +00:00
caoyanyi	e35e756b92	* Add gitlab branch and tag route.	2022-07-28 16:46:37 +08:00
zhouxudong	cae237887d	* Fix bug #25841.	2022-07-28 08:36:12 +00:00
hufangzhou	7e93563e95	* Fix bug #25842.	2022-07-28 16:35:53 +08:00