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

313 Commits

Author SHA1 Message Date
Thomas Nielsen
cbfd04e950 Link to member type from member properties 2016-11-08 23:37:29 +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
Sebastiaan Janssen
40b0a62cc3 Use int.MaxValue instead of 0 2016-10-19 14:58:56 +02:00
Callum Whyte
a1a90d5bff Fixes backoffice members list view for custom membership providers by using key instead of id in edit URL 2016-10-17 16:26:20 +01:00
Warren Buckley
5397f2c53a Merge pull request #1447 from umbraco/temp-u4-8906 
U4-8906 - optimize member perfs
 2016-09-15 15:14:34 +01:00
Stephan
fa45cd1a88 tmp 2016-09-02 14:44:16 +02:00
Stephan
9e82b8d693 U4-8906 - optimize member perfs 2016-09-01 12:11:12 +02:00
Stephan
4133574db0 U4-8906 - optimize member perfs 2016-08-26 15:30:24 +02:00
Shannon
c331ba134a Fixes 301 redirect js naming conventions, fixes URL handling, moves c# classes to the correct/constistent namespaces, fixes up models and N+1 requests, adds model mapping to not return the business logic model, adds controller method to check if it's enabled instead of returning the result as part of the search. 2016-08-08 14:40:53 +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
ecdca378c6 U4-8175 - fix PropertyType.PropertyGroupId inconsistencies 2016-03-16 13:41:58 +01:00
Stephan
800e02bccf Bugfix model mapper for PropertyTypeDisplay 2016-03-16 10:19:06 +01:00
Stephan
8e82ff5450 Merge pull request #1173 from umbraco/temp-U4-8012 
U4-8012 Generic properties tab disappears on the edit Member Type win…
 2016-03-15 16:24:21 +01:00
Shannon
d5fe8c11c8 U4-8065 Inherited from is empty - reverts 10617d1bd5, turns out this is why we needed that property value 2016-03-15 15:08:53 +01:00
Shannon
3fdb122e91 U4-8012 Generic properties tab disappears on the edit Member Type window after upgrade to 7.4 2016-03-15 14:44:03 +01:00
Stephan
7d8791ec86 Fix ActionButtonsResolver (need review) 2016-02-25 17:05:44 +01:00
Mads Rasmussen
51ed441b85 Merge branch 'u4-5123' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-5123 
# Conflicts:
#	src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
 2016-02-18 10:00:22 +01:00
Shannon
1ea8c8280c Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-02-11 15:54:10 +01:00
Shannon
17ff952b52 Fixes the URL creating for media in the back office to use an IMedia instead of published media (since it's not published yet at the time) 2016-02-11 15:54:00 +01:00
Shannon
04e1d8c2bd U4-7936 Clicking the Recycle Bin shows "Session expired" login screen 2016-02-11 14:04:14 +01:00
Shannon
4a8b59bdfa putting back in ContentTypeId on PropertyTypeDisplay, turns out this IS used when we remove a composition, we need to know which properties are related to which type. have also fixed another potential bug regarding compositions + generic properties, before we were not setting the ContentTypeId correct for a composition property type on the generic properties tab. 2016-02-10 14:34:33 +01:00
Claus
6a1e54b221 Fixes: U4-7691 - refactor 2016-02-03 15:39:18 +01:00
Shannon Deminick
864ca4e40e Merge pull request #1094 from umbraco/temp-U4-7691 
Fixes: U4-7691 7.4 beta - Document composition is not working with me…
 2016-02-03 15:26:43 +01:00
Claus
24d42e6bd1 Fixes: U4-7691 7.4 beta - Document composition is not working with media types 
Media type compositions weren't getting added since it only looked up through the content type service.
 2016-02-03 15:02:44 +01:00
Shannon
e423864781 Merge remote-tracking branch 'origin/master-v7' into dev-v7 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Cache/FullDataSetRepositoryCachePolicy.cs
	src/Umbraco.Core/Cache/FullDataSetRepositoryCachePolicyFactory.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs
	src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/PublicAccessRepository.cs
	src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Cache/FullDataSetCachePolicyTests.cs
	src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
	src/Umbraco.Web.UI.Client/src/less/hacks.less
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/WebBootManager.cs
 2016-02-03 12:30:11 +01:00
Shannon
42a7ed6877 U4-7821 KeepUserLoggedIn with a long umbracoTimeOutInMinutes has logout issues 2016-02-02 15:14:47 +01:00
Mads Rasmussen
fd58c3b3c6 Fixes: U4-7815 List view - bug when custom list view has been created. 2016-01-26 16:09:48 +01:00
Shannon
7595da7645 adds a null check 2016-01-25 12:26:11 +01:00
Claus
10617d1bd5 Agree, these should not be needed - removing. 2016-01-24 22:18:18 +01:00
Shannon
48667bb50a fixes more mapping, adds more tests. 2016-01-21 16:25:19 +01:00
Shannon
ad5043295f cleans up more mappings, adds unit tests 2016-01-21 15:59:58 +01:00
Shannon
52b1a09de0 abstracts out the DocumentType, MemberType and MediaType editor models, since some contain different props than each other and now member properties contain different properties than each other. So we have a lot of generic insanity going on... it works though. 2016-01-21 15:01:55 +01:00
Shannon
8fc44699bc U4-7768 - Fixes validation issue with new CTs and invalid server side validation, adds validation check for all ct aliases across all types 2016-01-20 16:07:47 +01:00
Claus
b9e7990b7c Fixes: U4-7560 Default member properties should not be editable 
Added locked property to content type properties by alias.
Ensured built in member properties are locked in the editor.
Content type editor changes for supporting locked properties.
 2016-01-13 18:43:06 +01:00
Shannon
9dc57b0e37 Merge branch '7.4.0' into temp-U4-7634 
Conflicts:
	src/Umbraco.Core/Services/ContentTypeServiceExtensions.cs
	src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
	src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.html
	src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
 2016-01-13 14:08:19 +01:00
Shannon
94a1f7e078 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	src/Umbraco.Core/Persistence/Factories/PropertyGroupFactory.cs
 2016-01-13 12:11:27 +01:00
Sebastiaan Janssen
8e024fccff Don't hardcode the umbracoFile constant 2016-01-12 20:05:22 +01:00
Sebastiaan Janssen
43227d4510 Support for multiple properties spawning a url - adding more uploadfields to umbracoSettings.config (autoFillImageProperties) 2016-01-12 19:46:05 +01:00
Sebastiaan Janssen
79cc4cd2fa Change "umbracoFile" to the constant for this value 2016-01-12 18:16:55 +01:00
Sebastiaan Janssen
ff83d2e1f4 U4-7561 Backoffice Media Section should provide information on physical location of files 2016-01-12 17:41:53 +01:00