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

726 Commits

Author SHA1 Message Date
Stephan
f10b86c9ec Fix RelationMapperProfiler 2018-12-10 17:08:14 +01:00
Claus
cfd6a08366 Merge branch '3436-relations-editor' of https://github.com/jamescoxhead/Umbraco-CMS into jamescoxhead-3436-relations-editor 2018-12-10 13:27:34 +01:00
Shannon
bcd908e47d Changes term Indexer to Index and fixes a failing test 2018-12-10 13:06:39 +11:00
Stephan
1eee6dfb2f Cleanup 2018-12-07 14:05:47 +01:00
Shannon
56d1a317c0 Gets searching working in the dashboard, updates to latest examine 2018-12-04 14:25:37 +11:00
James Coxhead
df961d9199 Merge branch 'temp8' into 3436-relations-editor 
# Conflicts:
#	src/Umbraco.Web/Trees/RelationTypeTreeController.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
 2018-12-02 23:31:54 +00:00
James Coxhead
4617c0c24f Tidy up - remove obsoleted classes 2018-12-02 18:17:20 +00:00
Shannon
340b8e6cef Latest examine, updates for dashboard, adds UmbracoExamineIndexDiagnostics 2018-11-29 13:55:51 +11:00
Shannon
b6790261c4 Adds test 2018-11-26 17:20:15 +11:00
James Coxhead
738b42964d Added save action 2018-11-20 23:15:16 +00:00
James Coxhead
10f6f8df90 Show relations in edit view 2018-11-15 22:22:15 +00:00
Shannon
204c4e21fc fix merge 2018-11-14 22:31:51 +11:00
Shannon
76f6721c80 Got some of the angular bits wired up 2018-11-09 16:12:08 +11:00
Claus
8f43451519 Merge pull request #3503 from kjac/feature-angular-stylesheets-editing-in-tabs 
V8: Angular implementation of stylesheets editing
 2018-11-06 13:52:32 +01:00
Robert
7e8578c9fb Fixes unit test by ignoring VariesByCulture property on MemberMapperProfile and mapping on MediaMapperProfile. 2018-11-06 11:38:49 +01:00
Kenn Jacobsen
d0e6d0af2f Merge branch 'temp8' into feature-angular-stylesheets-editing-in-tabs 2018-11-02 08:46:57 +01:00
Warren Buckley
e07e12092c Adds 'VariesByCulture` property to ContentItemBasic model & its mapping - so that the GetChildren API call for list view can know if each child item varies by culture or not 2018-11-01 11:29:16 +00:00
Shannon
b8a65febf4 Merge remote-tracking branch 'origin/temp8' into temp8-IAction-cleanup 
# Conflicts:
#	src/Umbraco.Tests/Composing/ActionCollectionTests.cs
#	src/Umbraco.Web/Models/Trees/MenuItem.cs
#	src/Umbraco.Web/_Legacy/Actions/Action.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionAssignDomain.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionBrowse.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionChangeDocType.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionCopy.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionCreateBlueprintFromContent.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionDelete.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionEmptyTranscan.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionExport.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionImport.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionMove.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionNew.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionNotify.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionNull.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionPackage.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionPackageCreate.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionProtect.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionPublish.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionRePublish.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionRefresh.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionRestore.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionRights.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionRollback.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionSort.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionToPublish.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionTranslate.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionUnPublish.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionUpdate.cs
#	src/Umbraco.Web/_Legacy/Actions/ContextMenuSeperator.cs
#	src/Umbraco.Web/_Legacy/Actions/IAction.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/TreeMenu/ActionDeleteRelationType.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/TreeMenu/ActionNewRelationType.cs
 2018-10-29 23:35:24 +11:00
Robert
bc20db5a46 Merge pull request #3432 from umbraco/temp8-153-invariant-properties 
Temp8 153 invariant properties
 2018-10-29 12:39:48 +01:00
Shannon
bae9bb6108 Initial cleanup of IActions, menu items, etc... 2018-10-29 17:27:33 +11:00
James Coxhead
06d19f2735 Load relation type edit view 2018-10-28 19:04:00 +00:00
Kenn Jacobsen
68f05e05d1 Initial create and edit 2018-10-27 21:18:03 +02:00
Warren Buckley
9a1a13ba81 Fix the ordering logic - it helps if you actually assign the ordered items back to the list *facepalm* 2018-10-24 14:55:01 +01:00
Warren Buckley
a7b13e2b4b Merge remote-tracking branch 'origin/temp8' into temp8-153-invariant-properties 2018-10-24 09:22:52 +01:00
Warren Buckley
c94775608a When returning a collection of languages - such as through the GetAllLanguages API Controller call the model mapping ensures that rather than order by name we, also put the default lang first then order a-z 2018-10-24 09:18:26 +01:00
Stephan
c0a1e7f2f6 Merge branch temp8 into temp8-dirty-tracking-on-variants 2018-10-23 17:43:52 +02:00
Warren Buckley
79e3a35869 WIP - Ensures the default language variant is always first then the rest of the variants are organised by A-Z 2018-10-23 16:03:49 +01:00
Stephan
9320c1a061 Cleanup variants dirty tracking 2018-10-23 15:38:47 +02:00
Shannon
001ed50c7d fixes test 2018-10-23 22:13:50 +11:00
Shannon
dfd3e8f4c4 Fixes tests and issue with member list view not passing the GUID along in the route 2018-10-23 22:10:27 +11:00
Shannon
fa64f4a6a8 Fixes member group editing, removes old dialog tasks, removes old references in the old ui.xml file 2018-10-23 21:38:24 +11:00
Shannon
69450791cf Fixes the new Id/Guid property on members, ensures all tabs are expanded by default and removes that init logic from JS since we don't want it there. 2018-10-23 19:25:48 +11:00
Shannon
d9a4d1fa97 Manual merging 2018-10-23 16:12:23 +11:00
Shannon
abeb4e04e5 Enhance implementation of ObservableDictionary so we can re-use this in more places, changes CultureNameCollection to ObservableDictionary, fixes issue with dirty tracking changed property type collections ... this was working by pure fluke before! Fixes more tests. 2018-10-19 15:41:28 +11:00
Shannon
ba186144a0 Updates models to allow dirty tracking on variants 2018-10-17 18:09:52 +11:00
Stephan
ee24fb4ef7 Make Tests Green Again 2018-10-09 23:02:22 +02:00
Shannon
651b4a348a gets unpublish working 2018-10-03 14:27:48 +02:00
Shannon
edc9744397 manual merge pass #1 2018-10-02 11:14:04 +02: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
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
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