yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,199 Commits 4 Branches 7 Tags
120dbd358e2e075f82a4aa0baf61bf42c7418d84
Commit Graph

11454 Commits

Author SHA1 Message Date
Sebastiaan Janssen
724d4d1e20 Merge branch 'v8/8.10' into v8/8.11 
# Conflicts:
#	src/SolutionInfo.cs
 2021-01-20 11:29:47 +01:00
Sebastiaan Janssen
251c5d08ef Merge branch 'v8/8.9' into v8/8.10 
# Conflicts:
#	src/SolutionInfo.cs
 2021-01-20 11:28:31 +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
Niels Lyngsø
b6558cf734 empty value should also enable in order to stay backwards compatible. 
(cherry picked from commit 2321fbfcab)
 2021-01-20 11:06:03 +01:00
Sebastiaan Janssen
a04af69181 Merge branch 'v8/8.10' into v8/8.11 2021-01-19 17:31:07 +01:00
Bjarne Fyrstenborg
b1eebdd598 Add back icon name in class attribute to work again with font icons 
(cherry picked from commit c1ebfc58cf)
 2021-01-19 17:18:49 +01:00
Sebastiaan Janssen
23a50df3a5 Merge branch 'v8/8.10' into v8/8.11 2021-01-13 17:02:54 +01:00
Sebastiaan Janssen
46faf32c9e Merge branch 'v8/8.9' into v8/8.10 2021-01-13 17:02:29 +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
1842f766ae Merge branch 'v8/8.10' into v8/8.11 2021-01-13 16:50:02 +01:00
Sebastiaan Janssen
7cbc09ba89 Merge branch 'v8/8.9' into v8/8.10 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
 2021-01-13 16:49:33 +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
Sebastiaan Janssen
cec4a8db8c Merge branch 'v8/8.10' into v8/8.11 2021-01-12 13:52:13 +01:00
Sebastiaan Janssen
542483fb18 Merge branch 'v8/8.9' into v8/8.10 2021-01-12 13:51:36 +01:00
Mads Rasmussen
3d9f765e01 changes search term model from primitive 
(cherry picked from commit 8a65a0f92b)
 2021-01-12 13:49:39 +01:00
Sebastiaan Janssen
8dbcb8df16 Revert "Removed icon font classes from umb-icon implementations (#9255)" 
This reverts commit 7a71bc5410.
 2021-01-11 11:40:02 +01:00
Sebastiaan Janssen
c10c61b1b6 Revert "Fix legacy icons no longer displaying after changes in #9255" 
This reverts commit 1b95282c17.
 2021-01-11 11:39:48 +01:00
Sebastiaan Janssen
1b95282c17 Fix legacy icons no longer displaying after changes in #9255 
(cherry picked from commit f8692590d0)
 2021-01-11 10:28:40 +01:00
Sebastiaan Janssen
ca5c56dccd Merge branch 'v8/8.10' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI/config/umbracoSettings.config
 2021-01-08 15:43:45 +01:00
Sebastiaan Janssen
967485f4e1 Merge branch 'v8/contrib' into v8/dev 
# Conflicts:
#	src/Umbraco.Core/Runtime/SqlMainDomLock.cs
 2021-01-08 15:18:03 +01:00
Nathan Woulfe
ecf061229f Update edit.html 2021-01-04 10:56:52 +01:00
Poornima Nayar
e220baf00c Added ngDocs for contenttyperesource 2020-12-28 11:34:48 +00:00
Bjarke Berg
97cdfc302c Merge pull request #9485 from umbraco/v8/feature/update-cypress 
Update cypress
 2020-12-18 15:42:06 +01:00
Bjarke Berg
3f0f5c1449 Fixed tests and update testhelper 2020-12-18 12:23:44 +01:00
BatJan
c6b444e055 Replace old search markup with shiny umb-search-filter directive 2020-12-17 02:03:30 +01:00
Bjarne Fyrstenborg
b4ef93e1b4 Use ace xml mode for package actions 2020-12-17 09:27:41 +10:00
Poornima Nayar
37aa00dc4a Created ngDocs for modelsBuilderManagementResource 2020-12-17 09:03:57 +10:00
Poornima Nayar
7e15c6fd78 Updated ngDocs for elementTypeResource 2020-12-17 09:02:23 +10:00
Poornima Nayar
102ae0c402 Updated the UI docs for the authresouce 2020-12-16 09:46:03 +10:00
Bjarne Fyrstenborg
9bcfbf282b Temporary fix to ensure content wrapper is positioned 0px from left in section without tree 2020-12-16 09:38:54 +10:00
Sebastiaan Janssen
03c6227bfe Merge branch 'v8/8.9' into v8/8.10 2020-12-15 14:26:44 +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
Matt Darby
bc2faefb18 Remove type as it defaults to button 2020-12-15 10:39:01 +00:00
Matt Darby
7ddb52a34f Change defaultButton type to "button" 2020-12-15 10:39:01 +00: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
Niels Lyngsø
734d33fe1c change dialog 2020-12-14 11:14:12 +01:00
Dave Woestenborghs
4d74f57a81 V8 - remove console.log statements (#9533) 
* #9516 removed console logging statements in macroparemeter picker

* #9516 Removed another console log statement

* Removed console log statement from view
 2020-12-11 18:08:41 +00:00
Nathan Woulfe
54fa2f42e9 remove unnecessary classnames/markup (#9098) 2020-12-11 02:24:51 +01:00
Warren Buckley
e38e5d6577 V8: Angular Divorce: isUndefined (#7856) 
* Bye bye angular.isUndefinied & hello Utilities.isUndefined

* Add utilities.js to lazyload initialise scripts

* Remove utilities.js as copied over client folder
 2020-12-10 10:21:34 +10:00
Rachel Breeze
7a71bc5410 Removed icon font classes from umb-icon implementations (#9255) 
* Changed the name of the example class in the mark up as it looks like the icon and the class name may need to be the same in order for umb-icon to work

* Removed the font icon classes in the umb-icon directive calls

* updates to remove class="icon", tidy up alignment in schedule overlay

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
 2020-12-10 09:28:37 +10:00
David Brendel
cdd6513c16 Added char counter for dictionary items (#9194) 
* Added char counter

* use single localize directive

Co-authored-by: David Brendel <info@davidbrendel.de>
Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
 2020-12-10 09:13:35 +10:00
patrickdemooij9
0a3a0f4f76 9078: Allow changing the login logo through umbracoSettings (#9083) 
* 9078: Allow changing the login logo through umbracoSettings

* 9078: Add default login logo in code
 2020-12-09 09:23:48 +01:00