Skip to content

Commit 07e14db

Browse files
committed
Merge branch 'v14/bugfix/switch-workspace-variant' into v14/feature/router-404
# Conflicts: # src/packages/documents/documents/workspace/document-workspace-editor.element.ts
2 parents 76ae475 + 438d99a commit 07e14db

File tree

81 files changed

+1470
-816
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+1470
-816
lines changed

.github/README.md

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ The development environment is the default environment and is used when running
2929

3030
### Run against a local Umbraco instance
3131

32-
> **Note**
33-
> Make sure you have followed the [Authentication guide](https://github.com/umbraco/Umbraco.CMS.Backoffice/blob/main/docs/authentication.md) before continuing.
34-
3532
If you have a local Umbraco instance running, you can use the development environment to run against it by overriding the API URL and bypassing the mock-service-worker in the frontend client.
3633

3734
Create a `.env.local` file and set the following variables:
@@ -41,14 +38,37 @@ VITE_UMBRACO_API_URL=https://localhost:44339 # This will be the URL to your Umbr
4138
VITE_UMBRACO_USE_MSW=off # Indicate that you want all API calls to bypass MSW (mock-service-worker)
4239
```
4340

41+
Open this file in an editor: `src/Umbraco.Web.UI/appsettings.Development.json` and add this to the `Umbraco:CMS:Security` section to override the backoffice host:
42+
43+
```json
44+
"Umbraco": {
45+
"CMS": {
46+
"Security":{
47+
"BackOfficeHost": "http://localhost:5173",
48+
"AuthorizeCallbackPathName": "/oauth_complete",
49+
"AuthorizeCallbackLogoutPathName": "/logout",
50+
"AuthorizeCallbackErrorPathName": "/error",
51+
},
52+
},
53+
}
54+
```
55+
56+
Now start the vite server: `npm run dev:server` in your backoffice folder and open the http://localhost:5173 URL in your browser.
57+
4458
### Storybook
4559

4660
Storybook is also being built and deployed automatically on the Main branch, including a preview URL on each pull request. See it in action on this [Azure Static Web App](https://ambitious-stone-0033b3603.1.azurestaticapps.net/).
4761

62+
You can test the Storybook locally by running `npm run storybook`. This will start the Storybook server and open a browser window with the Storybook UI.
63+
64+
Storybook is an excellent tool to test out UI components in isolation and to document them. It is also a great way to test the responsiveness and accessibility of the components.
65+
4866
## Contributing
4967

50-
We accept contributions to this project. However be aware that we are mainly working on a private backlog, so not everyone will be immediately obvious. If you want to get started on contributing, please read the [contribute space](https://github.com/umbraco/Umbraco.CMS.Backoffice/contribute) where you will be able to find the guidelines on how to contribute as well as a list of good first issues.
68+
We accept contributions to this project. However be aware that we are mainly working on a private backlog, so not everything will be immediately obvious. If you want to get started on contributing, please read the [contributing guidelines](./CONTRIBUTING.md).
69+
70+
A list of issues can be found on the [Umbraco-CMS Issue Tracker](https://github.com/umbraco/Umbraco-CMS/issues). Many of them are marked as `community/up-for-grabs` which means they are up for grabs for anyone to work on.
5171

5272
## Documentation
5373

54-
The documentation can be found on [Umbraco Docs](https://docs.umbraco.com/umbraco-backoffice/). The documentation is a work in progress.
74+
The documentation can be found on [Umbraco Docs](https://docs.umbraco.com/umbraco-cms).

docs/authentication.md

Lines changed: 0 additions & 66 deletions
This file was deleted.

package-lock.json

Lines changed: 10 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@umbraco-cms/backoffice",
33
"license": "MIT",
4-
"version": "14.1.0",
4+
"version": "14.2.0",
55
"type": "module",
66
"exports": {
77
".": null,
@@ -86,6 +86,7 @@
8686
"./themes": "./dist-cms/packages/core/themes/index.js",
8787
"./tiny-mce": "./dist-cms/packages/tiny-mce/index.js",
8888
"./tree": "./dist-cms/packages/core/tree/index.js",
89+
"./ufm": "./dist-cms/packages/ufm/index.js",
8990
"./user-group": "./dist-cms/packages/user/user-group/index.js",
9091
"./user-permission": "./dist-cms/packages/user/user-permission/index.js",
9192
"./user": "./dist-cms/packages/user/user/index.js",
@@ -118,7 +119,7 @@
118119
"type": "git"
119120
},
120121
"bugs": {
121-
"url": "https://github.com/umbraco/Umbraco.CMS.Backoffice/issues"
122+
"url": "https://github.com/umbraco/Umbraco-CMS/issues"
122123
},
123124
"author": {
124125
"name": "Umbraco A/S",
@@ -127,6 +128,7 @@
127128
},
128129
"workspaces": [
129130
"./src/packages/block",
131+
"./src/packages/core",
130132
"./src/packages/data-type",
131133
"./src/packages/dictionary",
132134
"./src/packages/documents",

src/apps/backoffice/backoffice.element.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ const CORE_PACKAGES = [
3333
import('../../packages/tags/umbraco-package.js'),
3434
import('../../packages/templating/umbraco-package.js'),
3535
import('../../packages/tiny-mce/umbraco-package.js'),
36+
import('../../packages/ufm/umbraco-package.js'),
3637
import('../../packages/umbraco-news/umbraco-package.js'),
3738
import('../../packages/user/umbraco-package.js'),
3839
import('../../packages/webhook/umbraco-package.js'),

src/assets/lang/da-dk.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1587,7 +1587,7 @@ export default {
15871587
requiredLabel: 'Påkrævet label',
15881588
enableListViewHeading: 'Aktivér listevisning',
15891589
enableListViewDescription:
1590-
'Konfigurér indholdet til at blive vist i en sortérbar og søgbar liste;\n undersider vil ikke blive vist i træet\n ',
1590+
'Konfigurér indholdet til at blive vist i en sortérbar og søgbar liste.',
15911591
allowedTemplatesHeading: 'Tilladte skabeloner',
15921592
allowedTemplatesDescription: 'Vælg hvilke skabeloner, der er tilladt at bruge på dette indhold.',
15931593
allowAtRootHeading: 'Tillad på rodniveau',
@@ -1682,7 +1682,7 @@ export default {
16821682
'Changing a data type with stored values is disabled. To allow this you can change the Umbraco:CMS:DataTypes:CanBeChanged setting in appsettings.json.',
16831683
collections: 'Samlinger',
16841684
collectionsDescription:
1685-
'Konfigurerer indholdselementet til at vise listen over dets underordnede elementer, underordnede elementer vil ikke blive vist i træet.',
1685+
'Konfigurerer indholdselementet til at vise listen over dets underordnede elementer.',
16861686
structure: 'Struktur',
16871687
presentation: 'Præsentation',
16881688
},

src/assets/lang/en-us.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1601,7 +1601,7 @@ export default {
16011601
requiredLabel: 'Required label',
16021602
enableListViewHeading: 'Enable list view',
16031603
enableListViewDescription:
1604-
'Configures the content item to show a sortable and searchable list of its\n children, the children will not be shown in the tree\n ',
1604+
'Configures the content item to show a sortable and searchable list of its children.',
16051605
allowedTemplatesHeading: 'Allowed Templates',
16061606
allowedTemplatesDescription: 'Choose which templates editors are allowed to use on content of this type',
16071607
allowAtRootHeading: 'Allow at root',
@@ -1694,7 +1694,7 @@ export default {
16941694
'Changing a data type with stored values is disabled. To allow this you can change the Umbraco:CMS:DataTypes:CanBeChanged setting in appsettings.json.',
16951695
collections: 'Collections',
16961696
collectionsDescription:
1697-
'Configures the content item to show list of its children, the children will not be shown in the tree.',
1697+
'Configures the content item to show list of its children.',
16981698
structure: 'Structure',
16991699
presentation: 'Presentation',
17001700
},

src/assets/lang/en.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1624,7 +1624,7 @@ export default {
16241624
requiredLabel: 'Required label',
16251625
enableListViewHeading: 'Enable list view',
16261626
enableListViewDescription:
1627-
'Configures the content item to show a sortable and searchable list of its\n children, the children will not be shown in the tree\n ',
1627+
'Configures the content item to show a sortable and searchable list of its children.',
16281628
allowedTemplatesHeading: 'Allowed Templates',
16291629
allowedTemplatesDescription: 'Choose which templates editors are allowed to use on content of this type',
16301630
allowAtRootHeading: 'Allow at root',
@@ -1718,7 +1718,7 @@ export default {
17181718
'Changing a data type with stored values is disabled. To allow this you can change the Umbraco:CMS:DataTypes:CanBeChanged setting in appsettings.json.',
17191719
collections: 'Collections',
17201720
collectionsDescription:
1721-
'Configures the content item to show list of its children, the children will not be shown in the tree.',
1721+
'Configures the content item to show list of its children.',
17221722
structure: 'Structure',
17231723
presentation: 'Presentation',
17241724
},

0 commit comments

Comments
 (0)