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

1231 Commits

Author SHA1 Message Date
elitsa
e2acc8b447 Remove sections icons - not needed anymore 2018-10-08 10:00:52 +02:00
elitsa
0cc5a01069 packages section is there with translations sections and correct trees 2018-10-05 11:09:33 +02:00
Matthew-Wise
a33ccd15c6 Convertion of assigndomain2.aspx to angular (#2897) 2018-09-30 16:02:09 +02:00
Robert
442e0c93a5 Merge branch 'temp8' into temp8-p181 2018-09-27 15:17:56 +02:00
Shannon
83501ba1eb Gets tree node states showing correctly for variants. 2018-09-27 19:30:31 +10:00
Stephan
ad8c309f3d Variant-contextual breadcrumb 2018-09-26 16:27:34 +02:00
Stephan
14bd8a0851 Cleanup some DTOs 2018-09-25 18:05:14 +02:00
Stephan
d6775aa79a Implement content apps code config and manifest 2018-09-21 08:09:53 +02:00
Shannon
82b2778a59 Merge branch 'temp8' into temp8-p188 2018-09-19 16:16:03 +10:00
Stephan
95361da1f8 Cleanup/fix content variants mapping 2018-09-17 13:19:29 +02:00
Mads Rasmussen
daa8b90372 Merge pull request #2982 from umbraco/temp8-get-preview-working 
v8 - Gets previewing working with variants
 2018-09-14 13:41:18 +02:00
Warren Buckley
cd151ac19a Update MediaApp resolver with new aliases 2018-09-14 10:53:12 +01:00
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
Shannon
62c0719712 Merge remote-tracking branch 'origin/temp8' into temp8-get-preview-working 2018-09-14 09:14:59 +10:00
Shannon
e771e781dd finally it actually previews 2018-09-14 00:14:03 +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
3f4e6dfce8 Gets success notifications showing in the save/publish dialogs 2018-09-04 16:16:11 +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
9c84d5e3f9 more work with variants, saving, publishing and validation. 2018-08-14 20:21:33 +10: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
Warren
00487c87fc Merge branch 'temp8' into kows-hackathon-import-doc-type-to-angular 2018-08-08 13:23:41 +01:00
Robert
c2433a336c Merge branch 'temp8' into temp-editing-all-variants 2018-08-08 13:46:19 +02:00
Warren
44e76adbd1 Merge branch 'hackathon-import-doc-type-to-angular' of https://github.com/kows/Umbraco-CMS into kows-hackathon-import-doc-type-to-angular 
# Conflicts:
#	src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
 2018-08-08 12:01:15 +01:00
Warren
fc7c2523c2 Merge branch 'dev-v7' into temp8 (The small fixes that Shan suggested) 
# Conflicts:
#	src/Umbraco.Web/Editors/ContentController.cs
 2018-08-08 09:21:58 +01:00
Warren
7397541259 Minor fixes to notification dialog after some feedback from Shan when merging this up into V8 2018-08-08 09:04:09 +01:00
Shannon
f921e891a3 Fixes issue with IsEdited and state to make things consistent and easy 2018-08-08 16:29:07 +10:00