yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,440 Commits 4 Branches 7 Tags
69a6a80ffd99d614e38d7c65788bdf0f7d7dc2d1
Commit Graph

83 Commits

Author SHA1 Message Date
Claus
2fdf148610 localizing text https://github.com/umbraco/Umbraco-CMS/pull/1250 2017-06-26 15:41:17 +02:00
Shannon
cb539e82d0 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs
#	src/UmbracoExamine/UmbracoMemberIndexer.cs
 2017-03-29 18:11:51 +11:00
Shannon
77af16db55 Merge branch 'dev-v7' into temp-u4-9617 
# Conflicts:
#	src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
 2017-03-29 16:29:18 +11:00
Shannon
a9fe46da0c makes HasContainerInPath public 2017-03-28 15:55:45 +11:00
Stephan
a23c150738 U4-9617 - fix 2017-03-23 17:51:30 +01:00
Stephan
085a678266 U4-9617 - perf for published date 2017-03-23 17:44:07 +01:00
Stephan
fe11d4770d U4-9615 - implement way to find listviews in path fast 2017-03-23 14:07:45 +01:00
Shannon
ff6ea0b42e Merge remote-tracking branch 'refs/remotes/origin/dev-v7.6' into temp-U4-9310 
# Conflicts:
#	src/Umbraco.Core/Models/UmbracoObjectTypes.cs
 2017-02-01 15:23:29 +11:00
Claus
74c167ed03 U4-9413 moving links to document and media to top of generic properties. 2017-01-30 13:18:30 +01:00
Shannon
9ef53536bf Updates the base editor models to include a readonly UDI, updates all model mappers to map the UDI, 2017-01-28 01:14:24 +11:00
Shannon
790e30defd Simplifies all creation of UrlHelper, creates GetUmbracoApiServiceBaseUrl extensions for WebApi 2017-01-03 11:13:38 +11:00
Claus
ff2805c428 mostly just formatting and cleanup - no changes as such. 2016-11-09 11:13:35 +01:00
Shannon
ba0ef3676d U4-9109 changes all usage of automapper ResolveUsing<T> to instantiate the resolver explicitly - this prevents IoC frameworks registered against automapper to not explode if these resolvers have not been added to the container. 2016-10-27 18:32:16 +02:00
Shannon
2c15db5950 U4-8530 Make it possbile to hide preview button by DocumentType or ContentItem 2016-08-04 18:34:20 +02:00
Sebastiaan Janssen
b7264b58f9 Fixed the mapping for HasPublishedVersion 2016-08-04 12:19:24 +02:00
Marc Goodson
379661e302 Fixes U4-8772, adds HasPublishedVersion property to mapping of IContent to ContentItemBasic, then adds existing 'has-unpublished-version' css class to list view row if item is published but has unpublished changes 2016-07-25 09:17:27 +01:00
Sebastiaan Janssen
d0e47fe1ff Merge pull request #1339 from dannydrogt/temp-u4-8613 
U4-8613 Link to DocType from "Properties" tab is not localized
 2016-07-07 15:38:00 +02:00
Danny Drogt
5b417f6241 U4-8613 Link to DocType from "Properties" tab is not localized - Added call to TextService 2016-06-20 15:32:27 +02:00
Shannon
bab693f2ba fix build 2016-05-25 10:56:41 +02:00
Shannon
f243133b95 Merge remote-tracking branch 'origin/dev-v7' into temp-U4-265 
# Conflicts:
#	src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
 2016-05-25 09:51:46 +02:00
Shannon
2504586c26 removes initial idea of performing conversion on the server since this would be a breaking change, instead we can easily do this on the client side - and this works much better. Have added pre-values to the date/time picker to be able to enable offset times. This is enabled for the publish-at pickers since those must be offset. When the datetime is offset, it shows the server time in small text underneath the picker. Have added js unit tests for the date conversions. Have updated the datepicker controller to set the model date in a single place/method so it's consistent. 2016-05-25 09:43:31 +02:00
Shannon
877b7d4af7 U4-8358 Writers can't schedule publish/unpublish times 2016-05-23 19:23:59 +02:00
Sebastiaan Janssen
c856795cb7 Fix hilariously wrong copy/pasted TODO comments.. 2016-04-05 08:03:47 +02:00
madden-tom
2d514ac09e Added check for publish permissions to remove option for Publish At a… 
U4-287 "Publish at" circumvents "Send for approval/publishing"
 2016-04-05 08:01:05 +02:00
