yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,585 Commits 4 Branches 7 Tags
51ec8b5b0ddcae14a1ba7676b19cf375fd698a2e
Commit Graph

9585 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesper Møller Jensen
ab47c69ce8 Merge branch 'main' into feature/image-cropper-new 2023-10-18 22:07:42 +13:00
JesmoDev
6e3b4ab6e5 Merge pull request #917 from umbraco/chore/uui-1.5.0-rc.0 
build(deps): bump @umbraco-ui/uui from 1.4.0-rc.2 to 1.5.0-rc.1
 2023-10-18 22:07:18 +13:00
Jacob Overgaard
4376f634e8 bump @umbraco-ui/uui to 1.5.0-rc.3 2023-10-18 10:22:25 +02:00
Jacob Overgaard
85df292b97 build(deps): bump @umbraco-ui/uui to 1.5.0-rc.2 2023-10-18 09:54:43 +02:00
Jacob Overgaard
ee3430b8cf Merge branch 'main' into chore/uui-1.5.0-rc.0 2023-10-18 09:54:05 +02:00
JesmoDev
8842fe37d8 Merge pull request #933 from umbraco/bugfix-property-editor-config-merging 
Bugfix property editor config merging
 2023-10-18 19:56:39 +13:00
Jacob Overgaard
c225b07919 build(deps-dev): bump @umbraco-ui/uui from 1.5.0-rc.0 to 1.5.0-rc.1 2023-10-18 08:49:33 +02:00
Jacob Overgaard
4def21315b Merge branch 'main' into chore/uui-1.5.0-rc.0 2023-10-18 08:47:33 +02:00
Jesper Møller Jensen
0e87d31f48 Merge remote-tracking branch 'origin/main' into bugfix-property-editor-config-merging 2023-10-18 18:11:01 +13:00
Bjarne Fyrstenborg
30a944d959 Merge branch 'main' into feature/icon-picker-size 2023-10-17 16:15:33 +02:00
Lone Iversen
ed4bfd43ba Merge branch 'main' into feature/multi-url-picker-fixes 2023-10-17 16:11:29 +02:00
Lone Iversen
130e7833ff selection-change 2023-10-17 16:11:05 +02:00
Lone Iversen
be2552f96e Merge remote-tracking branch 'origin/main' into feature/multi-url-picker-fixes 2023-10-17 16:06:46 +02:00
dependabot[bot]
cc247f3ad1 Bump @babel/traverse from 7.22.17 to 7.23.2 
Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.22.17 to 7.23.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse)

---
updated-dependencies:
- dependency-name: "@babel/traverse"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-17 15:51:23 +02:00
Jacob Overgaard
0b143ed686 Merge pull request #929 from umbraco/feature/code-editor-modal-fix 
Feature/code editor modal fix
 2023-10-17 15:51:03 +02:00
