8104 Commits

Author SHA1 Message Date
nocobase[bot]
5f3d5e5152 Merge branch 'next' into develop 2025-01-11 16:44:59 +00:00
nocobase[bot]
52407eb3af Merge branch 'main' into next 2025-01-11 16:44:37 +00:00
chenos
ab04e65e74
fix: docker build error (#6043)
* fix: docker build error

* fix: msttcorefonts

* fix: fonts-noto-cjk
2025-01-12 00:44:14 +08:00
nocobase[bot]
bbfe8124d9 Merge branch 'next' into develop 2025-01-11 15:16:38 +00:00
nocobase[bot]
54aa53c134 Merge branch 'main' into next 2025-01-11 15:16:12 +00:00
chenos
02b878335c chore: update Dockerfile 2025-01-11 23:15:36 +08:00
chenos
f9df480a3a Merge branch 'next' into develop
# Conflicts:
#	packages/plugins/@nocobase/plugin-users/src/client/schemas/users.ts
2025-01-11 23:02:17 +08:00
nocobase[bot]
d2be4cbf43 Merge branch 'main' into next 2025-01-11 14:54:27 +00:00
chenos
00c9944eda chore: update Dockerfile 2025-01-11 22:53:51 +08:00
Chareice
9e93c30c15
chore: ws api 2025-01-11 20:13:37 +08:00
nocobase[bot]
eaa29d2a2b Merge branch 'main' into next 2025-01-11 07:13:12 +00:00
YANG QIA
614720cb42
fix(users): disable browser autofill when setting passwords for users in user management (#6041)
* fix(users): disable browser autofill when setting passwords for users in user management

* chore: update

* fix: update

* chore: update
2025-01-11 15:12:50 +08:00
nocobase[bot]
6f700d53fb Merge branch 'next' into develop 2025-01-11 05:31:44 +00:00
nocobase[bot]
d84877f89f Merge branch 'main' into next 2025-01-11 05:31:24 +00:00
YANG QIA
0819523a90
Update SECURITY.md 2025-01-11 13:30:59 +08:00
Junyi
0adab556f8
fix(plugin-workflow): fix schedule picker value (#6039) 2025-01-11 12:06:24 +08:00
nocobase[bot]
8730b85887 Merge branch 'next' into develop 2025-01-10 16:32:36 +00:00
nocobase[bot]
e9fa374ac6 Merge branch 'main' into next 2025-01-10 16:32:12 +00:00
nocobase[bot]
8c30733e0b docs: update changelogs 2025-01-10 16:31:46 +00:00
nocobase[bot]
9c87f68bd4 Merge branch 'next' into develop 2025-01-10 16:13:42 +00:00
nocobase[bot]
f3917a41b1 Merge branch 'main' into next 2025-01-10 16:12:00 +00:00
nocobase[bot]
efb124984c chore(versions): 😊 publish v1.4.22 v1.4.22 2025-01-10 16:11:39 +00:00
mytharcher
fcef6c11da Merge branch 'next' into develop 2025-01-11 00:09:50 +08:00
mytharcher
6f55a2a0d0 Merge branch 'main' into next 2025-01-11 00:09:02 +08:00
Junyi
4751bda137
chore(evaluators): upgrade formulajs version to 4.4.9 (#6037) 2025-01-10 23:08:17 +08:00
nocobase[bot]
4582009346 Merge branch 'next' into develop 2025-01-10 11:43:14 +00:00
nocobase[bot]
dc25e8a9d4 Merge branch 'main' into next 2025-01-10 11:42:53 +00:00
Junyi
2efa3eddea
fix(plugin-workflow): fix logger api (#6036) 2025-01-10 19:42:29 +08:00
mytharcher
5c7a38c569 Merge branch 'next' into develop 2025-01-10 17:05:15 +08:00
mytharcher
ff526f9a78 Merge branch 'main' into next 2025-01-10 16:46:08 +08:00
Junyi
a3ae8032f4
fix(plugin-workflow): fix duplicate triggering (#6022)
* fix(plugin-workflow): fix duplicate triggering

* fix(plugin-workflow): await executing before resume

* fix(plugin-workflow): fix failed test case
2025-01-10 15:03:08 +08:00
nocobase[bot]
4a999dc952 Merge branch 'next' into develop 2025-01-10 04:02:43 +00:00
nocobase[bot]
dd4f9b7829 Merge branch 'main' into next 2025-01-10 04:02:20 +00:00
nocobase[bot]
da24f729f2 docs: update changelogs 2025-01-10 04:01:54 +00:00
nocobase[bot]
a66b603005 Merge branch 'next' into develop 2025-01-10 03:59:58 +00:00
nocobase[bot]
39a40b11eb chore(versions): 😊 publish v1.5.0-beta.27 v1.5.0-beta.27 2025-01-10 03:59:31 +00:00
nocobase[bot]
0b5a1fc70b Merge branch 'next' into develop 2025-01-10 03:54:45 +00:00
nocobase[bot]
1dc496a0ea Merge branch 'main' into next 2025-01-10 03:53:33 +00:00
nocobase[bot]
bea0974067 chore(versions): 😊 publish v1.4.21 v1.4.21 2025-01-10 03:53:19 +00:00
nocobase[bot]
98a98b5fa0 chore(versions): 😊 publish v1.6.0-alpha.12 v1.6.0-alpha.12 2025-01-10 03:51:12 +00:00
chenos
7eb5d4f759 Merge branch 'develop' of github.com:nocobase/nocobase into develop 2025-01-10 11:34:39 +08:00
nocobase[bot]
813120f20d Merge branch 'next' into develop 2025-01-10 03:34:27 +00:00
chenos
4289abc848 Merge branch 'main' into develop 2025-01-10 11:34:00 +08:00
Katherine
3b7dfc4cf7
refactor: remove linkage rules from Associate button (#6016)
* refactor: remove linkage rules from Associate button

* fix: bug
2025-01-10 11:33:59 +08:00
nocobase[bot]
ff03d4e7bd Merge branch 'main' into next 2025-01-10 03:33:45 +00:00
chenos
53eca84eda fix: docker image 2025-01-10 11:33:12 +08:00
nocobase[bot]
83d69a1eae Merge branch 'main' into next 2025-01-10 03:27:06 +00:00
chenos
cad134f6ef chore: update Dockerfile 2025-01-10 11:26:24 +08:00
nocobase[bot]
158134baf4 Merge branch 'next' into develop 2025-01-10 03:11:25 +00:00
Zeke Zhang
64a7ca31b5 Merge branch 'main' into next 2025-01-10 11:10:36 +08:00