Stephan
7d8791ec86 Fix ActionButtonsResolver (need review) 2016-02-25 17:05:44 +01:00
Shannon
4e3cf6c608 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	src/Umbraco.Core/ObjectExtensions.cs
	src/Umbraco.Tests/PropertyEditors/PropertyEditorValueEditorTests.cs
	src/Umbraco.Web/Editors/ContentTypeController.cs
	src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
 2016-01-06 12:54:19 +01:00
Sebastiaan Janssen
403af78ba9 U4-5168 Media Items label says "Document Type" instead of "Media Type" 2016-01-06 11:22:15 +01:00
Sebastiaan Janssen
d863ff364e U4-7321 Update Doc type edit link on content item for 7.4 since it will be different 
#U4-7321 Fixed
 2015-12-02 14:41:37 +01:00
Shannon
4c544acb42 fixes links so that working with vdirs works too. 2015-11-19 19:21:55 +01:00
Daniel
a9ad0ae8eb removed the debug check 2015-11-02 23:34:33 +01:00
Stephan
da85e4eb28 fixes list view ancestor check fix 2015-10-29 12:20:10 +01:00
Shannon
fbc08d66f1 fixes list view ancestor check 2015-10-29 12:05:46 +01:00
Sebastiaan Janssen
44e76f741f Merge pull request #840 from umbraco/temp-U4-7021 
Fixes: U4-7021 "Actions" dropdown not available to children in listvi…
 2015-10-28 14:52:48 +01:00
Shannon
64c983eb07 Updates PR with fixes for code and implementation logic for the url list. 2015-10-28 12:28:29 +01:00
Shannon
f0b68ac31e Fixes: U4-7021 "Actions" dropdown not available to children in listview nodes 2015-10-27 18:13:18 +01:00
Daniel
738815170c more nullchecks needed? 
null check that we can access user
 2015-10-23 00:21:42 +02:00
Daniel
ef091e8c3a U4-7296 
http://issues.umbraco.org/issue/U4-7296
 2015-10-22 23:41:18 +02:00
Shannon
05e17e1c7f Fixes: U4-6973 Given custom permissions user can create, but cannot save 2015-08-31 18:04:13 +02:00
Shannon
de7294335f Adds nicer extensions for the Localize methods to not pass in a Culture and take the Culture from the current thread. Adds GUID Id display to the content/media/members editor 2015-05-13 17:33:59 +10:00
Stephan
0c5acb7f32 Implement IContent.HasPublishedVersion 
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
 2015-02-10 15:39:12 +01:00
Shannon
4de31249fd removes some usages of singletons 2015-01-05 10:01:58 +11:00
Shannon
6afd9b37a6 Merge branch '7.1.9' into 7.2.0 2014-11-26 15:29:18 +11:00
Shannon
bece953fa3 fixes a null check 2014-11-26 10:20:19 +11:00
Shannon
b90f28731c Ensures the return to list button isn't shown on items in the recycle bin since that would navigate back to their original parent. Updates the recycle bin list views to respect the list view configuration of their associated sections. 2014-10-02 19:55:24 +10:00
Shannon
89ebc80bd5 Gets the installer to install default list views, updates list view tree to show them as 'system' items which are not deletable, upgrader installs default list views, now property resolver gets the correct system list view for the correct content type with it's pre-values that are defined. 2014-09-18 11:52:12 +10:00
Shannon
96d570e760 Gets most of the configurable list view working, need to add some validation to the pre-value editor, some styling for the sorting of a field, add another system field for 'published date' (if possible), fix up the localized text for return to list view, fix up the persisting of the last page viewed in a list view 2014-09-15 13:53:33 +10:00
Shannon
7ff0e6bafb Fixes typo: Updator -> Updater 2014-09-12 11:53:09 +10:00
AndyButland
964e18b84f Set up return to list button for list view children that on click returns to the list with the last viewed page restored 2014-07-30 23:14:24 +02:00
Shannon
5990a95d13 Fixes: U4-4610 Unmapped members in Automapper 2014-04-14 15:20:02 +10:00
Shannon
8785239964 Finalizes the implementation of getting the menu items rendering for child of listview items for both content and media. 2013-12-12 14:10:03 +11:00