yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,498 Commits 4 Branches 7 Tags
7c326233d3d8415a5f4e533b41fa852637e2b1fb
Commit Graph

20498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JesmoDev
7c326233d3 Merge remote-tracking branch 'origin/v15/feature/tiptap' into v15/feature/tiptap 2024-09-30 15:08:11 +02:00
JesmoDev
a3ba0bf47d bugfix: fix toolbar wobble and remove WIP tag 2024-09-30 15:07:57 +02:00
leekelleher
147b0b1dd9 Fixes Tiptap Table CSS 
(rogue nesting, assume bad merge conflict)
 2024-09-30 15:07:46 +02:00
leekelleher
d72b473dfc Tiptap Link: Configured overlay size 2024-09-30 15:07:33 +02:00
leekelleher
dc1d69e854 Tiptap: replaced max height/width options with combined dimensions 2024-09-30 15:07:16 +02:00
JesmoDev
eee9dc56a2 Merge pull request #2374 from umbraco/v15/feature/rte/tiptap/render-toolbar 
Tiptap: Render toolbar with row and group configuration
 2024-09-30 15:03:10 +02:00
JesmoDev
d12ff5c20a Merge remote-tracking branch 'origin/v15/feature/tiptap' into v15/feature/rte/tiptap/render-toolbar 2024-09-30 15:02:57 +02:00
Jacob Overgaard
58a832de7a feat: set tinymce to dirty when just inserting a block 2024-09-30 15:02:24 +02:00
JesmoDev
e0c705ccb7 Merge remote-tracking branch 'origin/v15/feature/tiptap' into v15/feature/rte/tiptap/render-toolbar 2024-09-30 15:01:48 +02:00
JesmoDev
7ec5961444 responsive grid setup for toolbar button 2024-09-30 15:01:11 +02:00
Jacob Overgaard
7d0d97eec3 chore: sort imports 2024-09-30 14:48:22 +02:00
Jacob Overgaard
d8d5dff130 feat: add getContents() method 2024-09-30 14:45:57 +02:00
Jacob Overgaard
78b494e686 fix: revert back to single value updates in multiple observers to avoid issues where a value set in one array would "remove" the other values, because this ends up triggering the property value change 2024-09-30 14:45:46 +02:00
Jacob Overgaard
7638643b17 feat: allow data-content-key 2024-09-30 14:32:31 +02:00
Jacob Overgaard
d5bf2f423e merge origin/main into v15/feature/tiptap 2024-09-30 13:57:46 +02:00
Jacob Overgaard
7c575b914f Merge remote-tracking branch 'origin/main' into v15/feature/tiptap 2024-09-30 13:46:05 +02:00
Niels Lyngsø
954be93e66 Merge pull request #2373 from umbraco/v15/feature/emm-user-profile-app 
Extension Manifest Map: User Profile App + Current User Action
 2024-09-30 13:23:00 +02:00
leekelleher
e3d00c4076 Moved the Tiptap toolbar value type to its own UmbTiptapToolbarValue type 2024-09-30 12:18:07 +01:00
Niels Lyngsø
7839e9729f Merge branch 'main' into v15/feature/emm-user-profile-app 2024-09-30 13:16:53 +02:00
Mads Rasmussen
e689a749d3 move current user action 2024-09-30 13:09:15 +02:00
leekelleher
53310ce68e Renders Tiptap toolbar, with rows and groups 2024-09-30 12:05:33 +01:00
Niels Lyngsø
02366cfb2c Merge pull request #2372 from umbraco/v15/feature/emm-tiny-mce-plugin 
Extension Manifest Map: Tiny MCE Plugin
 2024-09-30 12:58:18 +02:00
Mads Rasmussen
9ca78a21f4 Merge branch 'main' into v15/feature/emm-user-profile-app 2024-09-30 12:57:11 +02:00
Mads Rasmussen
fa13b0520d move files 2024-09-30 12:55:41 +02:00
Niels Lyngsø
ec7d3d190e Merge branch 'main' into v15/feature/emm-tiny-mce-plugin 
# Conflicts:
#	src/packages/core/extension-registry/models/index.ts
 2024-09-30 12:52:26 +02:00
Niels Lyngsø
eba2457387 Merge pull request #2369 from umbraco/v15/feature/emm-monaco-markdown-editor-action 
Extension Manifest Map: User Permissions
 2024-09-30 12:49:14 +02:00
