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

462 Commits

Author SHA1 Message Date
Stephan
e40c9cb227 Fix missing dependencies errors, simplify 2018-12-12 16:07:21 +01:00
Stephan
710ec704b3 Merge branch temp8 into temp8-di2690 2018-12-07 09:52:46 +01:00
Shannon
3e95d94726 fixes build 2018-12-06 17:24:06 +11:00
Shannon
07f15ec7b3 Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	src/Umbraco.Core/Models/UserExtensions.cs
#	src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Tests/Migrations/Upgrades/SqlCeUpgradeTest.cs
#	src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/package.json
#	src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
#	src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
#	src/Umbraco.Web.UI/Umbraco/developer/RelationTypes/EditRelationType.aspx
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/es.xml
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/HealthCheck/Checks/DataIntegrity/XmlDataIntegrityHealthCheck.cs
#	src/Umbraco.Web/HealthCheck/NotificationMethods/EmailNotificationMethod.cs
#	src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs
#	src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx.cs
#	src/umbraco.cms/businesslogic/language/Language.cs
 2018-12-06 17:13:23 +11:00
Stephan
49a0b68b28 IContainer is IRegister+IFactory 2018-11-28 11:05:41 +01:00
Sebastiaan Janssen
f316b45ff8 Merge branch 'dev-v7' into dev-v7 2018-11-27 23:08:44 +01:00
Enkel Media
e9d53252b8 #3317 Appening Querystrings to url in ContentFinderByRedirectUrl (#3731) 2018-11-27 21:23:11 +01:00
Stephan
c23c7749b4 Composition fixes 2018-11-27 14:04:08 +01:00
Stephan
b8608f1b2e Refactor runtimes, injection and composition 2018-11-26 16:54:32 +01:00
Stephan
6ffc340725 Merge branch temp8 into temp8-di2690 2018-11-23 14:58:08 +01:00
Warren Buckley
54a2aa00a7 Revert "Temp8 tinymce" 2018-11-22 14:05:51 +00:00
avs099
b2ffe4b685 Update ContentFinderByRedirectUrl.cs 2018-11-08 19:48:16 -05:00
Warren Buckley
d420f61e13 Reduce VS Warnings: Remove ununused const string 2018-11-06 13:15:45 +00:00
Shannon
25dcc3f2c1 Removes GetChildren and GetDescendants from IMediaService, paging is now required 2018-10-31 23:11:37 +11:00
Stephan
d71c879374 Merge branch temp8 into temp8-di2690 2018-10-23 18:01:52 +02:00
Shannon
d9a4d1fa97 Manual merging 2018-10-23 16:12:23 +11:00
Dave Woestenborghs
fd1a9bb365 #3214 - umbracoUrlAlias with uppercase characters (#3220) 2018-10-09 21:51:04 +02:00
Stephan
66d931490e Merge branch temp8 into temp8-di2690 2018-10-08 19:22:20 +02:00
Stephan
0726ee1a39 Get ContentFinderByUrl to work on preview urls 2018-10-08 17:17:19 +02:00
Stephan
b6679551d4 Fix url provider for variant/invariant urls 2018-10-04 16:16:56 +02:00
Sebastiaan Janssen
dd7a4d262e Merge pull request #3019 from ed-parry/v8hackathon-remove-pageid-references 
Replaced references of PageID with the UmbracoContext calls. [v8hackathon]
 2018-09-25 21:45:06 +02:00
Sebastiaan Janssen
7c437998ec Merge pull request #2842 from leekelleher/U4-11555 
[v8] U4-11555 - Remove App_Browsers folder
 2018-09-25 16:06:54 +02:00
