Commit Graph
28993 Commits
Author SHA1 Message Date
chaideqing be154ba960 * refactor 2021-11-19 16:12:10 +08:00
chaideqing e792607430 * task #44635, optimize bug card in xuanxuan 2021-11-19 10:04:30 +08:00
孙广明 24d18f9c01 Merge branch 'sprint/172_liyuchun_bug' into 'sprint/168'
Sprint/172 liyuchun bug

See merge request easycorp/zentaopms!535
2021-11-19 00:58:44 +00:00
孙广明 275404e672 Merge branch 'sprint/172_liyuchun_45368' into 'sprint/168'
* Finish task #44368.

See merge request easycorp/zentaopms!533
2021-11-19 00:40:37 +00:00
liyuchun a240c9aa23 * Fix bug #16426,#16393. 2021-11-18 23:17:15 +08:00
liyuchun d188fbd7b8 * Fix bug #16389,#16387. 2021-11-18 22:54:48 +08:00
liyuchun 8980685d6b Merge branch 'sprint/168' of https://gitlab.zcorp.cc/easycorp/zentaopms into 168 2021-11-18 21:56:48 +08:00
李玉春 6feb9a878b Merge branch 'sprint/168_sunhao/improve_product_list' into 'sprint/168'
* Task #44364, improve UI for page product/all.

See merge request easycorp/zentaopms!531
2021-11-18 09:30:27 +00:00
李玉春 683b082095 Merge branch 'sprint/168_sunhao/task44357' into 'sprint/168'
* Task #44357, refactor executions kanban with kanban component and support dnd.

See merge request easycorp/zentaopms!497
2021-11-18 09:23:47 +00:00
李玉春 6d3d9d94e1 Merge branch 'sprint/168_tengfei_16386' into 'sprint/168'
* Edit lang for feedbackby.

See merge request easycorp/zentaopms!522
2021-11-18 09:19:45 +00:00
Hao Sun c2b944d7e9 * adjust table layout for english environment. 2021-11-18 17:08:02 +08:00
Hao Sun 759533f592 * task #44364, improve layout for page product/all. 2021-11-18 16:45:11 +08:00
liyuchun 5705ff994f * Finish task #44368. 2021-11-18 16:25:33 +08:00
李玉春 c71f84f5ef Merge branch 'sprint/168_liumengyi_16390' into 'sprint/168'
* Fix bug #16447.

See merge request easycorp/zentaopms!524
2021-11-18 08:06:24 +00:00
liumengyi 64015056ae * Fix bug #16447. 2021-11-18 16:02:38 +08:00
李玉春 35109f495b Merge branch 'sprint/168_liumengyi_16390' into 'sprint/168'
* Fix bug #16388.

See merge request easycorp/zentaopms!521
2021-11-18 07:41:18 +00:00
李玉春 3e3047843d Update control.php 2021-11-18 07:41:06 +00:00
liumengyi 0e3f80d6d5 * Fix bug #16388. 2021-11-18 15:39:34 +08:00
liumengyi 499d35fe4c * Fix bug #16388. 2021-11-18 15:29:58 +08:00
reneeteng 8c15de95c5 * Edit lang for feedbackby. 2021-11-18 15:21:56 +08:00
Hao Sun 2a3c7922ab * improve UI for product table list. 2021-11-18 15:21:55 +08:00
李玉春 a913818493 Merge branch 'sprint/168_liumengyi_44363' into 'sprint/168'
* Finish task #44363.

See merge request easycorp/zentaopms!515
2021-11-18 06:40:15 +00:00
liumengyi 091f931cda * Finish task #44363. 2021-11-18 14:23:50 +08:00
liumengyi e9d03af319 * Finish task #44363. 2021-11-18 13:40:22 +08:00
李玉春 25558cb8cd Merge branch 'sprint/168_hufangzhou_upgradelang' into 'sprint/168'
* Modify the lang file when merge data for upgrade.

See merge request easycorp/zentaopms!509
2021-11-18 05:37:18 +00:00
hufangzhou 8b651bd59c * Modify the lang file when merge data for upgrade. 2021-11-18 13:35:58 +08:00
李玉春 f6f8ce53d5 Merge branch 'sprint/168_tengfei_16386' into 'sprint/168'
Sprint/168 tengfei 16386

See merge request easycorp/zentaopms!504
2021-11-18 05:34:49 +00:00
李玉春 5c398e8545 Merge branch 'sprint/168_hufangzhou_44361' into 'sprint/168'
Sprint/168 hufangzhou 44361

See merge request easycorp/zentaopms!508
2021-11-18 05:06:43 +00:00
李玉春 4c9a7cd883 Merge branch 'sprint/168_sunhao/update_zui' into 'sprint/168'
* Update selectable component in zui.

See merge request easycorp/zentaopms!487
2021-11-18 05:06:15 +00:00
hufangzhou 21faa0dc2a * Finish task #44361. 2021-11-18 11:30:28 +08:00
reneeteng 811d9ecae7 * Edit lang file for feedbackby interface. 2021-11-18 10:48:53 +08:00
Hao Sun 13d5803ce1 * adjust card style in kanban: remove border. 2021-11-18 10:35:39 +08:00
Hao Sun 5a7dbcbfd3 * change cursor to move for execution item in kanban. 2021-11-18 10:27:44 +08:00
李玉春 2eaa60a19f Merge branch 'sprint/168_liumengyi_16390' into 'sprint/168'
* Fix bug #16390,#16388

See merge request easycorp/zentaopms!496
2021-11-17 10:11:03 +00:00
liumengyi a1ad4a741b * Fix bug #16390,#16388. 2021-11-17 18:09:03 +08:00
hufangzhou 6e1f7dfbf7 * Finish task #44361. 2021-11-17 18:06:48 +08:00
liumengyi 63dfa14f04 * Fix bug #16390,#16388. 2021-11-17 18:04:39 +08:00
Hao Sun ebae1b755e * apply border color with execution status. 2021-11-17 17:56:37 +08:00
Hao Sun a6accd9c50 * refactor: remove console.log. 2021-11-17 17:54:12 +08:00
Hao Sun 6ad007f06e * task #44357, refactor executions kanban with kanban component and support dnd. 2021-11-17 17:51:20 +08:00
liumengyi cac426bb7d * Fix bug #16390,#16388. 2021-11-17 17:49:32 +08:00
liumengyi dc807a53a5 * Fix bug #16390,#16388. 2021-11-17 17:29:08 +08:00
李玉春 94cd6525e4 Merge branch 'sprint/168_liumengyi_16390' into 'sprint/168'
* Fix bug #16390.

See merge request easycorp/zentaopms!490
2021-11-17 08:38:56 +00:00
liumengyi 3e93ba664b * Fix bug #16390. 2021-11-17 16:33:42 +08:00
hufangzhou 0d39951950 * Code for task #44361. 2021-11-17 16:14:53 +08:00
Hao Sun bebdb6eff9 * update selectable component in zui. 2021-11-17 15:34:04 +08:00
李玉春 851430dc48 Merge branch 'sprint/168_liumengyi_44369' into 'sprint/168'
* Finish task #44369.

See merge request easycorp/zentaopms!486
2021-11-17 07:21:54 +00:00
liumengyi 3f6bdc127b * Finish task #44369. 2021-11-17 15:20:28 +08:00
liumengyi d7763fdee5 * Finish task #44369. 2021-11-17 15:16:22 +08:00
liumengyi 641c4ba362 * Finish task #44369. 2021-11-17 15:08:45 +08:00