7970 Commits

Author SHA1 Message Date
chenos
254fd46626 fix: app error render 2024-12-10 12:20:27 +08:00
nocobase[bot]
5210430c19 Merge branch 'next' into develop 2024-12-10 04:03:01 +00:00
nocobase[bot]
ac2f7ea85d Merge branch 'main' into next 2024-12-10 04:02:41 +00:00
Zhi Chen
b58a05764b
fix(user-data-sync): skip unsupported data types during synchronization instead of throwing an error (#5835)
* fix: support sync user when departments plugin disabled

* chore: delete submodule

* fix: support sync user when departments plugin disabled

* chore: add test case

* fix: fix synctasks list acl
2024-12-10 12:02:19 +08:00
Zeke Zhang
2b38c1b79b
fix(Users & Permissions): fix issue with Roles field not displaying c… (#5846)
* fix(Users & Permissions): fix issue with Roles field not displaying content

* chore: make e2e test more stable and skip unstable test
2024-12-10 11:26:52 +08:00
chenos
8a999d02ab
fix(acl): set default available actions (#5847) 2024-12-10 10:50:36 +08:00
Zeke Zhang
70e592e341
fix(custom-request): fix refresh issue (#5845)
* fix(custom-request): fix the issue of not displaying immediately after adding

* test: add e2e test

* fix: fix the issue that blocks added through schema toolbar are not immediately displayed

* chore: make e2e tests more stable
2024-12-10 09:39:36 +08:00
Zeke Zhang
3140edf798
fix: refresh issues (#5838)
* fix(associationField): fix the issue where the configuration popup does not show when reopened

* test: add e2e test

* refactor: extract template code

* chore(e2e): fix e2e error
2024-12-10 00:07:34 +08:00
nocobase[bot]
3a2abcb9a3 Merge branch 'next' into develop 2024-12-09 15:18:15 +00:00
nocobase[bot]
b1ff980926 Merge branch 'main' into next 2024-12-09 15:17:51 +00:00
Katherine
5983a8f819
fix: markdown variables (#5840) 2024-12-09 23:17:24 +08:00
Zeke Zhang
23d7d1e0e3
fix(KeepAlive): prevent hidden pages from affecting interaction with … (#5836)
* fix(KeepAlive): prevent hidden pages from affecting interaction with other pages

* chore: fix build error

* chore: make e2e test more stable
2024-12-09 22:33:20 +08:00
katherinehhh
12df6e42e5 Merge branch 'next' into develop 2024-12-09 20:54:08 +08:00
nocobase[bot]
0913da1e40 Merge branch 'main' into next 2024-12-09 11:35:24 +00:00
Katherine
bda94f9c1b
fix: issue with Markdown string templates not loading data of association variable (#5791)
* fix: issue with Markdown string templates not loading data of association variables

* fix: bug
2024-12-09 19:35:00 +08:00
nocobase[bot]
7633e93b79 chore(versions): 😊 publish v1.6.0-alpha.4 v1.6.0-alpha.4 2024-12-09 09:46:48 +00:00
Sheldon Guo
1a6a5446a1
feat(template-print-support): provide auxiliary support for template printing functionality (#5713)
* chore: update .gitignore to exclude print-templates and modify APIClient type definition
2024-12-09 17:03:44 +08:00
chenyongxin
075ff36042
plugin-calendar add event open method (#5808)
* feat: plugin-calendar-add-event-open-method

* feat: modify plugin-calendar locale file

* feat: modify plugin-calendar locale file
2024-12-09 14:52:55 +08:00
nocobase[bot]
d74c91fcee Merge branch 'main' into next 2024-12-09 06:18:34 +00:00
nocobase[bot]
df055e0b8e docs: update changelogs 2024-12-09 06:18:10 +00:00
nocobase[bot]
339a77905d Merge branch 'main' into next 2024-12-09 06:09:39 +00:00
nocobase[bot]
4bbfbd09cc chore(versions): 😊 publish v1.4.7 v1.4.7 2024-12-09 06:09:22 +00:00
nocobase[bot]
ca1e5442e5 Merge branch 'main' into next 2024-12-09 02:41:11 +00:00
Katherine
49821eee4e
fix: mobile background color display issue (#5809) 2024-12-09 10:40:48 +08:00
nocobase[bot]
504b665d72 chore(versions): 😊 publish v1.6.0-alpha.3 v1.6.0-alpha.3 2024-12-09 02:19:22 +00:00
nocobase[bot]
713cb7abf9 Merge branch 'next' into develop 2024-12-08 23:44:31 +00:00
nocobase[bot]
ec0e597111 Merge branch 'main' into next 2024-12-08 23:44:10 +00:00
nocobase[bot]
779f3480c0 docs: update changelogs 2024-12-08 23:43:43 +00:00
nocobase[bot]
e5761c34d5 Merge branch 'next' into develop 2024-12-08 23:26:06 +00:00
nocobase[bot]
87cc106a11 Merge branch 'main' into next 2024-12-08 23:24:31 +00:00
nocobase[bot]
bb3714261c chore(versions): 😊 publish v1.4.6 v1.4.6 2024-12-08 23:24:17 +00:00
nocobase[bot]
66d50efbae Merge branch 'next' into develop 2024-12-08 22:03:16 +00:00
nocobase[bot]
7c44d268dc Merge branch 'main' into next 2024-12-08 22:02:54 +00:00
ChengLei Shao
03f50fd638
fix: import by associations (#5833) 2024-12-09 06:02:30 +08:00
Katherine
0231ce7898
style: action penal style improve (#5834) 2024-12-08 20:19:16 +08:00
nocobase[bot]
f1a9d9fd74 Merge branch 'next' into develop 2024-12-08 10:24:53 +00:00
nocobase[bot]
ab38e954c1 Merge branch 'main' into next 2024-12-08 10:24:33 +00:00
ChengLei Shao
afa931bcad
fix: acl with fields association (#5832) 2024-12-08 18:24:12 +08:00
nocobase[bot]
d2de2f0c42 Merge branch 'next' into develop 2024-12-08 07:34:27 +00:00
nocobase[bot]
e5828f9ba2 Merge branch 'main' into next 2024-12-08 07:34:05 +00:00
nocobase[bot]
8b12f0504a docs: update changelogs 2024-12-08 07:33:40 +00:00
nocobase[bot]
a9b3c09525 Merge branch 'next' into develop 2024-12-08 07:15:00 +00:00
nocobase[bot]
76f28b2d67 Merge branch 'main' into next 2024-12-08 07:13:27 +00:00
nocobase[bot]
5becd3c6c0 chore(versions): 😊 publish v1.4.5 v1.4.5 2024-12-08 07:13:13 +00:00
chenos
9f111f5798 Merge branch 'next' into develop
# Conflicts:
#	packages/core/client/src/locale/zh-CN.json
2024-12-08 14:02:05 +08:00
chenos
6e8d7edc7d Merge branch 'main' into next 2024-12-08 14:00:12 +08:00
Katherine
c2234af2f4
fix: adjust empty state text for subtable in read-pretty mode (#5830) 2024-12-08 13:48:45 +08:00
chenos
537bc23037
fix(acl): refresh the page when the user's role is incorrect (#5821)
* fix(acl): refresh the page when the user's role is incorrect

* fix: refresh

* fix: test error
2024-12-08 13:31:36 +08:00
nocobase[bot]
7668165841 docs: update changelogs 2024-12-08 05:28:22 +00:00
nocobase[bot]
97c3b6db13 Merge branch 'main' into next 2024-12-08 05:19:39 +00:00