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

682 Commits

Author SHA1 Message Date
Warren Buckley
cdf9260f02 Update the hard coded content app aliases until this gets moved into a package.manifest or similar?! 2018-09-14 09:20:05 +01:00
Shannon
ec71814ec2 Fixes up nullable State, fixes up tracking global query strings in case they are removed by other routes 2018-09-14 11:31:43 +10:00
Shannon
8c90b7fa28 Cleans up code, fixes tests, adds comments 2018-09-14 10:08:09 +10:00
Shannon
5009dfa0d7 Merge remote-tracking branch 'origin/temp8' into temp8-206-listview-variant-states 2018-09-14 09:15:51 +10:00
Warren Buckley
4782f03334 ping pong with shan's reviews - checks for doctype/contenttype is variant or not 2018-09-13 13:25:54 +01:00
Warren Buckley
082d6e6792 Rather than throw null ex's if culture not set - return the underlying source property (As used for both variant & invariant mapping in list views) 2018-09-13 13:05:36 +01:00
Warren Buckley
772c0b7b6a Merge branch 'temp8' into temp8-204-ListView-Variant-PublishedStates 
# Conflicts:
#	src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs
 2018-09-13 12:10:50 +01:00
Warren Buckley
4b715d2081 Null checks for culture added and moved date to var to avoid getting item twice 2018-09-13 12:07:33 +01:00
Warren Buckley
46ff45c2f0 Makes State a ContentSavedState enum nullable - otherwise media items was getting a default enum of not created 2018-09-12 15:34:48 +01:00
Warren Buckley
551e8120c9 Adds state property to ContentItemBase (Not sure if this will blow things up or if I need to use a diff model for ListView children now) 
Adds/copies the same logic from ContentSavedStateResolver.cs
 2018-09-12 12:08:51 +01:00
Warren Buckley
d39bb96056 Update ContentMapper to display variant information for bool Published and UpdateDate for Variant ListView 2018-09-11 12:33:32 +01:00
Shannon Deminick
fe6b2bb43f Merge pull request #2944 from umbraco/temp8-18-ListViewVariants 
List View - Updates Node Name based on selected Variant
 2018-09-10 18:31:18 +10:00
Warren Buckley
2fcabdee0a Use ResolutionContext as opposed to an inline AfterMap function with a CustomResolver class 2018-09-10 09:09:24 +01:00
Stephan
69e8b11a79 Fix tests 2018-09-07 11:43:57 +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
Shannon
729177ffef Fixes issue with not showing validation errors in the dialogs when creating content and saving/publishing when the names haven't been filled out, adds unit tests to support. 2018-09-06 20:33:32 +10:00
Shannon
aed9ad3a66 Merge remote-tracking branch 'origin/temp8' into temp8-nuget-pkgs 
# Conflicts:
#	build/NuSpecs/UmbracoCms.nuspec
 2018-08-29 12:24:38 +10:00
Shannon
029eff1f8a Some refactoring to decouple web based assemblies from Umbraco.Core and move whatever we can to Umbraco.Web where web based assemblies are used. Decouples System.Drawing entirely from Umbraco.Core and removes the Active Directory dependency from Umbraco.core. 2018-08-29 01:15:46 +10:00
Stephan
eaacdc0514 Deal with fixmes in IContent IsCultureSomething 2018-08-28 15:11:13 +02:00
Shannon Deminick
a151829b26 Merge pull request #2845 from umbraco/temp8-serilog 
Bye bye Log4Net, Hello Serilog
 2018-08-28 20:31:12 +10:00
Mads Rasmussen
ec7610f290 Merge pull request #2865 from umbraco/temp8-w150 
Temp8 w150
 2018-08-23 10:42:35 +02:00
