Commit Graph
2914 Commits
Author SHA1 Message Date
guofeilong 3593dc29fe * rollback pointer-events none out table 2022-07-05 02:03:39 +00:00
wangzemei 580085c24c * Fix bug24134 2022-07-01 09:07:44 +00:00
wangzemei 85e14d173a * Fix bug24393 2022-07-01 04:23:39 +00:00
王怡栋 b603b540ba Merge branch 'sprint/electron_zentao_style' into 'master'
* mv style.

See merge request easycorp/zentaopms!4296
2022-07-01 01:41:28 +00:00
dingyongliang eb3fb5ea71 * mv style. 2022-07-01 01:39:33 +00:00
guofeilong aaccdf4460 Revert "* fix bug #24581 in ZUI"
This reverts commit 23a07709fd.
2022-06-30 09:49:32 +00:00
guofeilong 23a07709fd * fix bug #24581 in ZUI 2022-06-30 07:36:50 +00:00
Hao Sun 0507500556 * optimize apps loading state. 2022-06-30 03:46:27 +00:00
zhujinyong 467b958ba0 * If run in container, no need check ok.txt. 2022-06-29 16:35:39 +08:00
Hao Sun 83c7f37ed4 * change default option for picker. 2022-06-28 01:48:23 +00:00
朱金勇 4f017f5e1d Merge branch 'sprint/sunhao/picker' into 'master'
* hide picker dropmenu on page scrolling.

See merge request easycorp/zentaopms!4142
2022-06-27 06:11:14 +00:00
wangyuting2 ad87d0c7da * Fix bug #23595. 2022-06-27 09:33:28 +08:00
Hao Sun 65f280ae66 * hide picker dropmenu on page scrolling. 2022-06-24 08:13:00 +00:00
xieqiyu 649633f5bc * Finish task#57869. 2022-06-24 11:28:40 +08:00
王怡栋 8ad9dea460 Merge branch 'sprint/xuan_106' into 'master'
Sprint/xuan 106

See merge request easycorp/zentaopms!4126
2022-06-24 01:35:58 +00:00
dingyongliang 7963845b6b * mv style to x.style.css. 2022-06-24 01:32:03 +00:00
zhujinyong ac574675d8 Merge branch 'sprint/sunhao/picker' 2022-06-23 17:52:13 +08:00
朱金勇 251593ac46 Merge branch 'sprint/sunhao/bug24187' into 'master'
* bug #24187, update picker to support for using picker for form controls with same id.

See merge request easycorp/zentaopms!4107
2022-06-23 09:18:34 +00:00
Hao Sun 2246f3a7ed * fix js error when create picker from a select element without any options. 2022-06-23 08:24:54 +00:00
Hao Sun 099280bab5 * bug #24187, update picker to support for using picker for form controls with same id. 2022-06-23 06:51:02 +00:00
xieqiyu 6838010353 * Code for task#57850. 2022-06-23 14:33:28 +08:00
Hao Sun d4e1f8a835 * task #57850, fix selected options not show in picker. 2022-06-23 05:18:52 +00:00
Hao Sun 631e65c121 * update picker lib. 2022-06-22 12:24:05 +00:00
Hao Sun cdb889d707 * update picker with new option "checkable". 2022-06-22 09:18:22 +00:00
dingyongliang 7111fcced8 * electron/zentao: rm image width. 2022-06-22 07:06:51 +00:00
wangzemei f81ffb5c98 * fix bug 23919 2022-06-20 06:07:39 +00:00
孙广明 11c5cd1999 Merge branch 'sprint/sunhao/apps_loading_state' 2022-06-18 00:10:31 +08:00
Hao Sun 584bf73577 * update zui lib. 2022-06-17 15:54:16 +00:00
Hao Sun a8d212e213 * fix table with nested option not work as expected. 2022-06-17 15:18:08 +00:00
Hao Sun 775746df0a * optimize program list, support to preserve nested state. 2022-06-17 07:31:51 +00:00
zhujinyong a0d1f7cd4b Merge branch 'sprint/sunhao/task56927' 2022-06-16 08:30:31 +08:00
Hao Sun 56c5f05071 * optimize mini burn chart, support empty data. 2022-06-15 10:05:36 +00:00
zhujinyong b2bf48c7d3 Merge branch 'sprint/sunhao/task56942' 2022-06-15 17:58:22 +08:00
zhujinyong b8189edbf7 Merge branch 'sprint/sunhao/picker' 2022-06-15 17:53:37 +08:00
Hao Sun 60f23970ba * task #56942, optimize UI for task create form. 2022-06-15 09:53:25 +00:00
zhujinyong dfcada81f1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-06-15 17:52:37 +08:00
Hao Sun 5b99adf765 * optimize style for labels with outline. 2022-06-15 07:30:51 +00:00
Hao Sun 315045fd83 * update picker and support to use new option 'minAutoDropWidth' 2022-06-15 07:06:00 +00:00
Hao Sun 4d3d426cc9 * update kanban lib. 2022-06-15 06:05:34 +00:00
Hao Sun 82fdb1382b * update zui lib. 2022-06-15 06:05:25 +00:00
zhujinyong 87f50aa3be Merge branch 'sprint/sunhao/task56391' 2022-06-14 17:12:21 +08:00
Hao Sun 7e78d28966 * update picker lib. 2022-06-14 08:32:25 +00:00
Hao Sun 44f7de103a * update zui files. 2022-06-14 08:11:13 +00:00
zhujinyong d4a23c5d00 Merge branch 'sprint/sunhao/task56924' 2022-06-14 16:03:23 +08:00
Hao Sun 2f234eef8f * task #56924, optimize style for checkboxes and radioes. 2022-06-14 06:12:42 +00:00
Hao Sun bb0d1e58c2 * update kanban lib, fix option "sortable" not work sometimes. 2022-06-14 05:23:54 +00:00
hufangzhou 6277a6bc78 * Remove the unused code. 2022-06-13 13:54:24 +08:00
王怡栋 fd0cb543ba Merge branch 'master' into 'sprint_200'
# Conflicts:
#   module/execution/lang/en.php
#   module/execution/lang/zh-cn.php
#   module/execution/view/kanban.html.php
#   module/kanban/css/space.css
2022-06-09 03:16:20 +00:00
wangyidong 11e6edcd22 Merge branch 'zdoo18' 2022-06-08 17:06:07 +08:00
朱金勇 fbab734791 Merge branch 'sprint/200_sunhao/task56369' into 'sprint_200'
* task #56369, optimize btn style in kanban header.

See merge request easycorp/zentaopms!3784
2022-06-08 07:53:22 +00:00