yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
67,419 Commits 4 Branches 7 Tags
4322a7d673f6a6d06a54c369f9f9091d8a8a7800
Commit Graph

67419 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels Lyngsø
a64a1d4031 Merge pull request #2519 from umbraco/v15/feature/fix-block-grid-editor-circular-imports-take-1 
Feature: Fix imports for circular deps
 2024-11-07 14:29:58 +01:00
Niels Lyngsø
6540f3914b Merge branch 'main' into v15/feature/fix-block-grid-editor-circular-imports-take-1 
# Conflicts:
#	src/packages/block/block-grid/components/block-grid-entry/block-grid-entry.element.ts
 2024-11-07 14:22:56 +01:00
Niels Lyngsø
ae9c5dccc0 fix imports 2024-11-07 14:21:10 +01:00
Niels Lyngsø
c5688dda28 Merge pull request #2515 from rickbutterfield/bugfix/block-list-custom-views-fix 
[v14.2+] Allow custom views to load correctly for Block List
 2024-11-07 14:21:09 +01:00
Niels Lyngsø
607b596f2c Merge pull request #2513 from umbraco/v15/feature/grid-inline-editing-fixes 
Feature: Block Grid inline editing + Extension Initializers change
 2024-11-07 14:18:21 +01:00
Niels Lyngsø
04c9e8f4ac Merge branch 'main' into bugfix/block-list-custom-views-fix 2024-11-07 14:13:38 +01:00
Niels Lyngsø
1740816d64 Merge branch 'main' into v15/feature/grid-inline-editing-fixes 
# Conflicts:
#	src/packages/core/content/property-dataset-context/element-property-dataset.context.ts
 2024-11-07 14:10:58 +01:00
Niels Lyngsø
b1a054f3ed Merge pull request #2483 from umbraco/v15/feature/content-workspace-base 
Feature: Content Detail Workspace Base
 2024-11-07 14:09:03 +01:00
Niels Lyngsø
5f3e992ca7 fix const name 2024-11-07 14:04:32 +01:00
Niels Lyngsø
a2d449de95 move dictionary create action to top 2024-11-07 14:01:11 +01:00
Niels Lyngsø
6cc417580a update member manifests 2024-11-07 13:57:28 +01:00
Niels Lyngsø
f6bdb8dc90 sort props to align with data source 2024-11-07 13:53:06 +01:00
Niels Lyngsø
e2303eca88 Merge branch 'main' into v15/feature/grid-inline-editing-fixes 2024-11-07 13:14:51 +01:00
Niels Lyngsø
14b388bfd8 lint fixes 2024-11-07 13:06:14 +01:00
Mads Rasmussen
cccd0790d5 fix import 2024-11-07 12:20:40 +01:00
Mads Rasmussen
d4d2aeecd6 temp duplicate styling as we shouldn't depend on another elements styles unless we extend it 2024-11-07 12:16:34 +01:00
Mads Rasmussen
75aa555bc9 use relative imports 2024-11-07 12:00:33 +01:00
Mads Rasmussen
18fae3d1f8 use relative imports 2024-11-07 11:56:35 +01:00
Mads Rasmussen
5cfba1588d fix circular import 2024-11-07 11:35:57 +01:00
Mads Rasmussen
59ece1f5a1 use relative imports inside module 2024-11-07 11:29:59 +01:00
Mads Rasmussen
d5447641b7 use relative imports inside a module 2024-11-07 11:27:04 +01:00
Niels Lyngsø
ce99552975 Merge branch 'main' into routed-modal-issue 2024-11-07 11:20:30 +01:00
Mads Rasmussen
d91292267d remove circular dependency + deprecate export 2024-11-07 11:20:01 +01:00
Mads Rasmussen
6beb239cde Merge branch 'main' into v15/feature/content-workspace-base 2024-11-07 10:30:18 +01:00
Mads Rasmussen
6aab8bff47 Merge branch 'release/15.0' 2024-11-07 10:30:01 +01:00
Niels Lyngsø
5cc38056bf Merge pull request #2518 from umbraco/v15/hotfix/modal-route-context-boundary 
hotfix: 17434 (prevent routable modals inside not routable modals)
 2024-11-07 10:15:33 +01:00
