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

761 Commits

Author SHA1 Message Date
Sebastiaan Janssen
b2407eab98 Merge pull request #1107 from bjarnef/dev-v7-tinymce-font-icons 
Change icons for richtext editor config
 2016-03-10 17:47:46 +01:00
Stephan
7d8791ec86 Fix ActionButtonsResolver (need review) 2016-02-25 17:05:44 +01:00
Mads Rasmussen
1a0c095f40 Merge pull request #932 from engern/MacroParamSortOrder 
Fixes U4-7472 - Should be possible to sort macro parameters
 2016-02-19 09:27:27 +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
89f6089f8e U4-7873 - fix GetCulture issue with languages 2016-02-10 16:22:06 +01:00
Shannon Deminick
5648617809 Merge pull request #1098 from umbraco/temp-U4-7891 
U4-7891 Image Cropper needs a property value converter to return a strongly typed model, json or a string when requested.
 2016-02-10 15:32:55 +01:00
Shannon
2721c5cb12 adds dynamic caseinsensitive support for the image cropper model 2016-02-10 14:54:00 +01:00
Shannon
fd984bd613 Ensures media.Url works properly 2016-02-10 14:53:58 +01:00
Shannon
0829bae5b2 Fixes TextStringValueConverter to include the text box and multi-textbox (since it's like that in the Core one that this overrides), adds new converter for Image cropper including ToString converter & custom type converter to convert from the strongly typed object to JObject, adds test to support this, adds equatable methods for the strongly typed model so it can be easily compared. Ensures that the webboot manager does not include the core value converter for image cropper. 2016-02-10 14:53:56 +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
Shannon
af543c56ec moves model to correct namespace 2016-02-10 13:31:36 +01:00
Claus
4113def0b6 Fixes: U4-7881 version 7.4 beta - cannot add composition doctype to a doctype that has already been saved 2016-02-10 13:08:36 +01:00
bjarnef
0bfc5f1272 Change icons in tinymce config 2016-02-08 15:07:16 +01:00
Shannon
0ea68f4f42 added logic for media and member type angular callbacks that existed for content types - assuming this is important and should be there for all content types. Added alias information to validation message returned from server. 2016-02-04 19:40:29 +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
Shannon
e8dfa056b0 U4-2670 Add event to modify the model before being sent to render 2016-01-27 13:20:13 +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
56f0d67639 Merge branch 'dev-v7' into temp-U4-7716 
Conflicts:
	src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
 2016-01-25 15:54:50 +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
0c0518ff7b ensures that abstract models have a DataContract 2016-01-21 15:06:57 +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
a8e43a3908 U4-7716 Content type editor - YSOD when adding a property with the same alias as it's parent 2016-01-21 11:39:46 +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
Sebastiaan Janssen
dc17a20bb8 Adds required namespace + a fake class to make sure the namespace exists 2016-01-15 17:05:09 +01:00
Shannon Deminick
4068c527bc Merge pull request #1019 from umbraco/temp-U4-7560 
Fixes: U4-7560 Default member properties should not be editable
 2016-01-14 11:29:56 +01:00
Claus
b9cafa2016 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 2016-01-14 09:41:14 +01:00
Claus
13a9f40815 Fixes: U4-7728 Folder view in media section gives an exception 
Ensuring umbracoFile property isn't accessed if this is called on a folder.
 2016-01-14 09:40:40 +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
Shannon
b89d17914d fixes usage of model.contentType.availableCompositeContentTypes to use the availableCompositeContentTypes directly attached to the model. removes the FirstContentType property and adds simple content type service methods to count the doc type number, moves the request to get availableCompositeContentTypes to the dialog (where it's needed and so it's lazy) 2016-01-11 17:17:26 +01:00
Claus
e016622fe3 Fixes: U4-7639 Misleading message on creating first document type and click on "compositions" 
Added in FirstContentType property on object returned from GetEmpty to indicate whether this is the first content type being created or not (different error messages in backoffice).
 2016-01-11 17:16:17 +01:00
Claus
f62920dc47 Removed adding compositions from parents as this breaks core functionality. 
Ignoring property in mappings where it isnt needed.
Updating the LockedCompositionsResolver to get parent and use path instead of trying to use path which can be null on GetEmpty.
 2016-01-11 12:07:38 +01:00
Claus
3676de0fe8 Reverting code to add additional meta data on compositions. 
Added locked compositions to content type object.
Changed UI to use the lockedCompositeContentTypes instead.
 2016-01-11 12:07:36 +01:00
Claus
0d37357376 Mark compositions coming from parents with metadata. 
Ensure metadata is not ignored.
 2016-01-11 12:07:31 +01:00
Shannon
5767cea8f2 fixes build/merge 2016-01-06 12:58:05 +01:00