Commit Graph
28940 Commits
Author SHA1 Message Date
王怡栋 bcbfdfb8f3 Merge branch 'sprint/172_liyuchun_44367' into sprint/168 2021-11-17 14:41:44 +08:00
王怡栋 b3d6e63430 Merge branch 'sprint/168' into 'sprint/172_liyuchun_44367'
# Conflicts:
#   db/update15.9.sql
2021-11-17 06:38:50 +00:00
李玉春 62f71f78c9 Merge branch 'sprint/168_sunhao/task44358' into 'sprint/168'
* Task #44358, project kanban support drag-and-drop.

See merge request easycorp/zentaopms!481
2021-11-17 05:33:53 +00:00
李玉春 08e9934fa0 Merge branch 'sprint/168_sunhao/improve_kanban' into 'sprint/168'
* Update kanban lib to fix rerender not work as expected and improve d-n-d effect.

See merge request easycorp/zentaopms!460
2021-11-17 05:33:43 +00:00
liyuchun a9fa89985c * Adjust code for task #44367. 2021-11-17 12:50:19 +08:00
Hao Sun ecb8881734 * task #44358, project kanban support drag-and-drop. 2021-11-17 11:01:59 +08:00
Hao Sun daea38d8e2 * improve d-n-d effect for kanban. 2021-11-17 11:00:37 +08:00
liyuchun ee073e0530 * Finish task #44366. 2021-11-17 10:44:15 +08:00
liyuchun a5767ccc13 * Finish task #44366. 2021-11-17 09:35:56 +08:00
李玉春 0ba93971f8 Merge branch 'sprint/168_liumengyi_44354' into 'sprint/168'
* Finish task#44354.

See merge request easycorp/zentaopms!478
2021-11-17 01:18:30 +00:00
liumengyi 3bdd6fe22a * Finish task #44354. 2021-11-17 09:16:28 +08:00
孙广明 4799784a30 Merge branch 'sprint/172_liyuchun_44370' into 'sprint/168'
Sprint/172 liyuchun 44370

See merge request easycorp/zentaopms!475
2021-11-17 00:51:42 +00:00
liyuchun 06d7434989 * Finish task #44367. 2021-11-17 08:26:43 +08:00
liyuchun b5cfba165e * Finish task #44367. 2021-11-16 17:25:30 +08:00
liumengyi d778a69a90 * Finish task #44354. 2021-11-16 17:05:18 +08:00
liumengyi 7e0234fde1 * Finish task #44354. 2021-11-16 17:04:44 +08:00
liyuchun 9362f0941a * Adjust code for task #44730. 2021-11-16 16:30:41 +08:00
Hao Sun 03d8a26ed5 * update kanban lib, fix kanban rerender not work as expected. 2021-11-16 16:27:54 +08:00
liyuchun 412fbb2305 * Finish task #44370. 2021-11-16 16:25:00 +08:00
李玉春 161b76d10c Merge branch 'sprint/168_sgm_16234' into 'sprint/168'
* Fix bug #16234.

See merge request easycorp/zentaopms!466
2021-11-16 06:36:48 +00:00
李玉春 a9eabc20b1 Merge branch 'sprint/168_liumengyi_28727' into 'sprint/168'
* Finish story #28727.

See merge request easycorp/zentaopms!469
2021-11-16 06:36:28 +00:00
李玉春 0a286497a3 Merge branch 'sprint/172_hufangzhou_44362' into 'sprint/168'
* Finish task #44362.

See merge request easycorp/zentaopms!470
2021-11-16 06:35:42 +00:00
liumengyi 61b1e2e9e7 * Finish story #28727. 2021-11-16 14:03:17 +08:00
hufangzhou aef69c87a0 * Finish task #44362. 2021-11-16 14:02:48 +08:00
liumengyi 9a24531c84 * Finish story #28727. 2021-11-16 14:02:24 +08:00
liumengyi 4201517c23 * Finish story #28727. 2021-11-16 13:42:26 +08:00
liumengyi bb13fd8ea0 * Finish story #28727. 2021-11-16 13:41:18 +08:00
孙广明 abde7a1795 Merge branch 'sprint/171_liyuchun_44216' into 'sprint/168'
* Finish task #44216.