copilaurobert
ab6d5d09e2 "More" button now shows a tray containing overflowing apps that passed the set app limit 2018-08-20 15:57:58 +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
copilaurobert
4efc0c8be2 Initial commit on "more" button 2018-08-17 14:14:01 +02:00
Shannon
54af649b78 Cleans up some models, adds another unit test, fixes the Info tab state updating when a content item is changed. 2018-08-16 23:30:33 +10:00
Shannon
2a15feec40 Fixes state issue to ensure that non-created variants show up as not-created 2018-08-15 15:13:27 +10: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
Shannon
d237fd7e26 Merge branch 'temp8' into temp-variants-with-file-uploads 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
 2018-08-09 15:27:21 +10:00
Shannon
f921e891a3 Fixes issue with IsEdited and state to make things consistent and easy 2018-08-08 16:29:07 +10:00
Shannon
69acaabec1 Fixes creating doc types, some null checks missing and an issue with how umbgridselector is responsible for syncing the template alias on a new doc type 2018-08-08 15:35:02 +10:00
copilaurobert
0b51cb703d Back arrow from list view children will redirect back to parrent, changed the order content apps get added to have the ListView app added first. 2018-08-07 15:59:19 +02:00
Shannon
08fe947575 Gets the image cropper posting files correctly 2018-08-07 18:37:55 +10:00
Shannon
cd89d016d1 Adds culture to the properties and removes reliance on tabbed-content directive for culture, adds a new directive for file uploads for properties that is more like the image cropper and maintains state when switching between variants. 2018-08-07 17:10:02 +10:00
Shannon
1f25847cd7 Gets contextual culture server validation working 2018-08-02 20:00:35 +10:00
Shannon
6a94694f16 Got models pulled apart and simplified, much less inheritance and easier to follow, start wiring up the model binding logic for content along with validation for each variant 2018-08-01 16:46:13 +10:00
Shannon
c073ab2731 WIP still pulling apart models, binders, validators 2018-08-01 15:40:54 +10:00
Shannon
122c18e6d7 Merge branch 'temp8' into temp-editing-all-variants 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
 2018-07-31 15:56:04 +10:00
Shannon
5ef067b5f0 More manual merges 2018-07-31 13:05:54 +10:00
Shannon
18cd9ea1e8 WIP refactor commit for getting all variants at once saving, this requires pulling apart a lot of the models and corresponding binders and validators. 2018-07-19 19:32:07 +10:00
Shannon
888f8cfc56 Merge branch 'temp8' into temp-editing-all-variants 
# Conflicts:
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs
#	src/Umbraco.Web/Models/Mapping/MediaMapperProfile.cs
 2018-07-19 19:30:38 +10:00
Shannon
959caf4d04 Fixes tests and merging issues, simplifies TabsAndPropertiesResolver since it doesn't need umbracocontext, only the MemberTabsAndPropertiesResolver one does 2018-07-18 15:42:12 +10: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
Stephan
baead95c33 Comments and notes 2018-07-17 18:42:23 +02:00
Shannon
e9752cd5e1 Gets all list views working correctly with content apps, fixes various issues, cleans up a bunch of code and reduces amount of service locator. 2018-07-17 14:23:07 +10:00
Shannon
c8e65f085b Gets content apps working nicer so we can have a proper view model that is discoverable, updates list views to use the new way, removes strange hack of copying a list view from a tab that doesn't exist. 2018-07-16 22:32:46 +10:00
Shannon
9a2aa8fff0 Fixes up tests 2018-07-16 20:24:49 +10:00
Shannon
d3ad0b8e03 Merge remote-tracking branch 'origin/temp8' into temp-editing-all-variants 2018-07-16 18:41:24 +10:00
Shannon
072c1a6764 WIP - editing all variants at once, this is getting things wired up to display a content item, lots of TODOs added, models and mappings refactored, content apps put in c# model, etc... 2018-07-13 12:45:04 +10:00
Stephan
2051caaa01 Post-merge fixes 2018-07-12 18:05:48 +02:00
Shannon
92f85fad4a Merging dictionary changes 2018-07-11 16:59:05 +10:00