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

29615 Commits

Author SHA1 Message Date
Sebastiaan Janssen
9ac600aeff Merge branch 'v8/dev' into v8/contrib 2020-09-28 20:35:26 +02:00
Niels Lyngsø
5d9389b37c adjust default size of umb-button-ellipsis and its apperance in umb-tree 2020-09-28 19:53:23 +02:00
Niels Lyngsø
956c81ff32 8.8 Revert icon styling, to ensure backwards compatibility (#8941) 2020-09-28 19:44:58 +02:00
Warren Buckley
1868c215d9 Merge pull request #8850 from umbraco/v8/feature/umb-property-info-button 
Review Feature: umb-property-info-button
 2020-09-28 11:49:24 +01:00
Niels Lyngsø
b053ad1423 set to be required 2020-09-25 14:02:22 +02:00
Niels Lyngsø
b5374152a1 make baseUrl an optional part of configuration 2020-09-25 12:45:45 +02:00
Niels Lyngsø
4085468125 update dependency name 2020-09-25 12:01:40 +02:00
Niels Lyngsø
b46dad39ff only write config if file does not already exist 2020-09-25 11:50:57 +02:00
Niels Lyngsø
78724c11eb updated readme 2020-09-25 11:36:43 +02:00
Niels Lyngsø
9286282eca updated text 2020-09-25 11:36:28 +02:00
Niels Lyngsø
26905078ca create enviroment configuration through install script 2020-09-25 11:22:49 +02:00
Sebastiaan Janssen
19b4035359 Merge branch 'v8/dev' into v8/contrib 2020-09-24 14:44:26 +02:00
Shannon
e4c5010759 Fixes issue with exceptions in logs because we are trying to unbind from httpapplication events but you cannot do that. 
(cherry picked from commit 5ed94065a7)
 2020-09-24 11:43:34 +02:00
Sebastiaan Janssen
0531fce9e2 Move the IIconService and IconModel to the Umbraco.Core project 
See issue #8919
 2020-09-23 16:20:55 +02:00
Sebastiaan Janssen
f29c5f0e3b Merge branch 'v8/dev' into v8/contrib 2020-09-23 11:18:43 +02:00
Sebastiaan Janssen
d6275f34f7 Merge branch 'v8/8.6' into v8/dev 
# Conflicts:
#	src/Umbraco.Web/Security/MembershipHelper.cs
 2020-09-23 11:09:40 +02:00
Bjarne Fyrstenborg
59784a1551 Update noUiSlider to v14.6.2 2020-09-23 14:18:16 +10:00
Claus
6122bffa24 Merge remote-tracking branch 'origin/v8/bugfix/8433-member-login-sql-locks' into v8/8.6 2020-09-22 13:14:03 +02:00
Claus
8fddb52f9a Merge remote-tracking branch 'origin/v8/bugfix/examine-reindex' into v8/8.6 2020-09-22 11:42:44 +02:00
Claus
b12fad75da Merge remote-tracking branch 'origin/v8/8.8' into v8/dev 2020-09-22 10:38:25 +02:00
Bjarke Berg
1badb69481 #8919 - Clean up obsolete ctor 2020-09-22 10:14:34 +02:00
Bjarke Berg
164fa24ef3 #8919 - Fix issue with wrong casing of variable name 2020-09-22 10:04:55 +02:00
Bjarke Berg
5df3e051d3 Merge remote-tracking branch 'origin/v8/bug/8919-cache-icons-used-in-login-screen' into v8/bug/8919-cache-icons-used-in-login-screen 
# Conflicts:
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/BackOfficeModel.cs
#	src/Umbraco.Web/Editors/IconController.cs
#	src/Umbraco.Web/Services/IIconService.cs
#	src/Umbraco.Web/Services/IconService.cs
 2020-09-22 09:21:45 +02:00
Bjarke Berg
ccc0e82579 #8919 - Avoid having fat controller and do not new up a controller in a model 2020-09-22 08:58:16 +02:00
Claus
6e56b16342 adding IconService 2020-09-22 08:57:48 +02:00
Claus
b327399cd2 adding icon svg data from IconController. 2020-09-22 08:11:58 +02:00
Niels Lyngsø
d3db24e705 Merge remote-tracking branch 'origin/v8/8.8' into v8/bug/8919-cache-icons-used-in-login-screen 2020-09-17 15:00:02 +02:00
Niels Lyngsø
e2957bb715 inject icons to iconHelper to avoid making requests to the icon controller 2020-09-17 14:59:49 +02:00
Niels Lyngsø
0506c8c555 defineIcon method 2020-09-17 14:59:12 +02:00
Sebastiaan Janssen
6b0539fefc Set version to RC 2020-09-17 12:19:07 +02:00
Lars-Erik Aabech
6d15a2fce3 Eliminates error/no-preview when grid media picker have no crop set (#8620) 
(cherry picked from commit deb03e4d82)
 2020-09-17 11:35:17 +02:00
Lars-Erik Aabech
deb03e4d82 Eliminates error/no-preview when grid media picker have no crop set (#8620) 2020-09-17 11:32:52 +02:00
Niels Swimberghe
6d2135edd5 Change wrong URL in KeepAlive XML Comments 
The XML comments for KeepAlive mention the URL for the KeepAlive.Ping action but incorrectly omits 'umbraco' from the path.
The change adds the 'umbraco' section to the path.

(cherry picked from commit 312dc1d9a7)
 2020-09-17 09:19:09 +02:00
Warren Buckley
5a37854dd5 Merge pull request #7599 from umbraco/v8/feature/ui-media-create-button-style 
UI: corrected button style to match new style
(cherry picked from commit 2e055ca146)
 2020-09-17 09:18:55 +02:00
Niels Swimberghe
312dc1d9a7 Change wrong URL in KeepAlive XML Comments 
The XML comments for KeepAlive mention the URL for the KeepAlive.Ping action but incorrectly omits 'umbraco' from the path.
The change adds the 'umbraco' section to the path.
 2020-09-17 12:25:09 +10:00
Niels Lyngsø
1fc8e826f6 Merge remote-tracking branch 'origin/v8/contrib' into v8/feature/umb-property-info-button 2020-09-16 15:08:27 +02:00
Niels Lyngsø
9882edeca0 added translation to demo implementation 2020-09-16 14:54:25 +02:00
Niels Lyngsø
4a8703d5a3 no message 2020-09-14 11:56:50 +02:00
Bjarne Fyrstenborg
600ae926d4 Remove local function to create guid and use String.CreateGuid() extension function instead (#8886) 2020-09-13 22:21:30 +02:00
Bjarke Berg
f58e1e8edb Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB7482-acceptance-tests-for-content 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
 2020-09-09 13:14:20 +02:00
Sebastiaan Janssen
1f44b94ef6 Merge branch 'v8/dev' into v8/contrib 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
#	src/Umbraco.Web.UI.Client/test/config/karma.conf.js
 2020-09-09 12:52:42 +02:00
Sebastiaan Janssen
0662284f29 Merge branch 'v8/8.7' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
 2020-09-09 12:48:28 +02:00
Bjarke Berg
6e25885804 Simplified the drag and drop 2020-09-09 10:29:41 +02:00
Bjarke Berg
b4b7bb438d updated version of testhelpers 2020-09-09 07:51:05 +02:00
Bjarke Berg
7641b8da54 Merge remote-tracking branch 'origin/v8/8.7' into v8/feature/AB7482-acceptance-tests-for-content 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
 2020-09-09 07:46:35 +02:00
Bjarke Berg
34c09ce12d Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB7482-acceptance-tests-for-content 2020-09-08 21:05:58 +02:00
Sebastiaan Janssen
ecff24089c Bump version to 8.7.0 2020-09-08 14:46:22 +02:00
Bjarke Berg
bef8cb9589 Added old ctor to avoid a breaking change 2020-09-08 14:32:09 +02:00
Warren Buckley
c3d69df27b Merge pull request #8842 from umbraco/v8/bugfix/block-list-copying 
Ensure new UDIs for blocks when copying
 2020-09-08 11:19:18 +01:00
Ronald Barendse
ddc922a583 8.7RC Add generic BlockListItem classes (#8841) 
(cherry picked from commit 5faa9ae22f)
 2020-09-08 12:11:14 +02:00