yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,847 Commits 4 Branches 7 Tags
62d6cf111ead7eda1fdd13b5a2ffb719fdf13179
Commit Graph

23281 Commits

Author SHA1 Message Date
Sebastiaan Janssen
62d6cf111e Applies fix for #3937 to v8 as well 2019-01-04 15:12:09 +01:00
Claus
2fad3c745a Merge branch 'temp8-3539-support-for-variants-in-redirects' into temp8 
# Conflicts:
#	src/Umbraco.Web/Routing/RedirectTrackingComponent.cs
 2019-01-04 14:36:55 +01:00
Bjarke Berg
6ad2adf4a2 #3539 - use culture to find the url in the actual redirect 2019-01-04 13:47:23 +01:00
Bjarke Berg
da6a815f16 #3539 - reverted one line 2019-01-04 13:17:01 +01:00
Stephan
025cdede6c Merge branch origin/temp8 into temp8-di2690 2019-01-04 11:43:14 +01:00
Claus
9821901717 Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Web/UI/LegacyDialogHandler.cs
#	src/Umbraco.Web/WebServices/SaveFileController.cs
 2019-01-04 11:30:51 +01:00
Bjarke Berg
9bf66b0881 #3539 - Re-enabled url redirect tracking and implemented support for culture variants 2019-01-04 11:24:30 +01:00
Stephan
2705de5d60 Revert "Temporary downgrade of MB due to missing onlien pkg" 
This reverts commit b8191c3652.
 2019-01-04 11:13:41 +01:00
Stephan
1875270db1 Compose after/before 2019-01-04 10:29:29 +01:00
Claus
08e13ac530 Merge pull request #3814 from umbraco/temp7-269-xss-stylesheets 
Removing malicious code from the name of a Stylesheet.
 2019-01-04 10:11:25 +01:00
Stephan
97272e6220 Bugfix 2019-01-04 09:55:09 +01:00
Claus
71f2b7ee06 updating unit tests. 2019-01-04 09:40:55 +01:00
Claus
7ead62730b reverting changes to StripHtml method. 2019-01-04 09:34:24 +01:00
Stephan
f6cd13488e Refactor collection builders to be nicer with DI 2019-01-04 09:34:08 +01:00
Stephan
3f1843def0 Merge remote-tracking branch 'lars-erik/temp8-u4-11427-remove-propertyinjection' into temp8-di2690 2019-01-04 08:36:48 +01:00
Stephan
1bd4cba9ac Fix component constructors 2019-01-04 08:36:38 +01:00
Bjarke Berg
e1709eaed5 Bugfix, missing return, when publishing with decendants and the root do not have variants. 2019-01-04 08:16:20 +01:00
Lars-Erik Aabech
7cfe2115c0 Actually uses a scope in the ScopeBuilderCreatesScopedCollection tests 2019-01-04 00:15:06 +01:00
Lars-Erik Aabech
8e5ed6eaa6 Internalize testing ctor to provide unambiguous ctor for container. (Non LI req. / MS-DI) 2019-01-03 22:43:08 +01:00
Lars-Erik Aabech
0455c7ffd5 Public ctor on ExamineComponent to allow construction 2019-01-03 22:14:49 +01:00
Lars-Erik Aabech
c18ed7e15a Registering WebRuntimeComponent and publicizing its dep. chain 2019-01-03 22:11:25 +01:00
Lars-Erik Aabech
b8191c3652 Temporary downgrade of MB due to missing onlien pkg 2019-01-03 21:38:56 +01:00
Lars-Erik Aabech
b8a939d1a1 Public ctor on CoreRuntimeComponent 2019-01-03 21:37:35 +01:00
Stephan
0481c2c736 Fix components 2019-01-03 21:10:13 +01:00
Stephan
9b756b9ce6 Fix components 2019-01-03 21:04:39 +01:00
Stephan
816ed84a2f Refactor components 2019-01-03 21:00:28 +01:00
Claus
f69cb89e30 Merge pull request #3810 from kjac/v8-fix-replace-snippet-jquery-dependencies 
V8: Replace jquery dependencies for partial snippets
 2019-01-03 13:44:57 +01:00
