Commit Graph
2791 Commits
Author SHA1 Message Date
Hao Sun f1be1d87bb * bug #18283, prevent go prev/next item by hotkey when page has focused form control. 2022-04-01 14:09:02 +08:00
Hao Sun 3c112ad155 * bug #21345, fix build name not show as expected in chosen dropdown. 2022-03-31 17:19:43 +08:00
Hao Sun 123aec72c4 * bug #18424, optimize d-n-d UI for kanban, finish drag action when mouse leave document. 2022-03-31 08:42:36 +08:00
zenggang 5ceeb72655 * Finish task#51117 2022-03-30 02:43:34 +00:00
朱金勇 7d6e2bac72 Merge branch 'sprint/sunhao/bug21174' into 'master'
* bug #21174, fix markdown preview not work as expected.

See merge request easycorp/zentaopms!2577
2022-03-28 09:01:06 +00:00
Hao Sun 710121485f * bug #19123, skip to check iframe when url has "_single" param for debug mode. 2022-03-28 15:41:55 +08:00
Hao Sun 0cf598f418 * bug #21174, fix markdown preview not work as expected. 2022-03-28 14:09:23 +08:00
朱金勇 9c675f316c Merge branch 'sprint/sunhao/bug19123' into 'master'
* try to redirect to index/index when access iframe page directly.

See merge request easycorp/zentaopms!2557
2022-03-28 02:32:57 +00:00
Hao Sun 42d64882f0 * fix version switcher button style for theme "blue". 2022-03-28 09:59:36 +08:00
Hao Sun 56e9a9ce9d * try to redirect to index/index when access iframe page directly. 2022-03-25 20:48:18 +08:00
Hao Sun b818f4054a * bug #11279, fix hotkey up/down with datetimepicker not work in batch action page. 2022-03-25 13:13:29 +08:00
songchenxuan a7a5c69722 *English features. 2022-03-25 09:25:44 +08:00
朱金勇 5900a80918 Merge branch 'sprint/sunhao/fix_maincontent_confusion' into 'master'
* fix columns layout confusion.

See merge request easycorp/zentaopms!2523
2022-03-25 01:11:44 +00:00
Hao Sun eb815ce136 * fix mistable for merging zui.js. 2022-03-25 09:01:34 +08:00
Hao Sun 4d12c8b5b6 * fix maincontent confution. 2022-03-25 08:39:44 +08:00
zhujinyong eaf550b617 Merge branch 'sprint/sunhao/bug15206' 2022-03-24 21:23:36 +08:00
Hao Sun c335216ed1 * fix maincontent confution. 2022-03-24 17:30:00 +08:00
Hao Sun f6b6fdd023 * add "onSearchComplete" event to search-list in dropmenu. 2022-03-24 17:06:42 +08:00
Hao Sun 8d043cc467 * update themes. 2022-03-24 17:01:49 +08:00
Hao Sun 539c797bd5 * bug #14569, optimize style for dropmenu. 2022-03-24 17:01:41 +08:00
Hao Sun 834533a5c5 * update kanban lib and fix sortable option not work as expected. 2022-03-24 14:38:40 +08:00
Hao Sun 5c17d72ca9 * fix kanban drop rules not work. 2022-03-24 14:34:17 +08:00
Hao Sun 3169f3326b * bug 15206, fix leftbar disapeared after change theme/lang in tutorial mode. 2022-03-24 10:55:01 +08:00
Hao Sun fcbafd57f0 * fix issue for drag-and-drop cards in kanban. 2022-03-24 09:46:24 +08:00
Hao Sun 3e3e7d43f1 * optimize UI for cards sorting. 2022-03-23 15:00:34 +08:00
Hao Sun fc2ba95091 * optimize UI for common kanban. 2022-03-22 17:18:13 +08:00
tianshujie afcca3cf39 * Fix bug #20828. 2022-03-22 09:13:24 +08:00
王怡栋 9ab0bd99c8 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-22 09:01:14 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
Hao Sun 83b20464e6 * Fix paste image from dingding not work @mayue. 2022-03-21 17:21:20 +08:00
Hao Sun 58cdb8c1b2 * update zui and fix z-index conflict with pager dropmenu for fixed header in datatable. 2022-03-21 15:23:44 +08:00
Hao Sun a1b05a06d6 * update zui to change background color for label ".status-blocked". 2022-03-17 17:11:49 +08:00
王怡栋 eac22108fe * code for story #31383. 2022-03-16 13:25:44 +08:00
zhujinyong 445bd93d3e * Check version. 2022-03-08 09:41:38 +08:00
zhujinyong 43ef4bc43c * Fix upgrade. 2022-03-07 23:00:30 +08:00
Hao Sun 5669a45ac1 * update kanban lib to fix columns layout. 2022-03-04 16:24:26 +08:00
王怡栋 560eac89d9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-03 10:20:47 +08:00
王怡栋 58b1f576bc * fix for api and remove bom and adjust for php8.1. 2022-03-03 10:19:58 +08:00
liyuchun adee975255 Merge branch 'sprint/sunhao/task49295' 2022-03-02 13:48:36 +08:00
Hao Sun cc9790f774 * Bug #20115, fix contextmenu sub items not show in kanban. 2022-03-02 09:12:41 +08:00
Hao Sun 3d2d30363f * fix refresh with app param not work as expected. 2022-03-01 17:49:47 +08:00
Hao Sun 2fc8041453 * Task #49295, optimize UI for avatar. 2022-03-01 13:29:05 +08:00
Hao Sun aa30172fea * Task #49295, optimize UI for avatar. 2022-03-01 13:24:13 +08:00
孙广明 df55b0af1b Merge branch '185' 2022-02-28 08:58:20 +08:00
孙广明 7ba3ed1dfc Merge branch 'spring/185_zhengrunyu_49305' into 'sprint/185'
* Fix bug 19941 19923 19922 19787.

See merge request easycorp/zentaopms!1980
2022-02-25 05:26:24 +00:00
zhengrunyu b641170d85 * Fix bug 19941 19923 19922 19787. 2022-02-25 11:01:31 +08:00
zhujinyong c7708b55cc * Adjust style of vision switcher. 2022-02-24 16:02:17 +08:00
孙广明 9515b94624 * Fix error. 2022-02-23 15:36:52 +08:00
孙广明 0ee66db862 * Code for upgrade. 2022-02-23 13:44:09 +08:00
孙广明 5ff758878e Merge branch 'sprint/185' into 'sprint/185_fixbug_wangyidong'
# Conflicts:
#   module/common/model.php
2022-02-22 00:32:35 +00:00