Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
32,091 Commits 2 Branches 292 Tags
137281f8fbec3f5eaa97c99a2f5cdf41dfa18fe5
Commit Graph
32091 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
tianshujie 137281f8fb Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/181_tianshujie_46672 2021-12-30 08:40:26 +08:00
tianshujie cc81db0ddc * Finish task #46667. 2021-12-30 08:24:38 +08:00
孙广明 e8f23a5c01 Merge branch 'sprint/181_liumengyi_checkDate' into 'master' 
* Add judgment for plan start.

See merge request easycorp/zentaopms!1182
 2021-12-29 09:51:36 +00:00
liumengyi 0ed240c378 * Add judgment for plan start. 2021-12-29 17:29:45 +08:00
李玉春 f92963a68a Merge branch 'sgm_plan' into 'master' 
* Code for php8.0.

See merge request easycorp/zentaopms!1181
 2021-12-29 09:22:34 +00:00
孙广明 aa60c24da5 * Fix code comment. 2021-12-29 17:19:31 +08:00
孙广明 7b23296aa0 Merge branch 'sprint/181_liumengyi_fixbug' into 'master' 
* Modify plan status flow judgment method.

See merge request easycorp/zentaopms!1180
 2021-12-29 09:16:30 +00:00
liumengyi 1250dca867 * Modify plan flow button. 2021-12-29 17:13:16 +08:00
孙广明 3d3d4130dd * Code for php8.0. 2021-12-29 16:59:54 +08:00
liumengyi ba9f61de07 * Modify plan status flow judgment method. 2021-12-29 16:31:46 +08:00
王怡栋 c1ffbd839a Merge branch 'sprint/liyuchun_devops' into 'master' 
Sprint/liyuchun devops

See merge request easycorp/zentaopms!1137
 2021-12-29 08:04:37 +00:00
孙广明 408f88a177 Merge branch 'sprint/180_songchenxuan_fix_plan_bug' into 'master' 
*Fix plan bug.

See merge request easycorp/zentaopms!1179
 2021-12-29 07:52:05 +00:00
songchenxuan c483052818 *Fix plan bug. 2021-12-29 15:50:49 +08:00
孙广明 70911e06da Merge branch 'sprint/181_tianshujie_kanban' into 'master' 
Sprint/181 tianshujie kanban

See merge request easycorp/zentaopms!1178
 2021-12-29 06:47:25 +00:00
tianshujie 5cf82c2ad0 * Remove the copy card function. 2021-12-29 14:41:47 +08:00
tianshujie f9f726270e * Finish task #46667. 2021-12-29 14:35:09 +08:00
tianshujie 510547f7ea * Fix the real-time update of the Kanban board. 2021-12-29 10:41:05 +08:00
孙广明 378b77cec7 Merge branch 'sprint/181_tianshujie_kanban' into 'master' 
* Finish task #46657.

See merge request easycorp/zentaopms!1156
 2021-12-29 02:32:07 +00:00
tianshujie 2bb67b955f * Modify code logic. 2021-12-29 10:25:28 +08:00
tianshujie 15c13057d0 * Adjust the query plan logic. 2021-12-29 09:36:57 +08:00
tianshujie 541aeaba80 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/181_tianshujie_kanban 2021-12-29 08:43:34 +08:00
liumengyi 2c8db966ea * Finish task #46656. 2021-12-28 17:14:14 +08:00
tianshujie 8e90b750aa Merge branch 'sprint/181_tianshujie_kanban' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/181_tianshujie_kanban 2021-12-28 17:12:52 +08:00
tianshujie 830f551425 * Modify the code. 2021-12-28 17:12:30 +08:00
liumengyi 0eaf072959 * Finish task #46656. 2021-12-28 17:12:16 +08:00
tianshujie 6a6322044e Merge branch 'sprint/181_tianshujie_kanban' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/181_tianshujie_kanban 2021-12-28 16:59:36 +08:00
tianshujie 545438e452 * Finisht task #46666,#46668,#46659,#46658. 2021-12-28 16:56:38 +08:00
朱金勇 dbe64a36a7 Merge branch 'sprint/178_hufangzhou_budget' into 'master' 
* Fix bugs for compatible 8.0.

See merge request easycorp/zentaopms!1170
zentaopms_16.0 		2021-12-28 08:27:49 +00:00
hufangzhou 2f58499fee * Fix bugs for compatible 8.0. 2021-12-28 16:26:08 +08:00
zhujinyong 8407a4a105 * Adjust code for PHP8. 2021-12-28 16:21:57 +08:00
zhujinyong ede915fce2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-28 16:15:37 +08:00
zhujinyong 3dbabdf6af * Adjust code for PHP8. 2021-12-28 16:15:20 +08:00
liumengyi 50efcdf342 * Finish task #46661. 2021-12-28 15:59:57 +08:00
liumengyi 36e9b91ba0 * Finish task #46660. 2021-12-28 15:11:27 +08:00
朱金勇 3b0c8488f0 Merge branch 'sprint/178_hufangzhou_php8.0' into 'master' 
* Fix bug for compatible php8.0 .

See merge request easycorp/zentaopms!1165
 2021-12-28 06:48:41 +00:00
hufangzhou 1a5adfe15f * Fix bug for compatible php8.0 . 2021-12-28 14:46:10 +08:00
zhujinyong df07ada2b3 * Fix path of api. 2021-12-28 14:34:12 +08:00
zhujinyong 6b20c11c88 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-28 14:34:06 +08:00
朱金勇 18ffc67c8f Merge branch 'sprint/178_hufangzhou_18014' into 'master' 
* Fix bug #18014.

See merge request easycorp/zentaopms!1161
 2021-12-28 02:21:15 +00:00
hufangzhou 30d2fb6cfa * Fix bug #18014. 2021-12-28 10:19:20 +08:00
zhujinyong 3183c8fe20 * Format sql. 2021-12-28 10:19:05 +08:00
朱金勇 aa5fabe52c Merge branch 'liwenrui_fix_xuan_webview_width' into 'master' 
* fix webview window width in zentaoclient.

See merge request easycorp/zentaopms!1160
 2021-12-28 01:31:31 +00:00
Wenrui LI 6c152d01f9 * fix webview window width in zentaoclient. 2021-12-28 09:11:02 +08:00
zhujinyong ded29fd6b8 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-28 08:20:21 +08:00
zhujinyong a0797b61db * Fix bug: remove $this. 2021-12-28 08:19:59 +08:00
孙广明 2ebe537d7a Merge branch 'sprint/178_hufangzhou_branch' into 'master' 
* Fix bug #17999.

See merge request easycorp/zentaopms!1159
 2021-12-27 10:08:53 +00:00
hufangzhou 44783c6933 * Fix bug #17999. 2021-12-27 18:08:09 +08:00
李玉春 1d43e4d994 Merge branch 'revert-0d73915c' into 'master' 
Revert "Merge branch 'sprint/181_liumengyi_29103' into 'master'"

See merge request easycorp/zentaopms!1158
 2021-12-27 09:26:30 +00:00
李玉春 dcf8be9a81 Merge branch 'revert-97ed7c1b' into 'master' 
Revert "Merge branch 'sprint/181_tianshujie_sql' into 'master'"

See merge request easycorp/zentaopms!1157
 2021-12-27 09:26:17 +00:00
孙广明 d1f8a778c0 Revert "Merge branch 'sprint/181_liumengyi_29103' into 'master'" 
This reverts merge request !1155
 2021-12-27 09:25:34 +00:00