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

12756 Commits

Author SHA1 Message Date
Shannon
0ea9ce1363 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-01-27 14:31:12 +01:00
Shannon
cc4c7b0d88 Adds events for creating/deleting containers 2016-01-27 14:30:57 +01:00
Claus
800df325a9 Merge pull request #1063 from umbraco/temp-U4-2670 
U4-2670 Add event to modify the model before being sent to render
 2016-01-27 14:30:40 +01:00
Simon Busborg
1f1aeaf446 Merge pull request #1064 from umbraco/temp-U4-7845 
Fixes: U4-7845 Show drop zone in media section + fix recycle bin for …
 2016-01-27 14:19:22 +01:00
Mads Rasmussen
9c5d5f4318 Fixes: U4-7845 Show drop zone in media section + fix recycle bin for content section + localise texts 2016-01-27 13:25:54 +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
Stephan
81754b37a4 Add support for models in controllers 2016-01-27 12:05:22 +01:00
bjarnef
02e5056987 Change value of vertical-align property. 2016-01-27 09:36:25 +01:00
Claus
c33b488006 Ensuring we only do the base SetupNode stuff if its actually a media type and not a folder requested. 2016-01-27 09:27:56 +01:00
Mads Rasmussen
43e49b75de Add extra div to media grid to fix firefox issue in chrome 2016-01-27 09:21:58 +01:00
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