Niels Lyngsø
e85f108b75 rename context consume event const 2024-11-07 10:05:31 +01:00
Niels Lyngsø
493e800a7e style no-router 2024-11-07 10:01:59 +01:00
Niels Lyngsø
4d084083f8 Merge branch 'main' into v15/feature/content-workspace-base 2024-11-07 09:11:40 +01:00
Niels Lyngsø
715bf1c58f prevent context consumption of route-context from a modal that is not routable 2024-11-06 21:42:25 +01:00
Niels Lyngsø
5282355dcc Merge pull request #2517 from warrenbuckley/patch-1 
Fixes duplicate alias that fails npm run compile
 2024-11-06 20:55:35 +01:00
Warren Buckley
540f829a2f Fixes duplicate alias that fails npm run compile 
Fixes issue when running `npm run compile`

```
examples/ufm-custom-component/index.ts:12:4 - error TS1117: An object literal cannot have multiple properties with the same name.

12    alias: 'myCustomComponent',
      ~~~~~


Found 1 error in examples/ufm-custom-component/index.ts:12
```
 2024-11-06 19:35:38 +00:00
NguyenThuyLan
2576594d92 Fix bug: No matching error display between New password and Confirm password (#2384) 
* Fix bug: No matching error display between New password and Confirm password

* Refactored to use built-in validation

Wires up most localization keys.

---------

Co-authored-by: Lan Nguyen Thuy <lnt@umbraco.dk>
Co-authored-by: leekelleher <leekelleher@gmail.com>
 2024-11-06 17:18:25 +00:00
Nikolaj Geisle
79059d60f5 Merge branch 'release/15.0' into v15/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client
#	version.json
 2024-11-06 17:36:01 +01:00
Rick Butterfield
42bdc8703c Merge branch 'main' into bugfix/block-list-custom-views-fix 2024-11-06 15:41:42 +00:00
marwaldv
0c99b31285 Feature: Add Swiss backoffice localizations (#2503) 
* Add swiss languages as backoffice languages

* Added Swiss localizations to manifest

* De-duplicated localizations

To reduce lines of duplicated code, (from the German, French
and Italian localizations), those localizations are imported at runtime.

---------

Co-authored-by: leekelleher <leekelleher@gmail.com>
 2024-11-06 15:28:48 +00:00
Sven Geusens
a9dd8b00e0 Optimize local links migration (#17432) 
* Make the migration batched and process in paralel

* Change log level

* More log levels

---------

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
 2024-11-06 15:35:01 +01:00
Rick Butterfield
3e7d6341e9 Allow checking for this._contentTypeAlias before #extensionSlotFilterMethod runs 2024-11-06 13:41:56 +00:00
Mads Rasmussen
9932f24d5c Merge branch 'main' into v15/feature/content-workspace-base 2024-11-06 14:05:54 +01:00
Niels Lyngsø
d2be6adba1 comment on risky business 2024-11-06 14:05:27 +01:00
Mads Rasmussen
660fe5f22a Merge branch 'main' of https://github.com/umbraco/Umbraco.CMS.Backoffice 2024-11-06 14:00:34 +01:00
Mads Rasmussen
c9f296814d Merge branch 'release/15.0' 2024-11-06 14:00:24 +01:00
Mads Rasmussen
b4b63abe32 ensure scaffolding is done before initializing the redirect controller 2024-11-06 14:00:04 +01:00
Niels Lyngsø
4b28569e91 Merge branch 'main' into v15/feature/grid-inline-editing-fixes 2024-11-06 13:59:30 +01:00
Mads Rasmussen
e9d0041628 Merge branch 'main' into v15/feature/content-workspace-base 2024-11-06 13:58:05 +01:00
Mads Rasmussen
ae4882aa95 Merge branch 'main' of https://github.com/umbraco/Umbraco.CMS.Backoffice 2024-11-06 13:57:28 +01:00
Mads Rasmussen
1efff16e39 Merge branch 'release/15.0' 2024-11-06 13:57:17 +01:00
Niels Lyngsø
ec4c08f399 update destroy method 2024-11-06 13:55:43 +01:00
Rick Butterfield
4ddfd0d37f [v14.2+] Fix Block Grid layoutStylesheet not using correct URL (#2512) 
* Update block-grid-manager.context.ts

* Renames field to `serverUrl`

Uses `URL()` object to handle slashes in constructing the URL path.

* Tidied up imports

---------

Co-authored-by: leekelleher <leekelleher@gmail.com>
 2024-11-06 12:44:23 +00:00
Niels Lyngsø
c5340c186b give block workspace origin data to work from 2024-11-06 13:42:45 +01:00