42755 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
zenggang	bc8dfbbe7a	* Adjust code	2022-08-03 01:43:58 +00:00
zenggang	e3698f1b6a	* Adjust code	2022-08-03 00:48:59 +00:00
zenggang	d9e251ea26	* Fix bug#25416	2022-08-02 09:29:33 +00:00
zenggang	8f6ca19bf7	* Finish task#62937,62950	2022-08-02 08:19:56 +00: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
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
王怡栋	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
胡方舟	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
王怡栋	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
caoyanyi	ee17045251	* Modify prev and next btn.	2022-07-28 16:18:04 +08:00
zenggang	92abbcfdf5	* Fix bug#62106	2022-07-28 08:03:40 +00:00
王怡栋	6a7e5939e3	Merge branch 'leiyong_fix_bug' into 'master' ... * Fix bug#25807. See merge request easycorp/zentaopms!4716	2022-07-28 07:59:29 +00:00
王怡栋	31cbe228b3	Merge branch 'sprint/220_tianshujie_bug25448' into 'master' ... Sprint/220 tianshujie bug25448 See merge request easycorp/zentaopms!4715	2022-07-28 07:57:35 +00:00
leiyong	4d63e9fc36	* Fix bug#25807.	2022-07-28 07:56:15 +00:00
王怡栋	6446c442de	Merge branch 'sprint/220_liumengyi_25838' into 'master' ... * Fix bug #25838. See merge request easycorp/zentaopms!4714	2022-07-28 07:53:05 +00:00
tianshujie	744da8aa6b	* Fix bug #25448.	2022-07-28 15:52:45 +08:00
王怡栋	a448cae025	Merge branch 'sprint220_zg_23205' into 'master' ... * Fix bug#23205,25799 See merge request easycorp/zentaopms!4712	2022-07-28 07:52:38 +00:00
liumengyi	51197d23c9	* Fix bug #25838.	2022-07-28 15:50:52 +08:00
王怡栋	cbd56f4fb7	Merge branch 'sprint/master_zhouxudong_fixbug' into 'master' ... * Fix bug. See merge request easycorp/zentaopms!4706	2022-07-28 07:50:28 +00:00
zenggang	1b5b6d7e5e	* Fix bug#25799	2022-07-28 07:21:35 +00:00
胡方舟	10fd1f9e92	Merge branch 'sprint/220_liumengyi_25806' into 'master' ... * Fix bug #25806. See merge request easycorp/zentaopms!4713	2022-07-28 07:20:20 +00:00