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

8657 Commits

Author SHA1 Message Date
Stephan
944d47f669 Refactor filesystems registration 2019-01-09 17:39:32 +01:00
Shannon
fa82e1660b Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-01-09 20:44:17 +11:00
Shannon
b3414166a6 webforms and legacy file cleanup 2019-01-09 20:43:46 +11:00
Stephan
9ef8e9afc1 Cleanup task runner 2019-01-09 10:05:10 +01:00
Shannon
4b58e34220 Align namespaces with _Legacy folder 
# Conflicts:
#	src/Umbraco.Web/_Legacy/Packager/PackageInstance/InstalledPackage.cs
 2019-01-09 19:08:09 +11:00
Stephan
349f48aa2d Refactor task runner maindom hooks 2019-01-08 20:49:21 +01:00
Stephan
436fa261f5 Merge remote-tracking branch 'origin/temp8' into temp8 2019-01-07 19:42:33 +01:00
Stephan
19ae9f5dee Refactor configuration for DI 2019-01-07 19:40:07 +01:00
Warren Buckley
9b7737f0e4 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-01-07 14:11:09 +00:00
Warren Buckley
c67cb0e8f2 Adds the TourFilterCollectionBuilder into the CompositionExtensions, as StarterKit uses this in its current ApplicationEventHandler 2019-01-07 14:11:00 +00:00
Claus
003d54cacd cleanup usings 2019-01-07 12:59:38 +01:00
Stephan
84f6239c98 Components Initialize and Terminate 2019-01-07 09:46:11 +01:00
Stephan
5670c6354e Introduce ComponentComposer to simplify registration of components 2019-01-05 15:49:10 +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
Bjarke Berg
9bf66b0881 #3539 - Re-enabled url redirect tracking and implemented support for culture variants 2019-01-04 11:24:30 +01:00
Stephan
1875270db1 Compose after/before 2019-01-04 10:29:29 +01:00
Stephan
97272e6220 Bugfix 2019-01-04 09:55:09 +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
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
Stephan
816ed84a2f Refactor components 2019-01-03 21:00:28 +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
Kenn Jacobsen
2dfbb1d555 Don't attempt to apply a filter if none is submitted 2019-01-03 07:53:20 +00:00
Stephan
ceab758100 Merge branch 'temp8' into temp8-di2690 2019-01-02 16:44:35 +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
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
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
Stephan
f21dbb3e77 Fix merge 2018-12-21 16:25:16 +01:00
Stephan
a60fd1b7be Merge branch origin/temp8 into temp8-di2690 2018-12-21 15:47:08 +01:00
Stephan
a571af8be2 Make more types IDiscoverable 2018-12-21 13:42:24 +01:00
Stephan
90ab90d6b9 Fix ExamineComponent crashing on shutdown 2018-12-21 13:42:04 +01:00
Stephan
bb9846a6ca Merge branch origin/temp8 into temp8-di2690 2018-12-21 10:58:38 +01:00
Stephan
7f6994514f Merge branch 'temp8' into temp8-contentquery-search-culture-3828 2018-12-21 09:00:03 +01:00
Shannon
698b83c455 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-12-21 14:17:36 +11:00
Shannon
d1befc876f manual merges 2018-12-21 13:48:59 +11:00
Shannon
7e20e81cc8 Fixes EntityRepository and EntityService to perform order by operations correctly 2018-12-21 13:15:46 +11:00
Stephan
e959605b39 Cleanup and deal with FIXMEs 2018-12-20 14:31:46 +01:00
Stephan
1ffd457985 Merge branch 'temp8' into temp8-3658-contextual-info-app 2018-12-20 13:42:19 +01:00
Stephan
4039127c3d Merge branch 'temp8' into temp8-contentquery-search-culture-3828 2018-12-20 13:31:38 +01:00
Stephan
23eabee1a2 Misc fixes 2018-12-20 13:31:34 +01:00