Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
43,651 Commits 2 Branches 292 Tags
a603c4568529c4912c63ae5160d1035d56a05b2c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
李玉春 bd3999375c Merge branch 'sprint/224_tianshujie_case' into 'master' 
Sprint/224 tianshujie case

See merge request easycorp/zentaopms!4962
 2022-08-15 00:13:45 +00:00
李玉春 00e410cce8 Merge branch 'sprint/master_zhouxudong_fixbug' into 'master' 
* Fix bug.

See merge request easycorp/zentaopms!4940
 2022-08-11 08:59:48 +00:00
李玉春 cfa6b03e8e Merge branch 'cyy_bug' into 'master' 
* Modify mr error.

See merge request easycorp/zentaopms!4936
 2022-08-11 08:00:47 +00:00
李玉春 601c33d2da Merge branch 'testta_ly' into 'master' 
* Delete longtime test.

See merge request easycorp/zentaopms!4898
 2022-08-10 07:13:09 +00:00
李玉春 016ef434ab Merge branch 'sprint/224_tianshujie_63692' into 'master' 
Sprint/224 tianshujie 63692

See merge request easycorp/zentaopms!4866
 2022-08-09 08:19:33 +00:00
李玉春 5bdf0c7f8a Merge branch 'testta_ly' into 'master' 
* Add switchDB by tests.

See merge request easycorp/zentaopms!4862
 2022-08-09 06:26:52 +00:00
李玉春 574a10bbf3 Merge branch 'cyy_testcase' into 'master' 
* Add gitea test case.

See merge request easycorp/zentaopms!4837
 2022-08-08 09:22:56 +00:00
liyuchun a9661e5718 * Fix bug #25176. 2022-08-07 08:40:43 +00:00
liyuchun 54488775af Add unit cases. 2022-08-05 07:13:10 +00:00
liyuchun 54c81c82e2 * Add unit case. 2022-08-05 07:06:35 +00:00
liyuchun 6b816acb9e Merge branch 'master' into liyuchun_unittest 2022-08-05 05:13:50 +00:00
liyuchun 809f6510c3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-05 05:12:51 +00:00
liyuchun 02b18d8174 * Fix error of zentao.sql 2022-08-05 05:12:32 +00:00
李玉春 8209f2919f Merge branch 'cyy_test' into 'master' 
* Add gitlab test case.

See merge request easycorp/zentaopms!4804
 2022-08-05 00:33:18 +00:00
李玉春 298342fedf Merge branch 'testta_ly' into 'master' 
Testta ly

See merge request easycorp/zentaopms!4777
 2022-08-04 01:37:56 +00: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
李玉春 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
李玉春 ed719f768f Merge branch 'sprint/221_tianshujie_62947' into 'master' 
Sprint/221 tianshujie 62947

See merge request easycorp/zentaopms!4761
 2022-08-03 06:52:24 +00:00
李玉春 e8e657e6bb Update model.php 2022-08-03 06:52:05 +00:00
李玉春 b8a08650b6 Merge branch 'sprint/221_liumengyi_25987' into 'master' 
* Fix bug #25987.

See merge request easycorp/zentaopms!4759
 2022-08-03 06:38:41 +00:00
李玉春 d9d807c79d Merge branch 'sprint/221_liumengyi_25965' into 'master' 
* Fix bug #25965.

See merge request easycorp/zentaopms!4756
 2022-08-03 05:43:46 +00:00
李玉春 b7e845f6b5 Merge branch 'sprint/221_liumengyi_25964' into 'master' 
* Fix bug #25964.

See merge request easycorp/zentaopms!4757
 2022-08-03 05:43:20 +00:00
李玉春 9ec11b0fd8 Merge branch 'sprint/211_liumengyi_25978' into 'master' 
* Fix bug #25978.

See merge request easycorp/zentaopms!4758
 2022-08-03 05:42:30 +00:00
李玉春 0083ac3f07 Merge branch 'sprint/211_liumengyi_fixbug' into 'master' 
* Fix bug #25968.

See merge request easycorp/zentaopms!4755
 2022-08-03 05:42:19 +00:00