Ed Parry
22f25ee467 Replaced references of PageID with the UmbracoContext calls. 2018-09-23 13:39:51 +01:00
Shannon
62c0719712 Merge remote-tracking branch 'origin/temp8' into temp8-get-preview-working 2018-09-14 09:14:59 +10:00
Shannon
59a5f50b5f now you can preview specific variants 2018-09-14 00:44:36 +10:00
Warren Buckley
4b47943e05 Remove quotes within logging message templates - as when doing querying with logs makes these logs impossible to find 2018-09-11 08:44:58 +01:00
Shannon
2f74720c38 updates wording 2018-09-10 11:12:46 +10:00
Stephan
725fe61f91 Merge branch temp8 into temp8-di2690 2018-09-06 16:22:13 +02:00
Mads Rasmussen
33df7647d2 Merge pull request #2900 from umbraco/temp8-validation-quirks 
v8 validation quirks
 2018-09-06 15:00:05 +02:00
Stephan
d9d51584ea Fix merge 2018-09-06 14:10:26 +02:00
Shannon
20c0185ddf Adds unit tests for content controller 2018-09-06 17:37:47 +10:00
Stephan
31a356d98e Merge branch temp8 into temp8-di2690 2018-08-29 12:15:39 +02:00
Stephan
e8dfca5635 Merge branch temp8 into temp8-di2690 2018-08-27 10:19:41 +02:00
Sebastiaan Janssen
49df6e7c9d Merge branch 'U4-8550' of https://github.com/drpeck/Umbraco-CMS into drpeck-U4-8550 
# Conflicts:
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web/PublishedContentExtensions.cs
 2018-08-26 17:45:34 +02:00
Warren
9e996c68bb Refactored the error params, so that exception is before the message/template so its more in sync with Serilog signature & was an easy way to find some more logs I missed too 2018-08-17 15:41:58 +01:00
Warren
23ed9773bc FIRST PASS - Updates Umbraco.Web project to not use the func overload & to use new message template instead 2018-08-14 22:36:47 +01:00
leekelleher
0869a9be69 Removed Form.browser 
ref: http://issues.umbraco.org/issue/U4-11555

Also removed the referenced classes...

- FormRewriterControlAdapter
- UrlRewriterFormWriter
- LegacyRequestInitializer

These were being used to rewrite the `action` value on rendered `<form runat=server>` tags, (a la WebForms).
 2018-08-08 11:32:19 +01:00
Stephan
f049d1b479 Ensure PublishedRequest always has a culture 2018-08-01 10:42:50 +02:00
Stephan
2c66cdc102 Merge branch temp8 into temp8-di2690 2018-07-31 14:50:01 +02:00
Stephan
c209bdde5b Fix routing, AliasUrlProvider 2018-07-31 14:48:30 +02:00
Shannon
d073e727cb minor merge fixes 2018-07-31 15:11:31 +10:00
Imran Haider
2660b31370 Updated our.umbraco.org to .com 2018-07-27 16:41:57 +01:00
Stephan
97da0829a2 Refactor collection builders for IContainer 2018-07-20 16:36:46 +02:00
Stephan
9e9a0d301f Cleanup and Refactor 2018-07-20 09:49:05 +02:00
Stephan
fded7db542 Merge branch temp8 into temp8-di 2018-07-18 10:46:42 +02:00
Shannon
ec1d013004 Manually merges the IgnorePublishedContentCollisions change, removes more service locator pattern, removes ContextMapper with UmbracoContext and instead uses IUmbracoContextAccessor and adjusts some DI. 2018-07-18 14:34:32 +10:00
Sebastiaan Janssen
014e50a13a Merge pull request #2148 from LennardF1989/U4-10345 
Added possibilty to ignore collisions from an IContentFinder (U4-10345)
 2018-07-16 13:38:23 +02:00
Stephan
68d9b19f65 Merge branch temp8 into temp8-di 2018-07-12 19:24:24 +02:00
Shannon
7250b3d491 Fixes null checks on all parts of VariationContextAccessor.VariationContext.Culture and fixes translations with tokens for url collisions 2018-07-10 12:43:07 +10:00
Stephan
57d7888740 Merge branch temp8 into temp8-di 2018-07-06 17:49:02 +02:00