Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
48,948 Commits 2 Branches 292 Tags
fd30e0a0062bb94de6cf1dba4af552da316bbc71
Commit Graph
508 Commits
Author SHA1 Message Date
wangyidong 283b37b65e * adjust for task #77615,77616. 2022-12-01 10:26:12 +08:00
李玉春 743595ea83 Merge branch 'master' into 'devops19' 
# Conflicts:
#   test/model/mr/create.php
 2022-10-08 03:21:38 +00:00
孙广明 09f4edd61f Merge branch 'liyuchun_fixbug_27962' into 'master' 
* Fix bug #27962.

See merge request easycorp/zentaopms!5549
 2022-09-26 08:52:24 +00:00
liyuchun 6a60c85dc8 * Fix bug #27962. 2022-09-26 16:50:58 +08:00
tianshujie f97e85ee2f * Fix bug #27687. 2022-09-22 14:55:34 +08:00
xieqiyu 99e4534f38 Merge branch 'master' into master_xieqiyu_draftStory 2022-08-22 17:29:21 +08:00
liyuchun 6a4299917d * Fix bug #26413. 2022-08-16 08:53:41 +08:00
孙广明 d7a8b587db Merge branch 'liyuchun_64263' into 'zenops_41' 
* Finish task #64263.

See merge request easycorp/zentaopms!4958
 2022-08-15 00:22:26 +00:00
liyuchun 32613a2045 * Finish task #64263. 2022-08-12 17:10:47 +08:00
caoyanyi 9d418966c7 * Modify browse check. 2022-08-12 17:04:29 +08:00
caoyanyi 04780426db * Add branch remove. 2022-08-12 16:56:58 +08:00
caoyanyi 1779f04b4d * Modify mr save log. 2022-08-12 16:45:31 +08:00
xieqiyu 17773dee90 * Code for story of add draft status. 2022-08-12 16:00:00 +08:00
caoyanyi 3cc56c314d * Adjust codes. 2022-08-12 14:27:08 +08:00
caoyanyi 9bf8e1925a * Modify gogos check. 2022-08-12 14:23:19 +08:00
caoyanyi b0ad47a7e9 * Modify edit mr page. 2022-08-11 16:49:11 +08:00
caoyanyi e45d44ccaa Merge branch 'master' into zenops_41 2022-08-11 16:04:36 +08:00
caoyanyi 0e6bc3432e * Modify mr error. 2022-08-11 15:59:51 +08:00
caoyanyi 22a6755bfe * Modify edit mr. 2022-08-11 14:26:04 +08:00
caoyanyi 5011a49dc0 * Modify edit mr. 2022-08-11 14:02:14 +08:00
caoyanyi c2aec6c152 * Add Gogs mr param. 2022-08-11 13:43:07 +08:00
caoyanyi 0b714797e9 * Adjust code. 2022-08-04 08:44:34 +08:00
caoyanyi 7a12986ba1 * Hide gogs mr. 2022-08-04 08:42:57 +08:00
caoyanyi 59a1377e5a * Adjust codes. 2022-08-03 13:52:51 +08:00
caoyanyi eaf6fcdb44 * Adjust codes. 2022-08-01 16:21:05 +08:00
caoyanyi 4b1dde8c7e * Modify gogs repo. 2022-08-01 15:40:55 +08:00
caoyanyi 5493b37c61 * Fix bug #25825. 2022-07-28 13:34:51 +08:00
caoyanyi d9b1d038eb * Modify page style and some bug. 2022-07-28 11:31:24 +08:00
caoyanyi a0d16d3353 * Modify page style. 2022-07-27 14:50:09 +08:00
caoyanyi 87badf85e5 * Optimize pages. 2022-07-27 13:57:27 +08:00
caoyanyi 3b3bf589f9 * Adjust codes. 2022-07-27 08:27:57 +08:00
caoyanyi 91a99a6cdb * Modify mr diff. 2022-07-26 15:21:03 +08:00
caoyanyi 542156de2a * Add actions. 2022-07-26 14:54:48 +08:00
caoyanyi a1ec9e1d9f * Modify css. 2022-07-26 14:40:39 +08:00
caoyanyi 4c8474d335 * Modify gitea use git command. 2022-07-26 14:40:17 +08:00
李玉春 0ae6d0440f Merge branch 'cyy_optimize' into 'master' 
Cyy optimize

See merge request easycorp/zentaopms!4648
 2022-07-26 05:06:07 +00:00
caoyanyi 39120f1ca7 * Adjust codes. 2022-07-26 08:42:03 +08:00
caoyanyi 68468256cd * Optimize pages. 2022-07-25 16:55:08 +08:00
caoyanyi 78e6133a0f * Adjust codes. 2022-07-25 10:37:59 +08:00
caoyanyi f8cd6fe1cb * Finish task #61811,61812. 2022-07-25 09:43:53 +08:00
caoyanyi 9de38d0fe8 * Adjust code. 2022-07-22 15:59:40 +08:00
caoyanyi 37bb83338a * Modify merge resule update. 2022-07-22 15:29:42 +08:00
caoyanyi 0277ee77d0 * Add tips for projects under the server. 2022-07-22 15:20:18 +08:00
caoyanyi 94a3dea3f7 * Optimize pages. 2022-07-22 13:35:54 +08:00
王怡栋 86169fa19c Merge branch 'cyy_bug' into 'master' 
Cyy bug

See merge request easycorp/zentaopms!4631
 2022-07-22 02:24:46 +00:00
caoyanyi eba899076d * Modify merge param. 2022-07-22 10:05:29 +08:00
caoyanyi ce572304aa * Fix bug #25579. 2022-07-22 09:51:45 +08:00
caoyanyi 5b73ba5f36 * Fix bug #25581. 2022-07-22 09:20:02 +08:00
caoyanyi aee9970d4a * Fix bug #25580. 2022-07-22 09:17:57 +08:00
caoyanyi aaeebc1abd * Adjust codes. 2022-07-21 17:01:39 +08:00