李玉春 0f0a48e090 Merge branch 'sprint/211_liumengyi_25967' into 'master' 
* Fix bug #25967.

See merge request easycorp/zentaopms!4754
 2022-08-03 05:41:50 +00: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
李玉春 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
李玉春 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
李玉春 087fae02ed Merge branch 'cyy_bug' into 'master' 
Cyy bug

See merge request easycorp/zentaopms!4705
 2022-07-28 09:17:53 +00:00
李玉春 580bb4dc22 Merge branch 'cyy_gitea' into 'master' 
Cyy gitea

See merge request easycorp/zentaopms!4702
 2022-07-28 05:11:07 +00:00
李玉春 1dd7771fdc Merge branch 'sprint/ZUI_guofeilong_add_icon_ZTF' into 'master' 
* Add Icon ZTF

See merge request easycorp/zentaopms!4674
 2022-07-27 03:46:14 +00:00
李玉春 8e0a5d4eee Merge branch 'cyy_git_tag' into 'master' 
* Modify tag get.

See merge request easycorp/zentaopms!4670
 2022-07-27 02:10:11 +00:00
liyuchun 26cf62842d Merge branch 'cyy_repo' 2022-07-27 00:32:59 +00:00
李玉春 8fe00ca4cd Merge branch 'master' into 'cyy_repo' 
# Conflicts:
#   db/update17.3.sql
 2022-07-27 00:31:56 +00:00
李玉春 0ae6d0440f Merge branch 'cyy_optimize' into 'master' 
Cyy optimize

See merge request easycorp/zentaopms!4648
 2022-07-26 05:06:07 +00:00
李玉春 373ab4688d Merge branch 'cyy_mr' into 'master' 
Cyy mr

See merge request easycorp/zentaopms!4643
 2022-07-26 00:43:47 +00:00
liyuchun 721b8d31c0 * Fix error when create mr. 2022-07-18 01:55:31 +00:00
李玉春 47de3500d0 Merge branch 'cyy_20308' into 'zenops_38' 
* Fix bug #20308.

See merge request easycorp/zentaopms!4581
 2022-07-15 07:27:47 +00:00
liyuchun fc61e1c142 * Fix bug #25251. 2022-07-15 06:49:47 +00:00
liyuchun 07f8b57e68 * Fix bug #25153. 2022-07-15 05:28:09 +00:00
liyuchun ae06366f2a * Fix bug #25283. 2022-07-15 05:09:12 +00:00
李玉春 51b2242326 Liyuchun fixbug 2022-07-15 03:14:43 +00:00
liyuchun 460e4cf336 * Fix bug #25266. 2022-07-15 01:06:24 +00:00
liyuchun 9b26371429 * Fix bug #25247. 2022-07-15 00:59:08 +00:00
李玉春 ca8b69dbea Merge branch 'liyuchun_gitea_commit' into 'zenops_38' 
* Finish task #60568.

See merge request easycorp/zentaopms!4557
 2022-07-15 00:25:53 +00:00
李玉春 6cac2d67fe Merge branch 'sprint/wangzemei/25316' into 'master' 
* Fix bug #25316

See merge request easycorp/zentaopms!4558
 2022-07-14 09:14:33 +00:00
liyuchun e48c1a42e3 * Finish task #60568. 2022-07-14 09:02:35 +00:00
李玉春 4ef6a71580 Merge branch 'cyy_bug' into 'zenops_38' 
* Modify diff files.

See merge request easycorp/zentaopms!4556
 2022-07-14 08:47:37 +00:00
李玉春 35b040e0b7 Merge branch 'cyy_bug' into 'zenops_38' 
* Fix bug #25152.

See merge request easycorp/zentaopms!4548
 2022-07-14 08:33:45 +00:00
李玉春 441199c317 Merge branch 'sprint/tianshujie_lang' into 'master' 
* Fix bug #25309.

See merge request easycorp/zentaopms!4555
 2022-07-14 08:28:45 +00:00
