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

15357 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Busborg
e050090f0f Merge pull request #1061 from bjarnef/dev-v7-tinymce-config-indent 
Indent of toolbar options in TinyMCE config
 2016-01-27 09:15:34 +01:00
bjarnef
5e88fbfad0 Indent of toolbar options in TinyMCE config 2016-01-26 23:52:16 +01:00
Mads Rasmussen
c9f71ce067 Fixes: U4-7772 Cursor jumps when editing alias in new ContentType editor + U4-7832 Editing property alias chomps 1st character 2016-01-26 21:07:15 +01:00
Chriztian Steinmeier
21190bc0c6 Change the initial wording of the sort-direction button 
Keep it lowercased as that's what it actually toggles between when
clicked
 2016-01-26 19:36:12 +01:00
Sebastiaan Janssen
2f8c43c689 Merge pull request #1057 from umbraco/temp-U4-7836 
U4-7836 YSOD when upgrading Umbraco with error during AddUserDataClaims
 2016-01-26 19:25:04 +01:00
Shannon
7a25cb52b2 updates the repository cache policies so that we aren't keeping everything in cache unnecessarily 2016-01-26 19:13:42 +01:00
Shannon
19bc97a7fd Removes the static (hack) cache for content types for creating published content 2016-01-26 18:56:29 +01:00
Shannon
72900ef3b3 U4-7813 Enable MiniProfiler to profiler during startup 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
 2016-01-26 17:56:25 +01:00
Shannon
74ddd09c5d U4-7836 YSOD when upgrading Umbraco with error during AddUserDataClaims - this also ensures that no empty/null sections can be added to the user object since this is where the original exception was coming from. 2016-01-26 17:05:46 +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
Sebastiaan Janssen
e461cb92da U4-7787 Shorthand use of ?altTemplate= doesn't work 
#U4-7787 Fixed
 2016-01-26 16:07:44 +01:00
Shannon
ba2fd96e88 U4-7695 Media items are not updated when a new crop is added to Image Cropper 2016-01-26 15:54:17 +01:00
Shannon
7cdaacf149 adds assert 2016-01-26 14:26:16 +01:00
Shannon
7cfdc81555 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-01-26 14:24:18 +01:00
Shannon
aeb6babad0 fixes template unit tests 2016-01-26 14:24:07 +01:00
Simon Busborg
24f38e0c0e Fixed illustration width in safari 2016-01-26 14:18:07 +01:00
Simon Busborg
8cb9d6858e U4-7722 Show checkmark when hover image in media grid 2016-01-26 14:18:06 +01:00
Claus
17629ea1b5 Merge pull request #1055 from umbraco/temp-U4-7698 
Ensures that all property data is deleted for a doc type when it is b…
 2016-01-26 14:13:46 +01:00
Shannon
779e7d7667 fixes ContentTypeRepositoryTest 2016-01-26 13:46:55 +01:00
Shannon
7117c6f085 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-01-26 13:44:05 +01:00
Shannon
ba9ebd394b fixes MediaTypeRepositoryTest's 2016-01-26 13:43:56 +01:00
Simon Busborg
3ed340bde1 Fixes weird skew in media grid 2016-01-26 13:29:39 +01:00
Shannon
7d616cf937 Ensures that all property data is deleted for a doc type when it is being deleted, updates the ChangeDocType to not use the legacy EnsuredPage, updates the non-legacy EnsuredPage.ClientTools to support the legacy logic. 2016-01-26 12:13:53 +01:00
Mads Rasmussen
fa1c227136 U4-7724 Click on remove file(s) link, on an item in the media section, doesn't set dirty for form 2016-01-26 12:01:04 +01:00
bjarnef
738f24d6c9 Hide search input behind split slider 
Ensure search input is covered by the split slider, when it is dragged
all the way to the left similar to how tree nodes is covered.
 2016-01-26 11:38:04 +01:00
Shannon
c33ad3eed7 U4-7825 Remove Microsoft.AspNet.WebHelpers and Microsoft.AspNet.WebPages.Data dependencies from nuget 2016-01-26 11:31:35 +01:00
Shannon Deminick
3e5050ee9a Merge pull request #1054 from umbraco/temp-U4-7701 
Fixes: U4-7701 Unable to Delete Member in Member Section
 2016-01-26 11:26:33 +01:00
Shannon Deminick
7dce1ee39a Merge pull request #1052 from umbraco/temp-U4-7642 
U4-7642 - bugfix aggressive refactoring
 2016-01-26 11:11:33 +01:00
Mads Rasmussen
f30c05b37f add/remove semicolons 2016-01-26 10:47:36 +01:00
Mads Rasmussen
7fce8583c8 Fixes: U4-7701 Unable to Delete Member in Member Section 2016-01-26 10:34:31 +01:00
Alexander Bryukhov
3a17dd06d8 Latest update UI language ru.xml 
Only two new keys in the "sort" section translated. For full merged ru.xml file merge there are two more PRs (#1042 & #983)
 2016-01-26 12:44:39 +06:00
Stephan
9d10362e7a U4-7642 - bugfix aggressive refactoring 2016-01-25 18:17:48 +01:00
Shannon
3712a80031 fixes composition check in change doc type 2016-01-25 16:43:20 +01:00
Shannon Deminick
930bada737 Merge pull request #1043 from umbraco/temp-U4-7716 
U4-7716 Content type editor - YSOD when adding a property with the sa…
 2016-01-25 16:08:07 +01:00
Shannon
95eb5f88f3 fixes merge issues 2016-01-25 16:07:57 +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
bjarnef
0be5c31d4a Adjust styling for sort table + localize 2016-01-25 15:31:07 +01:00
Simon Busborg
ca03967662 U4-7644 Misleading description of choosing package file 
has to have correction
 2016-01-25 15:24:11 +01:00
Simon Busborg
91413c2a89 U4-7644 Misleading description of choosing package file 
I'm not a multi language talent, so I've taken the liberty only to correct the danish and english version. since `.umb`doesn't exists anymore, I've deleted that extension from the sentence.
 2016-01-25 15:18:26 +01:00
Claus
bd109d3700 Merge branch 'bjarnef-dev-v7-resizable-handle-border' into dev-v7 2016-01-25 15:10:29 +01:00
bjarnef
d9de5e5f29 Remove top and bottom border for resizable handle 2016-01-25 15:09:50 +01:00
Claus
63635ec9fb Merge branch 'cyfer13-dev-v7' into dev-v7 
Edited: No need to convert to string before passing on the value.
 2016-01-25 14:11:00 +01:00
Claus
d32380294a Merge branch 'dev-v7' of https://github.com/cyfer13/Umbraco-CMS into cyfer13-dev-v7 2016-01-25 13:53:01 +01:00
Shannon
8ea6f1168e Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-01-25 12:26:53 +01:00
Shannon
7595da7645 adds a null check 2016-01-25 12:26:11 +01:00
Mads Rasmussen
f33af2930e Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-01-25 12:18:29 +01:00
Mads Rasmussen
08cfececd9 Fixes: U4-7824 Remove media section dropzone and folders in recycle bin 2016-01-25 12:17:26 +01:00
Shannon
1aab6c217f Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-01-25 12:11:10 +01:00
Shannon
396194ae01 bumps MB nuget version 2016-01-25 12:10:40 +01:00
Mads Rasmussen
baea34b6a4 Merge pull request #1051 from umbraco/temp-U4-7820 
Fixes: U4-7820 List view card layout can not go to item
 2016-01-25 11:32:27 +01:00