Bjarne Fyrstenborg
46c31deff3 Merge branch 'feature/icon-picker-size' of github.com:bjarnef/Umbraco.CMS.Backoffice into feature/icon-picker-size 2023-10-17 15:45:31 +02:00
Bjarne Fyrstenborg
c768237111 Merge branch 'main' of github.com:umbraco/Umbraco.CMS.Backoffice into feature/icon-picker-size 2023-10-17 15:45:12 +02:00
Bjarne Fyrstenborg
d658b62d7c Merge branch 'main' into feature/icon-picker-size 2023-10-17 15:44:00 +02:00
Bjarne Fyrstenborg
60225f354a Align icons in grid 2023-10-17 15:38:55 +02:00
Bjarne Fyrstenborg
3f93285361 Change icon picker size to medium 2023-10-17 15:38:29 +02:00
Lone Iversen
dffa840897 Merge remote-tracking branch 'origin/main' into feature/code-editor-modal-fix 2023-10-17 15:38:15 +02:00
Niels Lyngsø
52b442543e Merge pull request #928 from umbraco/improvement-clean-up-modal-from-shared 2023-10-17 15:28:24 +02:00
Mads Rasmussen
5f6ef4b099 Merge branch 'main' into improvement-user-spring-cleaning 2023-10-17 15:27:30 +02:00
Niels Lyngsø
ba9a5391e7 Merge pull request #894 from maudsj/bugfix/popovers-pop-over-everything 2023-10-17 15:26:33 +02:00
Niels Lyngsø
baf70de1fe Merge branch 'main' into bugfix-property-editor-config-merging 2023-10-17 15:23:22 +02:00
Niels Lyngsø
5de68b9ddb Merge branch 'main' into bugfix/popovers-pop-over-everything 2023-10-17 15:19:00 +02:00
Mads Rasmussen
ac73a5017a Merge branch 'main' into improvement-clean-up-modal-from-shared 2023-10-17 15:17:45 +02:00
Niels Lyngsø
f4ca4e1a4c Merge pull request #903 from umbraco/feature-entity-user-permissions 2023-10-17 15:14:52 +02:00
Mads Rasmussen
127e91cf4f add spacing 2023-10-17 15:09:04 +02:00
Mads Rasmussen
b336cd11c8 Merge branch 'main' into improvement-user-spring-cleaning 2023-10-17 14:59:59 +02:00
Mads Rasmussen
ee5a3754fb Merge branch 'main' into improvement-clean-up-modal-from-shared 2023-10-17 14:57:27 +02:00
Jacob Overgaard
fa77d912fb Merge pull request #926 from umbraco/feature/markdown-editor-preview 
Feature/markdown editor preview
 2023-10-17 14:56:23 +02:00
Mads Rasmussen
69dc878c17 Merge branch 'main' into feature-entity-user-permissions 2023-10-17 14:46:17 +02:00
Mads Rasmussen
bbec22da3c Merge branch 'main' into bugfix-property-editor-config-merging 2023-10-17 14:40:53 +02:00
Mads Rasmussen
ef8d8f50cb Update data-type-workspace.context.ts 2023-10-17 13:38:47 +02:00
Mads Rasmussen
20c483bb6f Update data-type-workspace.context.ts 2023-10-17 13:34:28 +02:00
Mads Rasmussen
4a348f125a update checkbox list alias to match server alias 2023-10-17 13:29:23 +02:00
Niels Lyngsø
59a30b88c7 Merge branch 'main' into bugfix/popovers-pop-over-everything 2023-10-17 13:06:21 +02:00
Niels Lyngsø
350cacbc60 Merge branch 'main' into bug/tinymce-configuration-icons 2023-10-17 13:03:38 +02:00
Niels Lyngsø
74455f374e Merge pull request #901 from umbraco/feature/modal-events 2023-10-17 13:02:32 +02:00
Jacob Overgaard
70012b7764 Merge branch 'main' into feature/markdown-editor-preview 2023-10-17 13:02:19 +02:00
Mads Rasmussen
96d4534b3d add property editor name and icon observables to context 2023-10-17 12:10:08 +02:00
Niels Lyngsø
f5c69568fd Merge branch 'feature/modal-events' of https://github.com/umbraco/Umbraco.CMS.Backoffice into feature/modal-events 2023-10-17 11:43:33 +02:00
Niels Lyngsø
6656180487 sort imports 2023-10-17 11:43:20 +02:00
Niels Lyngsø
55748625b1 Merge branch 'main' into feature/modal-events 2023-10-17 11:39:24 +02:00
Niels Lyngsø
d3021efacc format and clean up 2023-10-17 11:38:52 +02:00
Niels Lyngsø
fb46d99792 fix data-type not updating 2023-10-17 11:38:41 +02:00
Mads Rasmussen
af69f78513 remove unused props 2023-10-17 11:32:53 +02:00
Mads Rasmussen
b61cb47f4f clean up 2023-10-17 11:11:25 +02:00
Mads Rasmussen
3548fce534 render property editor config 2023-10-17 11:06:01 +02:00