See merge request easycorp/zentaopms!467
2021-11-16 01:55:27 +00:00
liyuchun e09374f3b7 * Finish task #44216. 2021-11-16 09:31:52 +08:00
孙广明 9c8c16a476 * Fix bug #16234. 2021-11-16 09:30:39 +08:00
Hao Sun 2c0601b722 * update kanban lib and fix rerender not work as expected. 2021-11-15 16:06:58 +08:00
李玉春 6e2b90bb33 Merge branch 'sprint/168_sgm_waterfall' into 'sprint/168'
* Add measurement menu.

See merge request easycorp/zentaopms!459
2021-11-15 08:05:49 +00:00
孙广明 5fbdcff3c2 * Add measurement menu. 2021-11-15 16:01:16 +08:00
李玉春 9fb523740f Merge branch 'sprint/168_sgm_16129' into 'sprint/168'
Sprint/168 sgm 16129

See merge request easycorp/zentaopms!456
2021-11-15 07:55:10 +00:00
孙广明 184629174c * Adjust create project page. 2021-11-15 15:53:54 +08:00
孙广明 62f06ab604 Merge branch 'sprint/169_tanghucheng_max_44023' into 'sprint/168'
* Finish task #44023 for max.

See merge request easycorp/zentaopms!451
2021-11-15 07:40:44 +00:00
tanghucheng 939023de6d * Finish task #44023 for max. 2021-11-15 10:19:35 +08:00
孙广明 aa50ceb485 Merge branch 'spirnt/171_liyuchun_16208' into 'sprint/168'
* Fix bug #16208.

See merge request easycorp/zentaopms!430
2021-11-15 00:51:01 +00:00
孙广明 e638de03fa Merge branch 'spirnt/171_liyuchun_bug' into 'sprint/168'
* Fix bug #16165.

See merge request easycorp/zentaopms!429
2021-11-15 00:33:26 +00:00
朱金勇 ea65af554a Merge branch 'sprint/168_sunhao/kanban_lib' into 'sprint/168'
* Update kanban component and fix rerender not work with sub columns.

See merge request easycorp/zentaopms!432
2021-11-14 09:46:19 +00:00
李玉春 68653946e5 Merge branch 'sprint/171_sgm_sortwiki' into 'sprint/168'
Sprint/171 sgm sortwiki

See merge request easycorp/zentaopms!435
2021-11-12 05:24:19 +00:00
孙广明 be6d12a15e Merge branch 'sprint/171_liyuchun_16182' into 'sprint/168'
Sprint/171 liyuchun 16182

See merge request easycorp/zentaopms!431
2021-11-12 05:20:24 +00:00
孙广明 4bc3f4c03a * Fix details. 2021-11-12 13:17:37 +08:00
孙广明 7130de00a8 Merge branch 'sprint/168_sunhao/doc_tree_sortable' into 'sprint/168'
* Fix drop shadow element position.

See merge request easycorp/zentaopms!433
2021-11-12 05:13:54 +00:00
孙广明 9d6c421176 * Fix bug #16203. 2021-11-12 13:03:56 +08:00
Hao Sun 2e90a1670a * update kanban component and fix update not work with sub columns. 2021-11-12 11:36:55 +08:00
Hao Sun 6890e9535f * fix drop shadow element position. 2021-11-12 11:35:50 +08:00
liyuchun 1838b65ad1 * Fix bug #16182. 2021-11-12 11:29:46 +08:00
孙广明 70c1981893 * Fix bug #16059. 2021-11-12 11:23:35 +08:00
liyuchun 7dd3525a66 * Fix bug #16163. 2021-11-12 11:17:42 +08:00