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

3595 Commits

Author SHA1 Message Date
Sebastiaan Janssen
166429cf68 Fixes the "No license field." error, see: 
https://github.com/npm/npm/issues/4473#issuecomment-103453246
 2016-02-04 16:10:35 +01:00
Mads Rasmussen
48adc259d9 fix content type editor property preview background in firefox 2016-02-04 15:19:20 +01:00
Mads Rasmussen
f94b5cc462 small fixes to U4-7840 2016-02-04 11:45:31 +01:00
Mads Rasmussen
fee98f8144 Merge branch 'u4-7840' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-7840 2016-02-04 11:20:30 +01:00
Mads Rasmussen
7d15b26a8f Fixes: U4-7818 Moved Document Type Reverts to Prior Location on Save 2016-02-04 10:41:06 +01:00
Rune Strand
a77ebb1160 Add max resolution for the Image editor in Grid Layouts to avoid performance hit when using high res images. 2016-02-04 10:25:01 +01:00
Mads Rasmussen
625f976f14 Merge pull request #1088 from bjarnef/dev-v7-U4-6121 
U4-6121 - Sorting in Related Links was not working correctly
 2016-02-03 14:01:31 +01:00
Shannon
67c3ea7c00 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-02-03 13:44:03 +01:00
Mads Rasmussen
5f2150ddf7 remove word-break from meta because it hides property alias 2016-02-03 13:28:23 +01:00
Claus
c4981b50e5 Merge pull request #1092 from umbraco/temp-U4-7744 
Fixes: U4-7744 Better validation message when Reordering tabs
 2016-02-03 13:21:47 +01:00
Simon Busborg
00a7c97c5e Fixed background and word-break in member type builder 2016-02-03 13:13:56 +01:00
Simon Busborg
eb7fa9528a Merge pull request #1081 from umbraco/temp-U4-7675 
Fixes: U4-7675 Changing doc type icon doesn't set dirty property for form
 2016-02-03 12:55:12 +01:00
Claus
27d2b631a9 Merge pull request #1080 from umbraco/temp-U4-7871 
Fixes: U4-7871 Media picker - add functionality to go to media item w…
 2016-02-03 12:51:08 +01:00
Claus
bf1086ca39 Merge pull request #1089 from umbraco/temp-U4-7884 
Fixes: U4-7884 Prevent new content type editor form from saving when hitting enter from inputs
 2016-02-03 12:44:55 +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
Mads Rasmussen
edaa335b18 Fixes: U4-7744 Better validation message when Reordering tabs 2016-02-03 11:55:19 +01:00
Simon Busborg
ae9fba87b5 Removed white background from member types builder 2016-02-03 11:46:33 +01:00
Mads Rasmussen
e22c6d9c04 fix member types html indention 2016-02-03 10:16:39 +01:00
Mads Rasmussen
61ba602b4b prevent enter submit in member types 2016-02-03 10:05:01 +01:00
Mads Rasmussen
bd393dffd4 fix media types html indention 2016-02-03 09:59:08 +01:00
Mads Rasmussen
573890b7ce prevent enter submit in media types 2016-02-03 09:56:14 +01:00
Mads Rasmussen
7d4fbe4267 fix document type html indention 2016-02-03 09:50:59 +01:00
Mads Rasmussen
cb978e2fee prevent enter submit in document type editor 2016-02-03 09:44:10 +01:00
bjarnef
4e75575b40 Sorting was not working correctly 2016-02-03 03:38:53 +01:00
Sebastiaan Janssen
3151515855 U4-7072 Grid TinyMce with style_formats throws "Cannot assign to read only property 'name' 2016-02-02 16:09:02 +01:00
Simon Busborg
a763602aeb Fixes: U4-7072 Grid TinyMce with style_formats throws "Cannot assign to read only property 'name' 2016-02-02 15:38:12 +01:00
Sebastiaan Janssen
98b8aedc4d U4-7849 Unclear error message when applying public access 2016-02-02 15:13:57 +01:00
Simon Busborg
4812f1d603 Fixes: U4-7725 Backend / Full witdth image / Settings / Set a background image - Is out of focus. 2016-02-02 15:11:50 +01:00
Rune Strand
137de20cef Remove gradient from btnDanger 2016-02-02 14:30:57 +01:00
Rune Hem Strand
8ce8199820 Merge pull request #1072 from umbraco/temp-U4-7851 
fixes U4-7851 Grid layout RTE formats not being applied.
 2016-02-02 14:14:10 +01:00
Simon Busborg
bb52467f90 Fixes: U4-7703 TinyMCE - can't add additional css via custom config (v7.3.4) 
http://issues.umbraco.org/issue/U4-7703
 2016-02-02 14:08:12 +01:00
Rune Strand
e9af8bfee1 click in grid RTE format dropdown no longer looses focus from the editor 2016-02-02 13:37:52 +01:00
Mads Rasmussen
4360d49531 fix file indention 2016-02-02 11:42:36 +01:00
Mads Rasmussen
ae26a19d4a Fixes: U4-7675 Changing doc type icon doesn't set dirty property for form 2016-02-02 11:41:52 +01:00
Rune Strand
da732359af Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-02-02 10:18:36 +01:00
Rune Strand
c659e1ff8f Adds button states for hover, focus and active 2016-02-02 10:15:57 +01:00
Simon Busborg
fd92884ce5 Merge pull request #1075 from webprofijt/U4-7687 
Fixes: U4-7687 Create dialog briefly shows 'no allowed document types…
 2016-02-02 08:54:50 +01:00
Mads Rasmussen
b22ae28acc Fixes: U4-7871 Media picker - add functionality to go to media item when an image has been picked 2016-02-01 18:24:30 +01:00
Mads Rasmussen
f4e6913e6e Fixes: U4-7832 double data bindings 2016-02-01 15:14:38 +01:00
AndyButland
1362df8e64 Provided means of setting which bulk actions are allowed on list views; only enable selection of multiple items in list view if at least one bulk action is available 2016-01-30 20:48:21 +01:00
Arnoud de Vries
b6962296c3 Fixes: U4-7687 Create dialog briefly shows 'no allowed document types' text 2016-01-30 15:51:17 +01:00
Claus
db6f492aac Merge pull request #1056 from umbraco/temp-U4-7695 
U4-7695 Media items are not updated when a new crop is added to Image…
 2016-01-28 18:30:37 +01:00
Shannon Deminick
8c90e2fd58 Merge pull request #1066 from umbraco/temp-U4-7847 
Fixes: U4-7847 Do not allow folders to be created underneath content types (or data types)
 2016-01-28 15:22:03 +01:00
Simon Busborg
dc6c15e150 Merge pull request #1058 from greystate/fix-querybuilder-button 
U4-7842 Query Builder "Sort by" direction button changes case when clicked
 2016-01-28 15:16:01 +01:00
Simon Busborg
ec0a9493e2 removed whitespace issue 2016-01-28 14:25:40 +01:00
Mads Rasmussen
549a8380c3 Fixes: U4-7806 Possible to interactive with property editor "preview" in document type editor 2016-01-28 14:23:53 +01:00
Simon Busborg
e0ba030b1f fixes U4-7851 Grid layout RTE formats not being applied. 2016-01-28 14:19:46 +01:00
Mads Rasmussen
b671595608 fix tab indention 2016-01-27 15:34:15 +01:00
Mads Rasmussen
4bc51feccd fix semicolons 2016-01-27 15:31:29 +01:00
Mads Rasmussen
98c65ff8f4 U4-7847 Do not allow folders to be created underneath content types (or data types) 2016-01-27 15:29:53 +01:00