yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,790 Commits 4 Branches 7 Tags
4481e90f1092b46e43a148ff6148b2a33f55b901
Commit Graph

11239 Commits

Author SHA1 Message Date
Sebastiaan Janssen
4481e90f10 Merge branch 'v8/8.8' into v8/8.9 
# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
 2021-03-09 14:33:01 +01:00
Kenn Jacobsen
b7553e311a Cache the SVG icons serverside to boost performance (#9200) 
Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
(cherry picked from commit 8e01ac30d6)

# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
#	src/Umbraco.Web/Services/IconService.cs
 2021-03-09 14:22:22 +01:00
Sebastiaan Janssen
ac41c5451e Merge branch 'v8/8.8' into v8/8.9 2021-03-08 10:06:37 +01:00
Niels Lyngsø
cef1a73a2e no need to prevent or stop propagation on this. (#9933) 
Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
(cherry picked from commit af65810048)
 2021-03-08 10:05:46 +01:00
Sebastiaan Janssen
092683ef7b Merge branch 'v8/8.8' into v8/8.9 2021-01-20 15:04:08 +01:00
Mads Rasmussen
0c9b4565f1 updates the css to support items with long titles 
(cherry picked from commit 8e64fe54b1)
 2021-01-20 15:03:06 +01:00
Sebastiaan Janssen
2c037f604d Merge branch 'v8/8.8' into v8/8.9 2021-01-20 14:46:20 +01:00
Sebastiaan Janssen
908dbb1454 Merge branch 'v8/8.7' into v8/8.8 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
 2021-01-20 14:42:22 +01:00
Niels Lyngsø
52e8da2ff2 Call rebindCallback on errors as well (#9690) 
(cherry picked from commit da0c82aabd)
 2021-01-20 14:28:37 +01:00
Niels Lyngsø
bc8f8366c2 Call rebindCallback on errors as well (#9688) 
(cherry picked from commit 6d712b0d16)

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
 2021-01-20 14:17:02 +01:00
Sebastiaan Janssen
7d229bc5a9 Merge branch 'v8/8.8' into v8/8.9 
# Conflicts:
#	src/SolutionInfo.cs
 2021-01-20 11:27:10 +01:00
Sebastiaan Janssen
435695e2c3 Merge branch 'v8/8.7' into v8/8.8 
# Conflicts:
#	src/SolutionInfo.cs
 2021-01-20 11:25:29 +01:00
Sebastiaan Janssen
59e27c4850 Merge branch 'v8/8.6' into v8/8.7 
# Conflicts:
#	src/SolutionInfo.cs
 2021-01-20 11:24:02 +01:00
Bjarne Fyrstenborg
b44a3e4280 Inject missing localization service 
(cherry picked from commit c501ef0b68)
 2021-01-20 11:19:37 +01:00
Mads Rasmussen
704fad92e5 Fixes: 9360: Nested validation freezes browser (#9677) 
Co-authored-by: Niels Lyngsø <niels.lyngso@gmail.com>
(cherry picked from commit b75a237162)
 2021-01-20 11:09:14 +01:00
Warren Buckley
86504d69d3 Merge pull request #9644 from umbraco/v8/bug/9432-checkboxes-on-doctype-compositions 
V8/bug/9432: Backoffice UI - checkboxes on doctype compositions uncheck after selecting an item

(cherry picked from commit 0d7a683c60)
 2021-01-13 16:54:26 +01:00
Sebastiaan Janssen
29979a55a0 Merge branch 'v8/8.8' into v8/8.9 2021-01-13 16:40:10 +01:00
Sebastiaan Janssen
2fd85c58b5 Merge branch 'v8/8.7' into v8/8.8 2021-01-13 16:38:47 +01:00
Callum Whyte
4dd554172b Nested content UI fixes (#9384) 
* Fixing spacing of nested content header + icon

* Removing border from single Nested Content properties

* fix overlapping icon on nested content with multiple items

Co-authored-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
Co-authored-by: Mads Rasmussen <madsr@hey.com>
(cherry picked from commit 0fdd599596)

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
 2021-01-13 16:37:09 +01:00
Mads Rasmussen
3d9f765e01 changes search term model from primitive 
(cherry picked from commit 8a65a0f92b)
 2021-01-12 13:49:39 +01:00
Matt Darby
015882daa2 Remove type as it defaults to button 
(cherry picked from commit bc2faefb18)
 2020-12-15 14:25:50 +01:00
Matt Darby
7b32aeb127 Change defaultButton type to "button" 
(cherry picked from commit 7ddb52a34f)
 2020-12-15 14:25:41 +01:00
Sebastiaan Janssen
58c6e655b3 Merge branch 'v8/8.8' into v8/8.9 2020-12-14 15:07:38 +01:00
Sebastiaan Janssen
d5d7d31c08 Merge branch 'v8/8.7' into v8/8.8 2020-12-14 15:06:51 +01:00
Steve
7c20adef0e Track ng-repeat with id instead of label (#9340) 
(cherry picked from commit 39c4dcdaaa)
 2020-11-23 10:42:33 +01:00
Sebastiaan Janssen
aac35698a1 Merge branch 'v8/8.8' into v8/8.9 2020-11-04 10:07:04 +01:00
Sebastiaan Janssen
b69e65ab3b Merge branch 'v8/8.7' into v8/8.8 
# Conflicts:
#	src/SolutionInfo.cs
 2020-10-22 14:15:10 +02:00
Sebastiaan Janssen
81cbe365f6 Revert "Revert "Revert "umb-confirmation directive: move trashcan into directive and address accessibility issues (#8198)""" 
This reverts commit c903a01f15.
 2020-10-22 12:33:45 +02:00
Sebastiaan Janssen
f3af025c79 Revert "Takes the last commit from #9216 to make umb-confirm-action backwards compatible" 
This reverts commit 174909d735.
 2020-10-22 12:33:19 +02:00
Sebastiaan Janssen
174909d735 Takes the last commit from #9216 to make umb-confirm-action backwards compatible 2020-10-22 10:43:37 +02:00
Sebastiaan Janssen
c903a01f15 Revert "Revert "umb-confirmation directive: move trashcan into directive and address accessibility issues (#8198)"" 
This reverts commit 22a1423324.
 2020-10-22 09:53:02 +02:00
Niels Lyngsø
f3aad86413 updates CSS selector to match latest 
(cherry picked from commit dc6c72c136)
 2020-10-22 09:47:33 +02:00
Warren Buckley
abc42b5438 Merge pull request #9215 from umbraco/v8/bugfix/9129-keep-model-value-reference-after-empty 
9129 keep model value reference after empty
 2020-10-20 12:35:16 +01:00
Shannon
dce7076aab Fixes #9217 invite user form doesn't allow saving the password 
The problem was that the directive was changed to a component and as such all things are named with vm which was not transitioned across for this form. There was also an issue with the avatar which is fixed too.
 2020-10-20 11:47:41 +11:00
Shannon
3f883c7409 adds null checks in JS 2020-10-19 21:57:21 +11:00
BatJan
7d3df87b7f Change if check to be more specific ensuring it works in all picker instances 
(cherry picked from commit 1c77ec1562)
 2020-10-13 17:25:26 +02:00
Sebastiaan Janssen
e1e7a1777e Merge branch 'v8/8.8' into v8/8.9 2020-10-13 16:49:17 +02:00
Sebastiaan Janssen
22a1423324 Revert "umb-confirmation directive: move trashcan into directive and address accessibility issues (#8198)" 
This reverts commit 1cd79d81af.

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html

(cherry picked from commit f9b49fc5f3)
 2020-10-13 15:39:06 +02:00
Mike Masey
879d54b525 V8/feature/update icon picker to use umb icon (#9063) 
(cherry picked from commit 27751a4ae7)
 2020-10-06 15:09:01 +02:00
Sebastiaan Janssen
29a6b7a5c0 Merge branch 'v8/8.8' into v8/8.9 2020-10-06 09:13:54 +02:00
Sebastiaan Janssen
cfd20833c7 Merge branch 'v8/8.7' into v8/8.8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less
 2020-10-06 09:12:35 +02:00
Niels Lyngsø
3a06195e3d ensure fallback value is defined on value updates 2020-10-05 11:02:07 +02:00
Sebastiaan Janssen
67f42c02b9 Fix problem with ngdoc, the param requires a description 2020-10-02 13:08:09 +02:00
Warren Buckley
182184d1db Merge pull request #8843 from umbraco/v8/bugfix/8839-use-icon-for-plus-sign 
Review 8839 use icon for plus sign
 2020-10-01 12:11:44 +01:00
Claus
978d245f00 Merge remote-tracking branch 'origin/v8/8.8' into v8/8.9 2020-10-01 12:37:56 +02:00
Warren Buckley
ad3ff4d4d4 Merge pull request #8994 from umbraco/v8/bugfix/8924-clear-both-without-description 
fixes 8924, Always clear both
 2020-10-01 10:59:15 +01:00
Claus
19e2c8fa6e Fix JS errors when creating folders in the settings section 
(cherry picked from commit 4ecbb7abe6)
 2020-10-01 09:31:39 +02:00
Claus
b48145c87f Fix JS error preventing newly created dictionary items from opening automatically 
(cherry picked from commit 59f90bd08b)
 2020-10-01 09:31:23 +02:00
Claus
d5cc4ed914 Merge commit 'refs/tags/release-8.8.0^{}' into v8/8.9 
# Conflicts:
#	src/SolutionInfo.cs
 2020-10-01 08:34:59 +02:00
Bjarne Fyrstenborg
811f27cb01 Adjust condition to hide edit button if media is trashed, but otherwise show the button 
(cherry picked from commit 1d5afae0f6)
 2020-09-30 21:15:19 +02:00