Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
38,950 Commits 2 Branches 292 Tags
e71094decc62221da5fc2e4aff3a548806e905ca
Commit Graph
681 Commits
Author SHA1 Message Date
tanghucheng d3dc4ebe43 * Fix bug. 2022-05-17 06:00:26 +00:00
孙广明 a770924dcf Merge branch 'master' into 'sprint/189_mayue_task#53652' 
# Conflicts:
#   module/project/model.php
 2022-05-12 05:01:42 +00:00
zhouxin 3e2181dea0 * Fix bug #22371. 2022-05-12 02:44:37 +00:00
zhouxin 160c0fbcaa * Fix bug #53656. 2022-05-11 08:13:06 +00:00
mayue 98dcd7517f * Optimize code. 2022-05-11 06:38:46 +00:00
zhouxin b015ea5c77 * Finish task #53658. 2022-05-11 01:53:10 +00:00
mayue b625c5e1f2 * Fix bug #21706. 2022-04-22 16:05:13 +08:00
hufangzhou 98153aa83b * Rename the variable. 2022-04-22 15:37:10 +08:00
hufangzhou 0c57308663 * Fix bug #18167. 2022-04-22 15:29:27 +08:00
renying d02cb94ab6 Fixbug#21457 2022-04-21 10:41:24 +08:00
renying b32081bab7 Fixbug#21457 2022-04-21 09:27:36 +08:00
zhouxin 28a842da55 * Fix bug #21434. 2022-04-11 05:58:43 +00:00
孙华伟 5aea0c9ac7 *Optimize the code. 2022-03-28 17:17:13 +08:00
mayue 0a562d579a * Optimize code. 2022-03-28 10:58:58 +08:00
mayue 1dc8f123df * Optimize code. 2022-03-28 10:56:14 +08:00
mayue f184873bca * Fix bug #17402. 2022-03-25 13:45:28 +08:00
孙广明 41eee3ddd4 Merge branch 'master' into 'liyuchun_bug_17235' 
# Conflicts:
#   module/common/model.php
 2022-03-22 07:43:58 +00:00
liyuchun 166cda1186 * Fix bug #17235. 2022-03-22 14:12:44 +08:00
xieqiyu e2fbaa6828 * Fix bug#20396. 2022-03-22 11:10:44 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
xieqiyu 0d21516997 * Modify create bug. 2022-03-22 08:40:43 +08:00
孙华伟 0627138877 *Fix bug 20355 2022-03-21 11:18:06 +08:00
王怡栋 c1f3258a74 * adjust for get dynamic. 2022-03-14 16:08:58 +08:00
tianshujie 03390a6900 * Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303. 2022-03-08 13:01:53 +08:00
孙广明 7b962c4e38 Merge branch 'pailei' 2022-03-07 10:56:26 +08:00
xieqiyu 2b83d5d647 * Fix bug#20385. 2022-03-07 10:45:30 +08:00
tianshujie 85f96e6489 * Fix bug #20260. 2022-03-04 13:49:58 +08:00
孙广明 6873b1061f Merge branch 'sprint/185_xieqiyu_49304' into 'pailei' 
Sprint/185 xieqiyu 49304

See merge request easycorp/zentaopms!2007
 2022-03-01 07:04:26 +00:00
tianshujie b7c3e92e95 * Modify version judgment logic. 2022-02-24 16:17:26 +08:00
xieqiyu 9fa66c3d0f * Code for task#49304. 2022-02-24 14:40:14 +08:00
zhujinyong 5a334ccb86 * Fix bug: return error. 2022-02-22 09:26:31 +08:00
孙广明 c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
xieqiyu 5c4609d302 * Modify review problem. 2021-12-31 15:43:27 +08:00
liyuchun c2da5eefe2 Merge branch 'devops18' 2021-12-31 10:38:04 +08:00
tianshujie f9f726270e * Finish task #46667. 2021-12-29 14:35:09 +08:00
hufangzhou 1a5adfe15f * Fix bug for compatible php8.0 . 2021-12-28 14:46:10 +08:00
liyuchun dc46e684fe * Fix bug #18023. 2021-12-28 14:10:59 +08:00
mayue 697b2fd318 * Modify code. 2021-12-27 13:20:57 +08:00
songchenxuan 5e8b17d6df *Fix bug #17399. 2021-12-23 17:11:35 +08:00
liyuchun 178a45b6b5 Merge branch 'devops17' 2021-12-23 15:15:21 +08:00
hufangzhou 995e01680e * Fix bug #17875. 2021-12-23 13:06:18 +08:00
王怡栋 49bfd2dd18 * adjust for vs code and php8.0. 2021-12-22 15:24:47 +08:00
hufangzhou 5b0923a7a3 * Resolve the issue of merge branch. 2021-12-22 10:07:18 +08:00
zhujinyong 5a1e31adf2 * Refactor getList of branch. 2021-12-21 14:53:05 +08:00
zhujinyong dc4eb9867b * Fix problems of mr. 2021-12-17 13:37:16 +08:00
mayue 4adf6e0a52 * Fix bug #17015. 2021-12-15 17:17:57 +08:00
朱金勇 a14138be45 Merge branch 'sprint/176_xieqiyu_17472' into 'master' 
* Fix bug#17472.

See merge request easycorp/zentaopms!921
 2021-12-14 01:54:13 +00:00
zhujinyong 45cdfc8f59 Merge branch 'xuan' 2021-12-14 09:08:15 +08:00
xieqiyu 559ce03369 * Fix bug#17472. 2021-12-14 08:57:10 +08:00
朱金勇 161233a64f Merge branch 'sprint/176_xieqiyu_45536' into 'master' 
Sprint/176 xieqiyu 45536

See merge request easycorp/zentaopms!884
 2021-12-10 06:15:15 +00:00