Commit Graph
27384 Commits
Author SHA1 Message Date
hufangzhou 2f58499fee * Fix bugs for compatible 8.0. 2021-12-28 16:26:08 +08:00
hufangzhou 1a5adfe15f * Fix bug for compatible php8.0 . 2021-12-28 14:46:10 +08:00
hufangzhou 30d2fb6cfa * Fix bug #18014. 2021-12-28 10:19:20 +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
hufangzhou 44783c6933 * Fix bug #17999. 2021-12-27 18:08:09 +08: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
hufangzhou b7ca55d9ca * Adjust the params of createDemoData when manual import. 2021-12-27 11:36:46 +08:00
hufangzhou 488297dcaf * Adjust the sql file name in upgrade. 2021-12-27 09:23:49 +08:00
hufangzhou 6cee36b588 * Get the current account for install or upgrade. 2021-12-27 08:59:00 +08:00
liumengyi 8425897a08 * Fix bug #17939. 2021-12-24 17:25:16 +08:00
孙广明 178e52b999 Merge branch 'sprint/179_tianshujie_bug' into 'master'
* Fix kanban column color problem.

See merge request easycorp/zentaopms!1145
2021-12-24 09:16:52 +00:00
Mr曹 465fbda7f4 * Add language to zentao app. 2021-12-24 17:12:19 +08:00
tianshujie 90e006c45c * Fix kanban column color problem. 2021-12-24 16:11:30 +08:00
孙广明 7a217f9a8b Merge branch 'sprint/179_tianshujie_bug' into 'master'
* Fix bug #17935.

See merge request easycorp/zentaopms!1142
2021-12-24 07:07:03 +00:00
孙广明 37f5ef46b1 Merge branch 'sprint/178_hufangzhou_newVersion' into 'master'
* Add the new version.

See merge request easycorp/zentaopms!1141
2021-12-24 07:06:48 +00:00
hufangzhou dfa1a100ee * Add the fromVersion. 2021-12-24 15:06:11 +08:00
hufangzhou 4b2890c766 * Add the new version. 2021-12-24 15:01:04 +08:00
孙广明 a5176fd46e Merge branch 'sprint/179_tianshujie_bug' into 'master'
* Change assigned to avatar to show up to 3.

See merge request easycorp/zentaopms!1139
2021-12-24 06:58:30 +00:00
孙广明 3f3aad524b Merge branch 'sprint/179_liumengyi_modifyStyle' into 'master'
* Modify style for create card.

See merge request easycorp/zentaopms!1138
2021-12-24 06:56:31 +00:00
tianshujie 547fdbc3d2 * Fix bug #17935. 2021-12-24 14:23:17 +08:00
朱金勇 4afe02de99 Merge branch 'sprint/178_xieqiyu_branch' into 'master'
* Fix bug: batch update branch.

See merge request easycorp/zentaopms!1140
2021-12-24 05:46:31 +00:00
xieqiyu 1491db714d * Fix bug: batch update branch. 2021-12-24 13:45:05 +08:00
朱金勇 00993b8884 Merge branch 'sprint/178_hufangzhou_api' into 'master'
* Add the zentao api lib for upgrade.

See merge request easycorp/zentaopms!1126
2021-12-24 05:42:09 +00:00
tianshujie 572e386eea * Change assigned to avatar to show up to 3. 2021-12-24 13:35:18 +08:00
liumengyi 4979f04de9 * Modify style for create card. 2021-12-24 13:31:12 +08:00
孙广明 a28772a3f6 Merge branch 'sprint/179_liumengyi_17927' into 'master'
* Fix bug #17927.

See merge request easycorp/zentaopms!1136
2021-12-24 05:21:55 +00:00
孙广明 6461596898 Merge branch 'sprint/179_zhengrunyu_codecard' into 'master'
*change position of icon-required.

See merge request easycorp/zentaopms!1135
2021-12-24 05:21:01 +00:00
liumengyi 8be143a091 * Fix bug #17927. 2021-12-24 13:20:15 +08:00
hufangzhou f043a50e5e * Code for task #17919. 2021-12-24 13:20:04 +08:00
zhengrunyu e0b585354d *change position of icon-required. 2021-12-24 13:18:54 +08:00
hufangzhou f02258f8e1 * Fix bug #17919. 2021-12-24 13:16:23 +08:00
朱金勇 55d19cecb2 Merge branch 'sprint/178_xieqiyu_branch' into 'master'
Fix bug#17791.

See merge request easycorp/zentaopms!1132
2021-12-24 05:01:05 +00:00
孙广明 d79b331d83 Merge branch 'sprint/179_tianshujie_bug' into 'master'
Sprint/179 tianshujie bug

See merge request easycorp/zentaopms!1134
2021-12-24 03:21:45 +00:00
tianshujie ff3a24fdbb * Fix bug #17928. 2021-12-24 11:18:22 +08:00
孙广明 8b96fbfaf2 Merge branch 'sprint/179_liumengyi_modifyStyle' into 'master'
* Fix bug #17920.

See merge request easycorp/zentaopms!1133
2021-12-24 03:12:53 +00:00
liumengyi 6863cd05b8 * Fix bug #17920. 2021-12-24 11:11:33 +08:00
xieqiyu 65aa1aebdf * Fix bug#17791. 2021-12-24 11:11:15 +08:00
hufangzhou e28dfd6879 * Add the zentao api lib for install. 2021-12-24 11:08:10 +08:00
tianshujie 686af2b592 * Fix the problem of copy region error. 2021-12-24 11:02:52 +08:00
Hao Sun 272c5c0f40 * Bug #17795, hide contextmenu when scrolling kanban. 2021-12-24 10:58:46 +08:00
hufangzhou 8b82566999 * Fix bug #17924. 2021-12-24 10:53:15 +08:00
hufangzhou 1aeccfed43 * Fix bug #17919. 2021-12-24 10:47:30 +08:00
zenggang 4955bd5450 * Fix bug#17909,17910 2021-12-24 02:46:49 +00:00
王怡栋 790b1d5d81 Merge branch 'sprint/liyuchun_devops' into 'master'
* Fix bug #17912.

See merge request easycorp/zentaopms!1129
2021-12-24 02:41:22 +00:00
liyuchun b94a067297 * Fix bug #17912. 2021-12-24 10:39:18 +08:00
孙广明 e5024013fe Merge branch 'sprint/179_tianshujie_bug' into 'master'
Sprint/179 tianshujie bug

See merge request easycorp/zentaopms!1128
2021-12-24 02:24:02 +00:00
tianshujie 4554b20b3c * Fix bug #17923. 2021-12-24 10:21:54 +08:00