# Conflicts:
#	packages/core/client/src/api-client/APIClient.ts

* feat: push ali docker registry

* fix: add VERDACCIO_URL

* fix: env

* fix: add VERDACCIO_URL to env

* fix: update VERDACCIO_URL

* fix: arg VERDACCIO_URL

* fix: update Dockerfile.official

* fix: build-args

* fix: network: host

* fix: ci

* fix: verdaccio:10104

* Update branch-docker-ci.yml

* Update branch-docker-ci.yml

* Update branch-docker-ci.yml

* Update branch-docker-ci.yml

* Update branch-docker-ci.yml

* Update branch-docker-ci.yml

* Update branch-docker-ci.yml

* feat: push acr
Co-authored-by: ChengLei Shao <chareice@live.com>

* Türkçe dil dosyası eklendi. Turkish language added

* Türkçe Açıklama sayfası. Turkish readme file added

* Turkish language link added

* turkish language link added

# Conflicts:
#	docker/app-mysql/docker-compose.yml
#	docker/app-postgres/docker-compose.yml
#	docker/app-sqlite/docker-compose.yml
#	docs/en-US/release-notes.md
#	docs/zh-CN/release-notes.md
#	lerna.json
#	packages/app/client/package.json
#	packages/app/server/package.json
#	packages/core/acl/package.json
#	packages/core/actions/package.json
#	packages/core/build/package.json
#	packages/core/cache/package.json
#	packages/core/cli/package.json
#	packages/core/client/package.json
#	packages/core/create-nocobase-app/package.json
#	packages/core/database/package.json
#	packages/core/devtools/package.json
#	packages/core/dumi-theme-nocobase/package.json
#	packages/core/resourcer/package.json
#	packages/core/sdk/package.json
#	packages/core/server/package.json
#	packages/core/test/package.json
#	packages/core/utils/package.json
#	packages/plugins/acl/package.json
#	packages/plugins/audit-logs/package.json
#	packages/plugins/china-region/package.json
#	packages/plugins/client/package.json
#	packages/plugins/collection-manager/package.json
#	packages/plugins/error-handler/package.json
#	packages/plugins/export/package.json
#	packages/plugins/file-manager/package.json
#	packages/plugins/multi-app-manager/package.json
#	packages/plugins/notifications/package.json
#	packages/plugins/system-settings/package.json
#	packages/plugins/ui-routes-storage/package.json
#	packages/plugins/ui-schema-storage/package.json
#	packages/plugins/users/package.json
#	packages/plugins/verification/package.json
#	packages/plugins/workflow/package.json
#	packages/presets/nocobase/package.json

* Türkçe dil dosyası eklendi. Turkish language added

* Türkçe dil düzenlemesi. Turkish language edit.

# Conflicts:
#	packages/app/client/src/pages/index.tsx
#	packages/core/client/src/application/Application.tsx
#	packages/core/client/src/file-manager/index.ts
#	packages/plugins/file-manager/package.json
#	packages/plugins/file-manager/src/client/FileStorage.tsx
#	packages/plugins/file-manager/src/client/FileStorageShortcut.tsx

* feat: improve code

* chore: update version

* feat: api service

* fix: api services

* feat: improve code

* feat: improve code

* feat: improve code

* feat: pm socket

* fix: test errors

* feat: add built-in plugins before upgrade

* feat: update docs

* feat: improve code

* fix: after load

* feat: 数据表支持筛选

* feat: 数据表支持筛选

* feat: 数据表支持筛选

* feat: 数据表支持筛选

* fix: format code
Co-authored-by: chenos <chenlinxh@gmail.com>

* feat(core/cache): support cache

* perf(plugins/ui-schema-storage): cache schema

* refactor(plugins/ui-schema-storage): handle schema cache in repository level, not in action

* fix(plugins/ui-schema-storage): jsonSchema use s_ + x-uid and properties use p_ + x-uid cache

prevent jsonSchema and properties cache override each other

* test(plugins/ui-schema-storage): add ui_schema repository with cache test

* build(create-nocobase-app): remove create-nocobase cli's cache-store-package option

* test(plugins/ui-schema-storage): add ui_schema repository with cache test with readFromCache false

* fix(plugins/ui-schema-storage): repository insertAdjacent and patch method clear cache fix
Co-authored-by: chenos <chenlinxh@gmail.com>

* feat: changed with associations

* fix: test error

* fix: test error

* fix: test
# Conflicts:
#	packages/core/database/src/model.ts

* chore: feat/docker-optimizing
* feat: docker nginx gzip config

* fix(plugin-workflow): test changedWithAssociations()

* fix: toChangedWithAssociations

* fix(plugin-workflow): add test cases
Co-authored-by: chenos <chenlinxh@gmail.com>
# Conflicts:
#	packages/core/database/src/model.ts

* feat(plugin-workflow): support association constant simple input

* fix(plugin-workflow): remove useless code
# Conflicts:
#	packages/plugins/workflow/src/client/components/CollectionFieldset.tsx

* docs: update database repository docs

* docs: single relation repository docs

* docs: has many relation repository docs

* docs: belongs to many  relation repository docs

* docs: acl

* docs: actions
Co-authored-by: chenos <chenlinxh@gmail.com>

* feat: create with array of values

* chore: console.log

* chore: debug
# Conflicts:
#	packages/core/database/src/relation-repository/relation-repository.ts

* fix: appends merge now using primary key

* chore: console.log

* docs: add full sequelize model event types

* feat: update docs

* fix: types

* fix: update docs

* docs: refactor db event apis

* docs: add all events to db api
Co-authored-by: chenos <chenlinxh@gmail.com>