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

12746 Commits

Author SHA1 Message Date
bjarnef
5e88fbfad0 Indent of toolbar options in TinyMCE config 2016-01-26 23:52:16 +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
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 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
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
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
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
08cfececd9 Fixes: U4-7824 Remove media section dropzone and folders in recycle bin 2016-01-25 12:17:26 +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
Shannon Deminick
742ee57835 Merge pull request #1049 from umbraco/temp-U4-7700 
Fixes: U4-7700 7.4 beta Backoffice Routing problem for Custom Sections or Installed Packages with a custom section
 2016-01-25 11:19:46 +01:00
Shannon
2e4941053c more null checks 2016-01-25 11:19:18 +01:00
Shannon
1118d95773 added a null check 2016-01-25 11:14:06 +01:00
Mads Rasmussen
f981fe60ff Fixes: U4-7820 List view card layout can not go to item 2016-01-25 10:30:13 +01:00
Claus
bbb187f2c8 Merge pull request #1044 from umbraco/temp-U4-7783 
U4-7783 Member can edit / show on profile don't exist any more in 7.4.0
 2016-01-24 22:19:01 +01:00
Claus
10617d1bd5 Agree, these should not be needed - removing. 2016-01-24 22:18:18 +01:00
Claus
7ac1c8ab6f forgot a few console.log's. 2016-01-24 15:43:43 +01:00
Claus
4372c9df40 remove refs. 2016-01-24 15:40:23 +01:00
Claus
c4e8e20f02 Reverted to only update exactly what is needed for this to work. 
Switched away from ugly xpath - using linq.
 2016-01-24 15:36:29 +01:00
Chad Rosenthal
09d038fcde U4-4652 - added decimal/double to contentbase 2016-01-23 21:32:08 -07:00
Shannon
c7185dcef0 Fixes DisposableTimer so that the profiled step is disposed - and thus tracked/timed properly! 2016-01-22 17:27:27 +01:00
Shannon
5ab61e7638 U4-7816 The IsolatedCache instance in the RepositoryFactory differs from the ApplicationContext singleton instance 2016-01-22 17:09:44 +01:00
Claus
291d92bfc9 Fixes: U4-7700 7.4 beta Backoffice Routing problem for Custom Sections or Installed Packages with a custom section 
Reverting the lowercasing happening in the angular routing and navigation.
Ensuring tree section registrations are updated instead of added in trees.config. The lowercasing was introduced to compensate for this.
 2016-01-22 13:38:43 +01:00
Shannon
ffce67e4fd nuget update 2016-01-22 13:34:16 +01:00
Shannon
4f85985a09 updates mb nuget 2016-01-22 12:45:57 +01:00
Shannon Deminick
5efbec1a2e Merge pull request #1046 from umbraco/temp-U4-7739 
U4-7739 - added more options to ViewHelper.GetDefaultFileContent
 2016-01-22 12:38:03 +01:00
Shannon
4bb6b2e230 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-01-22 12:26:04 +01:00