Stephan
9fe8b5f654 TEMP 2019-01-03 11:41:56 +01:00
Stephan
7a37c8743b Add container tests 2019-01-03 11:41:40 +01:00
Sebastiaan Janssen
aceb5c7971 Merge branch 'dev-v7' into temp8 
# Conflicts:
#	src/Umbraco.Core/IO/MediaFileSystem.cs
#	src/Umbraco.Web.UI.Client/src/less/helveticons.less
#	src/Umbraco.Web.UI.Client/src/views/content/copy.html
#	src/Umbraco.Web.UI.Client/src/views/content/move.html
#	src/Umbraco.Web.UI.Client/src/views/media/move.html
#	src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/dialogs/rollBack.aspx
#	src/Umbraco.Web/Editors/LogController.cs
#	src/Umbraco.Web/Editors/PasswordChanger.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs
 2019-01-03 10:32:34 +01:00
Stephan
4f7a5e3046 Bugfix RuntimeState 2019-01-03 09:50:51 +01:00
Stephan
a434ac8c74 Upgrade to ModelsBuilder -alpha.26 2019-01-03 09:11:11 +01:00
Kenn Jacobsen
4b60d8bca6 Fix the content template selector in the content tree 2019-01-03 07:57:23 +00:00
Kenn Jacobsen
525b229b42 Fix content creation from list views 2019-01-03 07:56:17 +00:00
Kenn Jacobsen
2dfbb1d555 Don't attempt to apply a filter if none is submitted 2019-01-03 07:53:20 +00:00
Stephan
81a9807206 Version 8.0.0-alpha.56 2019-01-02 18:14:48 +01:00
Stephan
ceab758100 Merge branch 'temp8' into temp8-di2690 2019-01-02 16:44:35 +01:00
Stephan
17d818b604 Make Current.Container public for Deploy, wont last 2019-01-02 15:29:22 +01:00
Stephan
ebf15b9052 Fix CacheRefresher and DistributedCache 2019-01-02 15:24:33 +01:00
Claus
fb9d5a3c5d Merge branch 'v8-feature-angular-public-access' of https://github.com/kjac/Umbraco-CMS into kjac-v8-feature-angular-public-access 2019-01-02 11:58:24 +01:00
Stephan
b21d07a282 Merge branch origin/temp8 into temp8-di2690 2019-01-02 10:23:24 +01:00
Aaron Powell
0e56f2035d Using npx for running gulp (#3938) 2018-12-31 14:10:31 +00:00
Kenn Jacobsen
0150b97278 Show password change validation errors at the correct fields (#3918) 
* Show password change validation errors at the correct password fields + remove the redundant "Could not reset password, errors: " message text

* Explicitly find the user instead of mapping it.
 2018-12-31 14:02:59 +00:00
Kenn Jacobsen
af2f531d31 Add missing localization of dialogs (#3844) 2018-12-31 13:37:58 +00:00
Kenn Jacobsen
884eaf50c3 Fix the flickering name when moving/copying mediatypes 2018-12-31 13:37:24 +00:00
Kenn Jacobsen
d054771fc6 Fix the flickering name when moving/copying doctypes 2018-12-31 13:36:25 +00:00
Sebastiaan Janssen
5e680e80e6 Deletes commented out code 2018-12-31 12:49:54 +00:00
Dave Woestenborghs
ee8b4c5884 #3916 fix multiple enumerations of ienumerable...so usernames and avatars are displayed correctly 2018-12-31 12:49:54 +00:00
Dave Woestenborghs
0ce54847b0 #3916 mapping to a IEnumerable resulted in all items in the result list being the same. Now map items indiviually. Could be caused by this : https://stackoverflow.com/questions/17268362/automapper-for-a-list-scenario-only-seems-to-repeat-mapping-the-first-object-in 2018-12-31 12:49:54 +00:00
Callum Whyte
b852c78861 Fixing spelling mistakes in helveticons CSS class names 
The icon picker uses these class names as labels, kept the old class names for backwards compatibility
 2018-12-31 12:47:04 +00:00