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

34141 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lars-Erik Aabech
fc447bb101 Should allow grid editors to use hash based settings (#9837) 
* Should allow grid editors to use hash based settings

* Swap to using vm in grid config controller, as well as showing button when there's map settings

* Included keys for styles in empty state check for grid settings

* converted the code into more AngularJS performant code

* Remove rogue change to grid.editors.config

* use watchCollection instead

Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
(cherry picked from commit 008827f785)
 2021-03-08 12:27:06 +01:00
Sebastiaan Janssen
5825aa5dee Merge branch 'v8/8.9' into v8/8.10 2021-03-08 10:07:08 +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
c10ed3693d Merge branch 'v8/8.9' into v8/8.10 2021-03-03 16:34:58 +01:00
Sebastiaan Janssen
62ac5434ff Merge branch 'v8/8.8' into v8/8.9 2021-03-03 16:34:02 +01:00
Sebastiaan Janssen
5d8eed3eac Merge branch 'v8/8.7' into v8/8.8 2021-03-03 16:33:43 +01:00
Sebastiaan Janssen
cf3bef8017 Merge branch 'v8/8.6' into v8/8.7 2021-03-03 16:33:13 +01:00
Bjarke Berg
0b5bace2f7 Bugfix: Members not locked out after failed login attempts (#9921) 
* https://github.com/umbraco/Umbraco-CMS/issues/9861
Added test that shows the error

* https://github.com/umbraco/Umbraco-CMS/issues/9861
Fixed test that shows the error. Caches needs to be active, otherwise it do not show the error

* https://github.com/umbraco/Umbraco-CMS/issues/9861
More fix of test that shows the error. Caches needs to be active, otherwise it do not show the error

* https://github.com/umbraco/Umbraco-CMS/issues/9861
Fix issue by raise event and thereby update caches.

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
(cherry picked from commit 1bac97e0b0)
 2021-03-03 16:32:28 +01:00
Sebastiaan Janssen
aaa8b0b4b2 Merge branch 'v8/8.9' into v8/8.10 2021-03-01 16:03:42 +01:00
Sebastiaan Janssen
7bc220b4b5 Merge branch 'v8/8.8' into v8/8.9 2021-03-01 16:03:18 +01:00
Sebastiaan Janssen
d5ee6c828d Merge branch 'v8/8.7' into v8/8.8 2021-03-01 16:02:37 +01:00
Sebastiaan Janssen
d4da9bdcb5 Merge branch 'v8/8.6' into v8/8.7 2021-03-01 16:02:11 +01:00
Bjarke Berg
8004c8dfd3 Merge pull request #9441 from umbraco/v8/bugfix/explicit-scope-examine 
Ensure there's explicit scopes used for all service access in the Examine indexing logic

(cherry picked from commit 3e7f912fcd)
 2021-03-01 15:55:36 +01:00
Sebastiaan Janssen
ef96b47899 Merge branch 'v8/8.9' into v8/8.10 2021-01-20 15:05:42 +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
bfde020d4f Merge branch 'v8/8.9' into v8/8.10 2021-01-20 14:47:26 +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
ae30a8db91 Bump version to 8.10.2 2021-01-20 11:29:04 +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
e913c2720c Bump version to 8.9.2 2021-01-20 11:27:40 +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
cda81ae9be Bump version to 8.8.3 2021-01-20 11:26:14 +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
0b3256c4fe Bump version to 8.7.2 2021-01-20 11:24:28 +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
Sebastiaan Janssen
e18bda50a1 Bump version to 8.6.7 2021-01-20 11:18:18 +01:00
Sebastiaan Janssen
0744b38fe4 Fixes umbraco/Umbraco-CMS#9244 
Log a warning instead of throwing an error so existing code doesn't fail
 2021-01-20 11:16:28 +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
Nik
6a8c2a0a55 [AMEND] Updated the redirect URL Repository to search for entries wit… (#9653) 
Co-authored-by: Nik Rimington <nrimington@spindogs.com>
(cherry picked from commit aa5470a801)
 2021-01-19 17:30:00 +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
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
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
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
a01bb67a4d Merge branch 'v8/8.9' into v8/8.10 2021-01-12 13:00:18 +01:00
Sebastiaan Janssen
870609f633 Merge branch 'v8/8.8' into v8/8.9 2021-01-12 12:57:29 +01:00
Sebastiaan Janssen
907fd9fa23 Merge branch 'v8/8.7' into v8/8.8 2021-01-12 12:54:12 +01:00
Sebastiaan Janssen
cfe5028dd0 Merge branch 'v8/8.6' into v8/8.7 2021-01-12 12:51:56 +01:00
Bjarke Berg
0f2db02289 Merge pull request #9640 from umbraco/v8/bugfix/memory-leak-9348 
Fixes a memory leak caused by deep cloning

(cherry picked from commit 824349ae0d)
 2021-01-12 12:41:01 +01:00