Niels Lyngsø
9a4f23b6a3 Merge pull request #2368 from umbraco/v15/feature/emm-granular-user-permission 
Extension Manifest Map: User Permissions
 2024-09-30 12:45:42 +02:00
Mads Rasmussen
8c5ab3fa8e Merge branch 'v15/feature/emm-monaco-markdown-editor-action' of https://github.com/umbraco/Umbraco.CMS.Backoffice into v15/feature/emm-monaco-markdown-editor-action 2024-09-30 12:43:07 +02:00
Mads Rasmussen
667577cea2 Merge branch 'main' into v15/feature/emm-monaco-markdown-editor-action 2024-09-30 12:42:57 +02:00
Niels Lyngsø
76e4739152 Merge branch 'main' into v15/feature/emm-monaco-markdown-editor-action 2024-09-30 12:40:51 +02:00
JesmoDev
5a043391c4 Merge remote-tracking branch 'origin/v15/feature/tiptap' into v15/feature/tiptap 2024-09-30 12:40:18 +02:00
JesmoDev
f49870207b feat: add subscript and superscript and generate icons 2024-09-30 12:40:03 +02:00
Niels Lyngsø
95c9de21b5 Merge branch 'main' into v15/feature/emm-granular-user-permission 
# Conflicts:
#	src/packages/core/extension-registry/extensions/entity-user-permission.extension.ts
#	src/packages/core/extension-registry/models/entity-user-permission.model.ts
#	src/packages/core/extension-registry/models/index.ts
#	src/packages/user/user-permission/entity-user-permission.extension.ts
 2024-09-30 12:39:56 +02:00
Mads Rasmussen
ac54c6b44d Merge branch 'main' into v15/feature/emm-tiny-mce-plugin 2024-09-30 12:39:15 +02:00
Mads Rasmussen
e65af16177 update imports 2024-09-30 12:37:08 +02:00
Mads Rasmussen
e0db07d39f move extension files 2024-09-30 12:35:36 +02:00
Niels Lyngsø
e888a4134c Merge pull request #2364 from umbraco/v15/feature/emm-health-check 
Extension Manifest Map: Health Check
 2024-09-30 12:34:51 +02:00
Mads Rasmussen
d1bf0f6fc5 Merge branch 'main' into v15/feature/emm-health-check 2024-09-30 12:29:03 +02:00
Jacob Overgaard
4d859f13db feat: insert rte blocks 2024-09-30 12:24:45 +02:00
Jacob Overgaard
c64201479c feat: rename removeBlockUdi to removeBlockKey 2024-09-30 12:24:26 +02:00
Jacob Overgaard
7b0e3a757e feat: rename removeBlockUdi to removeBlockKey 2024-09-30 12:24:19 +02:00
Jacob Overgaard
6387b54750 Merge branch 'v15/feature/tiptap' of https://github.com/umbraco/Umbraco.CMS.Backoffice into v15/feature/tiptap 2024-09-30 11:52:37 +02:00
Jacob Overgaard
93b4098598 Merge remote-tracking branch 'origin/main' into v15/feature/tiptap 2024-09-30 11:52:29 +02:00
Niels Lyngsø
22182942f2 Merge pull request #2366 from umbraco/v15/feature/emm-picker-search-result-item 
Extension Manifest Map: Picker Search Result Item
 2024-09-30 11:44:24 +02:00
Niels Lyngsø
8fc8bb1655 move dashboard interface import 2024-09-30 11:30:52 +02:00
Niels Lyngsø
600e50a599 move menu item interface 2024-09-30 11:29:57 +02:00
Niels Lyngsø
605b148bc0 Merge branch 'main' into v15/feature/emm-picker-search-result-item 
# Conflicts:
#	src/packages/core/extension-registry/models/index.ts
 2024-09-30 11:28:42 +02:00
leekelleher
b59431902b Prevents the backoffice router from listening to links inside Tiptap 2024-09-30 11:26:54 +02:00
Niels Lyngsø
af613ddf83 fix menu item interface 2024-09-30 11:26:43 +02:00
Niels Lyngsø
f210102eb9 Merge branch 'main' into v15/feature/emm-health-check 2024-09-30 11:25:17 +02:00