Commit Graph
42754 Commits
Author SHA1 Message Date
caoyanyi 06abe97624 * Modify branch check error. 2022-08-02 15:19:08 +08:00
sunguangming 89336aa212 Merge branch 'liyuchun_62870' into zenops_41 2022-08-02 14:14:20 +08:00
李玉春 6b2d2a0a07 Merge branch 'zenops_41' into 'liyuchun_62870'
# Conflicts:
#   module/gogs/model.php
#   module/repo/config.php
2022-08-02 05:38:32 +00:00
李玉春 278708da42 Merge branch 'cyy_repo_sync' into 'zenops_41'
* Modify git clone for Gitea and Gogs.

See merge request easycorp/zentaopms!4736
2022-08-02 05:35:52 +00:00
caoyanyi 506f028c11 * Remove test data. 2022-08-02 13:34:02 +08:00
liyuchun c27c4375ed * Finish task #62870. 2022-08-02 05:29:09 +00:00
caoyanyi bded54ba44 * Modify git clone for Gitea and Gogs. 2022-08-02 13:28:29 +08:00
孙广明 73cf4d6f1a Merge branch 'liyuchun_62870' into 'zenops_41'
* Finish task #62870.

See merge request easycorp/zentaopms!4725
2022-08-02 01:08:37 +00:00
李玉春 dd1c069376 Update model.php 2022-08-02 00:33:02 +00:00
李玉春 c1c19ef2fc Merge branch 'cyy_repo' into 'zenops_41'
Cyy repo

See merge request easycorp/zentaopms!4732
2022-08-02 00:31:55 +00:00
caoyanyi 8d1632bdcc * Modify repo btn style. 2022-08-01 17:13:44 +08:00
caoyanyi 7a9885309f * Modify git clone url get. 2022-08-01 17:04:49 +08:00
李玉春 bc98b45f85 Merge branch 'cyy_62873' into 'zenops_41'
* Modify gogs repo.

See merge request easycorp/zentaopms!4730
2022-08-01 08:46:59 +00:00
caoyanyi eaf6fcdb44 * Adjust codes. 2022-08-01 16:21:05 +08:00
caoyanyi 988982d4a8 * Adjust code. 2022-08-01 16:16:41 +08:00
caoyanyi 5559558e40 * Modify file download. 2022-08-01 16:11:30 +08:00
caoyanyi 4b1dde8c7e * Modify gogs repo. 2022-08-01 15:40:55 +08:00
liyuchun f3044011d8 * Finish task #62870. 2022-08-01 05:58:24 +00:00
liyuchun f94aff639d * Add gogs module. 2022-08-01 02:48:23 +00: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
liumengyi e8d7949d25 * Fix bug #25806. 2022-07-28 15:16:06 +08:00