liyuchun 7568168616 * Finish task #60454. 2022-07-14 08:04:34 +00:00
李玉春 02487dc133 Merge branch 'cyy_commit' into 'zenops_38' 
Cyy commit

See merge request easycorp/zentaopms!4541
 2022-07-14 05:04:13 +00:00
李玉春 b262631c74 Merge branch 'cyy_gitea_hideBtn' into 'zenops_38' 
* Hide gitea btn.

See merge request easycorp/zentaopms!4538
 2022-07-14 05:03:13 +00:00
李玉春 b97ccec787 Merge branch 'gitea_module' into 'master' 
* Modify upgrade module.

See merge request easycorp/zentaopms!4537
 2022-07-14 02:44:53 +00:00
liyuchun c2f36659eb Merge branch 'zenops_38' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_38 2022-07-14 00:53:20 +00:00
liyuchun 6102e2df6a * Modify gitlab to git service in repo module. 2022-07-14 00:53:13 +00:00
liyuchun 202541b418 * Modify gitlab to git service in repo module. 2022-07-14 00:52:04 +00:00
李玉春 8ba5ebbfa2 Merge branch 'cyy_gitea' into 'zenops_38' 
* Modify upgrade module.

See merge request easycorp/zentaopms!4524
 2022-07-14 00:49:00 +00:00
李玉春 85f2d7235a Merge branch 'cyy_diff' into 'zenops_38' 
* Modify diff function.

See merge request easycorp/zentaopms!4514
 2022-07-14 00:40:51 +00:00
李玉春 7732038651 Merge branch 'cyy_bug' into 'zenops_38' 
* Adjust codes.

See merge request easycorp/zentaopms!4505
 2022-07-13 05:46:07 +00:00
李玉春 4559f97038 Merge branch 'cyy_bug' into 'zenops_38' 
Fix bug and optimize repo load.

See merge request easycorp/zentaopms!4497
 2022-07-13 03:18:58 +00:00
李玉春 d99ad53452 Merge branch 'cyy_merge' into 'zenops_38' 
Merge master codes.

See merge request easycorp/zentaopms!4488
 2022-07-13 00:33:00 +00:00
李玉春 a5e27695d6 Merge branch 'cyy_60454' into 'zenops_38' 
* Finish task #60454.

See merge request easycorp/zentaopms!4484
 2022-07-12 09:02:58 +00:00
liyuchun b3c4e3075b * Adjust lang error. 2022-07-12 09:00:40 +00:00
liyuchun 945a5d2af0 * Finish task #60569. 2022-07-12 08:54:17 +00:00
liyuchun f516d6713e * Adjust bind user. 2022-07-12 08:34:40 +00:00
李玉春 434381c6bf Merge branch 'cyy_repo' into 'zenops_38' 
Cyy repo

See merge request easycorp/zentaopms!4481
 2022-07-12 08:20:10 +00:00
李玉春 e9aca4fa0d Merge branch 'sprint/wangzemei/23827' into 'master' 
* Code for bug #23827

See merge request easycorp/zentaopms!4482
 2022-07-12 08:11:15 +00:00
liyuchun 0c420911a7 * Finish task #60452. 2022-07-12 08:02:28 +00:00
李玉春 4d6d9e4181 Merge branch 'sprint/wangzemei/bug23827' into 'master' 
* Code for bug #23827

See merge request easycorp/zentaopms!4478
 2022-07-12 07:27:02 +00:00
liyuchun 6cef93edd9 * Finish task #60453. 2022-07-12 06:30:13 +00:00
李玉春 bf59409a1f Merge branch 'cyy_60565' into 'zenops_38' 
Finish task #60565,60566.

See merge request easycorp/zentaopms!4465
 2022-07-12 05:20:42 +00:00
李玉春 0542089291 Merge branch 'sprint/wangzemei/bug24836' into 'master' 
* Fix bug #24836

See merge request easycorp/zentaopms!4458
 2022-07-11 09:34:24 +00:00
liyuchun 625631c625 * Adjust scm. 2022-07-11 08:59:50 +00:00
liyuchun 23de383c83 * Finish task #60452. 2022-07-11 08:57:24 +00:00
李玉春 a5b2c8de20 Merge branch 'sprint/wangzemei/25041' into 'master' 
* Fix bug #25041

