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

1642 Commits

Author SHA1 Message Date
Stephan
9e811ddd50 Fix fallback 2019-01-21 17:38:06 +01:00
Stephan
358a36dd87 Merge branch temp8 into temp8-3668-query-builder-snippits 2019-01-21 16:07:20 +01:00
Stephan
ee0c868687 Misc fixes for PR and Fallback 2019-01-21 16:02:16 +01:00
Stephan
9522ee826f Deal with fixme in Umbraco.Web 2019-01-21 16:01:37 +01:00
Niels Lyngsø
82d6af2013 Merge remote-tracking branch 'origin/temp8' into bugfix/temp8-media-could-not-be-moved-to-root 
# Conflicts:
#	src/Umbraco.Web/Trees/ApplicationTreeController.cs
 2019-01-21 11:13:08 +01:00
Stephan
d4664fbae6 Merge branch 'temp8' into temp8-3668-query-builder-snippits 2019-01-21 10:50:40 +01:00
Bjarke Berg
566895d3cd Merge branch 'temp8' into temp8-3417-macro-crud 2019-01-21 09:14:40 +01:00
Rasmus John Pedersen
e1c9b1818e Add Multi Url Picker to core (#2323) 2019-01-20 21:12:00 +01:00
Stephan
876056f0bb Merge branch temp8 into temp8-appCaches 2019-01-18 14:54:08 +01:00
Bjarke Berg
6fce8810fc Merge remote-tracking branch 'origin/temp8' into temp8-4037 
# Conflicts:
#	src/Umbraco.Web/PropertyEditors/MultiNodePickerConfigurationTreeSource.cs
 2019-01-18 13:28:57 +01:00
Dave Woestenborghs
7fd7d7a582 #3417 also send id of parameter with api response 2019-01-18 12:37:04 +01:00
Stephan
6f9a63d035 Merge branch 'temp8' into temp8-packaging-view-3996 2019-01-18 11:04:28 +01:00
Stephan
437385fd61 Bit of cleanup 2019-01-18 10:53:51 +01:00
Dave Woestenborghs
a83ac4a24d #3417 retreive data for edit screen 2019-01-18 09:31:38 +01:00
Stephan
a7a3fca8a8 Merge branch 'temp8' into temp8-tree-sections-no-more-xml 2019-01-18 09:23:55 +01:00
Bjarke Berg
59fe603ef7 Merge remote-tracking branch 'origin/temp8' into temp8-3668-query-builder-snippits 
# Conflicts:
#	src/Umbraco.Web/PublishedContentExtensions.cs
 2019-01-18 08:34:14 +01:00
Bjarke Berg
0daca21b51 Merge remote-tracking branch 'origin/temp8' into bugfix/temp8-media-could-not-be-moved-to-root 2019-01-18 08:31:54 +01:00
Stephan
b3d6de5994 Merge branch 'temp8' into temp8-appCaches 2019-01-17 19:05:56 +01:00
Stephan
e6bff12337 Merge branch temp8 into feature/IContentType-removale-from-IContent 2019-01-17 13:33:55 +01:00
Bjarke Berg
174db65714 3908 - Query build returns v8 valid statement - and examples of returned items 2019-01-17 13:33:44 +01:00
Chris Houston
941ede776b Corrected all the miss spellings of: 
Seperator -> Separator
Seperate -> Separate
 2019-01-17 13:16:43 +01:00
Stephan
d4c714eccd Stop injecting the runtime cache, use AppCaches 2019-01-17 11:19:06 +01:00
Stephan
0bee01e0ee Great AppCaches renaming 2019-01-17 11:01:23 +01:00
Robert
4ff714ae94 Merge remote-tracking branch 'origin/temp8' into temp8-4037 2019-01-17 08:10:02 +01:00
Shannon
0160f141f4 cleanup and explicitly registering sections 2019-01-17 17:04:53 +11:00
Shannon
cfe1b17eec Gets trees and sections loading now in a much more simplified way without any xml, now to cleanup 2019-01-17 16:40:11 +11:00
Shannon
355ac09d90 WIP - moved out the tree and section service from Core, these are web only things, removes their xml parsing, fixes base controller ctor params with UmbracoContext, need to implement tree/section collections taking into account controllers and not scanning so much 2019-01-17 13:20:19 +11:00
Shannon
ddcead2658 Updates EntityController to support stylesheets, languages and dictionary items GetAll so we can use it for the packager without worrying about security access to sections 2019-01-17 00:29:43 +11:00
Shannon
9ac47d6e85 Merge remote-tracking branch 'origin/temp8' into temp8-packaging-view-3996 2019-01-16 23:54:28 +11:00
Stephan
ba84d95308 Merge branch 'temp8' into temp8-packages-ui 2019-01-16 13:27:14 +01:00
Stephan
a60bdf5c01 HttpContext VariationContextAccessor fails nicely 2019-01-16 13:26:13 +01:00
Bjarke Berg
4ccc468cb6 Merge remote-tracking branch 'origin/temp8' into feature/IContentType-removale-from-IContent 
# Conflicts:
#	src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs
 2019-01-16 12:53:58 +01:00
Bjarke Berg
fe0d0ce1c7 Merge remote-tracking branch 'origin/temp8' into temp8-3668-query-builder-snippits 2019-01-16 12:49:23 +01:00
Bjarke Berg
00158b42e7 Merge remote-tracking branch 'origin/temp8' into bugfix/temp8-media-could-not-be-moved-to-root 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/content/move.html
#	src/Umbraco.Web.UI.Client/src/views/media/restore.html
 2019-01-16 11:47:13 +01:00
Shannon
c4418185ec Gets the angular view loading and allows navigating back to the view, cleans up non used lang keys 2019-01-16 21:27:14 +11:00
Shannon
90be93d948 Got upgrade status showing in the ui, started implementing merging the package definitions for upgrades but have decided to have an element for each install like we currenlty have in case there are problems installing. 2019-01-16 16:27:51 +11:00
Shannon
b34582b35c Merge remote-tracking branch 'origin/temp8' into temp8-packages-ui 
# Conflicts:
#	src/Umbraco.Core/Services/Implement/PackagingService.cs
 2019-01-16 02:00:44 +11:00
Shannon
b7c15dc393 gets readme and our package install working 2019-01-16 01:53:08 +11:00
Bjarke Berg
0b9705ca3f Revert "Revert "Support IContentType.IsElement"" 
This reverts commit a5efc25c
 2019-01-15 15:13:10 +01:00
Bjarke Berg
11ffafacdf Revert "Revert "Identify element types"" 
This reverts commit ff6a9ba9
 2019-01-15 15:12:59 +01:00
Robert
2e782a4f11 Mapping IsContainer into AdditionalData using IEntitySlim to EntityBasic mapper 2019-01-15 15:10:50 +01:00
Shannon
20d6a3b4b4 some cleanup and ensure the package file is deleted after install 2019-01-16 01:02:21 +11:00
Shannon
44ab0991ce Package installing is working 2019-01-15 22:08:08 +11:00
Shannon
18c90c5325 Package file installation logic all migrated and tests are running, now to do the package data installation 2019-01-14 14:28:00 +11:00
Bjarke Berg
b6f4ec3cbc #3668 - Handle fallback strategy with default value and ancestor + Handle fallback strategy when the ancestor is invariant and the item is variant 2019-01-11 11:47:42 +01:00
Bjarke Berg
0330be4e6b Merge remote-tracking branch 'origin/temp8' into feature/IContentType-removale-from-IContent 
# Conflicts:
#	src/Umbraco.Core/ContentExtensions.cs
#	src/Umbraco.Core/Models/Content.cs
#	src/Umbraco.Tests/Models/ContentTests.cs
#	src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs
#	src/Umbraco.Tests/Models/VariationTests.cs
#	src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
#	src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
#	src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
#	src/Umbraco.Web.UI/Umbraco/dialogs/ChangeDocType.aspx.cs
 2019-01-11 08:29:29 +01:00
Shannon
c89b50f0b8 large refactor/cleanup of most of the old package installer logic dealing with persisting the installedPackages.config which is now in the services, creates new parsers and removes a ton of old code, changes fetching packages to be async, uses XElement instead of old XmlNode apis, next we need to do the actual package installer updates 2019-01-11 14:30:04 +11:00
Shannon
687aa8cc99 Merge remote-tracking branch 'origin/temp8' into temp8-packages-ui 2019-01-11 10:37:22 +11:00
Stephan
ed7c8da81f Merge branch 'temp8' of https://github.com/StefanoChiodino/Umbraco-CMS into temp8-pr3583 2019-01-10 16:29:36 +01:00
Shannon
5f972384b1 WIP - new IEntityXmlSerializer, IPackageCreation, PackageActionRunner, large refactor of entity serialization, no more IPackagingService.Export methods, ports legacy package creation code to new IPackageCreation, more more ExportEventArgs (makes no sense) 2019-01-10 12:44:57 +11:00