Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
32,075 Commits 2 Branches 292 Tags
5cf82c2ad06131bdc130cf5c80cd14bfcb894008
Commit Graph
32075 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
孙广明 906641d301 Revert "Merge branch 'sprint/181_tianshujie_sql' into 'master'" 
This reverts merge request !1153
 2021-12-27 09:25:00 +00:00
tianshujie 593cabd96c * Modify variable name. 2021-12-27 17:20:47 +08:00
孙广明 0d73915c49 Merge branch 'sprint/181_liumengyi_29103' into 'master' 
* Finish task#46655.

See merge request easycorp/zentaopms!1155
 2021-12-27 09:19:24 +00:00
tianshujie 27319feba9 * Finish task #46657. 2021-12-27 17:11:29 +08:00
liumengyi a7e1623064 * Finish task#46655. 2021-12-27 15:53:34 +08:00
王怡栋 85ae7e23cb Merge branch 'sprint/178_hufangzhou_xuanxuan' into 'master' 
* Fix an error for xuanxuan.

See merge request easycorp/zentaopms!1154
 2021-12-27 07:51:11 +00:00
hufangzhou e73cd865c1 * Fix an error for xuanxuan. 2021-12-27 15:49:15 +08:00
孙广明 97ed7c1be6 Merge branch 'sprint/181_tianshujie_sql' into 'master' 
* Add sql file.

See merge request easycorp/zentaopms!1153
 2021-12-27 07:31:39 +00:00
tianshujie e2dcd9c5a9 * Add sql file. 2021-12-27 15:23:14 +08:00
孙广明 7f6d93632a Merge branch 'Modify_code' into 'master' 
* Modify code.

See merge request easycorp/zentaopms!1152
 2021-12-27 05:23:27 +00:00
mayue 697b2fd318 * Modify code. 2021-12-27 13:20:57 +08:00
孙广明 0cd459d5b8 Merge branch 'sprint/179_sunhao/kanban_dropmenu' into 'master' 
* Fix kanban dropmenu not work as expected.

See merge request easycorp/zentaopms!1151
 2021-12-27 05:04:40 +00:00
Hao Sun 9e96f6a49e * Fix kanban dropmenu not work as expected. 2021-12-27 11:54:33 +08:00
朱金勇 8ce5511ecb Merge branch 'sprint/179_sunhao/contextmenu' into 'master' 
* Fix contextmenu not work in dropdown mode.

See merge request easycorp/zentaopms!1149
 2021-12-27 03:38:20 +00:00