See merge request easycorp/zentaopms!4448
 2022-07-11 06:11:53 +00:00
liyuchun 69871d4c69 * Fix bug when download code zip. 2022-07-08 06:35:36 +00:00
李玉春 be3823aa09 Merge branch 'cyy_25032' into 'master' 
* Fix bug #25032.

See merge request easycorp/zentaopms!4436
 2022-07-08 06:23:43 +00:00
李玉春 30401195fa Merge branch 'sprint/wangzemei/59544_1' into 'master' 
Sprint/wangzemei/59544 1

See merge request easycorp/zentaopms!4437
 2022-07-08 05:57:16 +00:00
liyuchun 0951f5b56d * Fix bug #24840,24821. 2022-07-08 01:45:48 +00:00
liyuchun 18c28227bb * Finish task #59432. 2022-07-07 09:00:25 +00:00
李玉春 ce18e2e476 Merge branch 'master' into 'liyuchun_59430' 
# Conflicts:
#   module/repo/control.php
 2022-07-07 05:59:30 +00:00
李玉春 c392efc4e4 Merge branch 'cyy_59430' into 'master' 
* Finish task #59430.

See merge request easycorp/zentaopms!4404
 2022-07-07 05:57:05 +00:00
liyuchun 7784dfa80d * Finish task #59434. 2022-07-07 05:56:33 +00:00
李玉春 e06426f77f Merge branch 'cyy_bug' into 'master' 
* Modify back btn.

See merge request easycorp/zentaopms!4397
 2022-07-07 05:54:54 +00:00
liyuchun 92988c9386 * Finish task #59432,59434. 2022-07-07 05:53:56 +00:00
李玉春 c69b9e32d5 Merge branch 'cyy_gitea' into 'master' 
Add Gitea module.

See merge request easycorp/zentaopms!4390
 2022-07-07 01:56:40 +00:00
李玉春 0842185bfc Merge branch 'cyy_repo' into 'master' 
Cyy repo

See merge request easycorp/zentaopms!4376
 2022-07-06 09:01:15 +00:00
李玉春 cf979d3bbb Merge branch 'sprint/wangzemei/task59575' into 'master' 
* Code for task#59575

See merge request easycorp/zentaopms!4377
 2022-07-06 06:49:49 +00:00
李玉春 7838ff2ac6 Merge branch 'cyy_gitlab' into 'master' 
* Modify gitlab access check.

See merge request easycorp/zentaopms!4346
 2022-07-06 00:17:14 +00:00
liyuchun 04194dbe56 * Finish task #59450,59449. 2022-07-05 09:06:35 +00:00
liyuchun 8a3d924e2b * Finish task #59451. 2022-07-05 08:42:48 +00:00
李玉春 c1f66467cd Merge branch 'cyy_59436' into 'master' 
Finish task 59436

See merge request easycorp/zentaopms!4335
 2022-07-05 05:52:18 +00:00
liyuchun 0044a55b76 * Finish task #59439. 2022-07-05 05:48:02 +00:00
李玉春 1a84516991 Merge branch 'sprint/wangzemei/task59519' into 'master' 
* Finish task #59519

See merge request easycorp/zentaopms!4338
 2022-07-05 05:43:28 +00:00
liyuchun a94497ea89 * Code for task #59439. 2022-07-05 01:23:26 +00:00
liyuchun ce96f41693 Merge remote-tracking branch 'origin/cyy_gitlab' 2022-07-05 00:45:11 +00:00
李玉春 75f251b9c3 Merge branch 'master' into 'cyy_gitlab' 
# Conflicts:
#   module/common/lang/menu.php
 2022-07-05 00:44:06 +00:00
liyuchun dd893ce8e1 * Finish task #59437,59438. 2022-07-04 07:36:29 +00:00
李玉春 9a8e678bff Merge branch 'zenops_37' into 'master' 
Zenops 37

See merge request easycorp/zentaopms!4314
 2022-07-04 05:41:24 +00:00