yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,871 Commits 4 Branches 7 Tags
2f6cfaf99cc2e433e38f9615e3c6598550ab018f
Commit Graph

14871 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
c813eccb45 Merge branch 'dev-v7' into 7.4.0 2015-12-15 13:53:50 +01:00
Sebastiaan Janssen
eacc7f7fb3 Whoops, was supposed to be en-US by default 2015-12-15 13:50:19 +01:00
Claus
f1fcb2adec Fixes: U4-7365 Content list view sorting alias is “sort” and media list view sorting alias is “sortOrder”. This gives an ysod when changing sorting in media list views. 
Changed the default list view for media to be created with the correct alias in the database.
Added migration for existing databases to be updated.
 2015-12-15 13:43:52 +01:00
Sebastiaan Janssen
80f597a7eb U4-7424 - Also update all other errors displayed in the frontend 2015-12-15 12:51:45 +01:00
Sebastiaan Janssen
d069da8a4f Make LocalizedTextService fall back to en-GB if the key is not found in the current file 2015-12-15 12:51:03 +01:00
Shannon
050109edd7 U4-6837 New content type editor: availableCompositeContentTypes could be moved to service. 
Allows for assigning compositions to doc types that are being created.
Removes unused getAssignedListViewDataType from contentTypeResource.
Removes unused getPropertyTypeScaffold from memberTypeResource.
Removes unused performContainerDelete from memberTypeResource - since member types don't support folders.
Ensures correct security for the ContentTypeController.GetAllPropertyTypeAliases and ContentTypeController.GetAvailableCompositeContentTypes.
Removes unused ContentTypeControllerBase.GetAssignedListViewDataType, this is no longer used because the list view is configured using the DataTypeController.
 2015-12-15 12:25:42 +01:00
Sebastiaan Janssen
44ebd8d9ea Proper formatting of this file, only whitespace changes 2015-12-15 12:18:23 +01:00
Sebastiaan Janssen
2fd6dc3603 Merge branch 'engern-U4-7424' into dev-v7 2015-12-15 12:14:07 +01:00
Sebastiaan Janssen
0629b49112 Merge branch 'U4-7424' of https://github.com/engern/Umbraco-CMS into engern-U4-7424 2015-12-15 12:13:35 +01:00
Sebastiaan Janssen
198ba0db83 Merge branch 'dev-v7' into 7.4.0 2015-12-15 11:25:09 +01:00
Sebastiaan Janssen
4958c5a59a Merge branch 'jamescoxhead-U4-7503-Disable-X-AspNetMvc-Version-Header' into dev-v7 2015-12-15 11:21:23 +01:00
Sebastiaan Janssen
523501db8c Merge branch 'U4-7503-Disable-X-AspNetMvc-Version-Header' of https://github.com/jamescoxhead/Umbraco-CMS into jamescoxhead-U4-7503-Disable-X-AspNetMvc-Version-Header 2015-12-15 11:21:11 +01:00
Sebastiaan Janssen
6ce4354ef3 Merge branch 'dev-v7' into 7.4.0 2015-12-15 11:14:15 +01:00
Sebastiaan Janssen
23cd2b09ca Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-12-15 11:13:22 +01:00
Sebastiaan Janssen
a1ff1d4543 Merge branch 'TimoPerplex-dev-v7' into dev-v7 2015-12-15 11:12:57 +01:00
Sebastiaan Janssen
1bf2a3b1bf Merge branch 'dev-v7' of https://github.com/TimoPerplex/Umbraco-CMS into TimoPerplex-dev-v7 
Conflicts:
	src/Umbraco.Web/Editors/ImagesController.cs
 2015-12-15 11:12:13 +01:00
Shannon Deminick
8ce8455773 Merge pull request #950 from umbraco/temp-U4-7373 
Fixes U4-7373 Error notifications shown are hidden underneath the dialogs
 2015-12-15 10:53:55 +01:00
Shannon
26b70a4a4e Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/umbraco/config/lang/de.xml
 2015-12-15 10:40:52 +01:00
Shannon
8598ab565c Fixes: U4-7536 Sign-out in back office will call all ASP.Net identity middleware sign out methods 
publicises a few things too.
 2015-12-15 10:34:11 +01:00
Simon Busborg
31147fa8d1 missing comma 2015-12-15 10:26:22 +01:00
Simon Busborg
d75f8bf1bd added wrapper to directive 2015-12-15 10:24:38 +01:00
Simon Busborg
ecb6c8e52c Fix for U4-7373 Error notifications shown are hidden underneath the dialogs 
http://issues.umbraco.org/issue/U4-7373
 2015-12-15 10:08:19 +01:00
Rasmus John Pedersen
a56936b6f9 Fixes bug with macro multiline parameters 2015-12-14 13:44:57 +01:00
Claus
3cdd650b66 Merge pull request #940 from umbraco/temp-U4-7445 
Temp u4 7445
 2015-12-14 11:31:02 +01:00
Simon Busborg
8bd3b25a66 Fix for: http://issues.umbraco.org/issue/U4-7518 
New list view (umb-table) misses published/unpublished state
 2015-12-11 14:26:17 +01:00
Andrey Shchekin
b3e21e0827 U4-7522 Removed unnecessary exception from DeepCloneHelper. 2015-12-10 14:33:52 +13:00
Rune Strand
10b828379b Element hinzufügen! 2015-12-09 09:31:38 +01:00
James Coxhead
739ff33ce1 Removed X-AspNet-Version and X-AspNetMvc-Version headers 2015-12-08 21:44:40 +00:00
James Coxhead
f27a726a6e Disabled the X-AspNetMvc-Version header 2015-12-08 21:19:41 +00:00
Alexander Todorov
aed906e682 U4-7508 - IsChildOfListView should be populated for Media items, similarly to Content items 2015-12-08 18:41:59 +02:00
Sebastiaan Janssen
220446afec Adds some more dependencies so we upgrade those properly when necessary 2015-12-08 14:24:52 +01:00
Sebastiaan Janssen
a101367292 This would've stayed here for years and be irrelevant, we can link to twitter profiles in the docs on Our 2015-12-08 14:02:43 +01:00
Sebastiaan Janssen
e90fedb835 Bumps version 2015-12-08 13:54:57 +01:00
Sebastiaan Janssen
d5f9dfecc4 U4-7496 Backoffice dropdowns quit working in Chrome after update to v47.0.2526.73 
#U4-7496 Fixed
 2015-12-08 13:54:56 +01:00
Rune Strand
7431ed4db1 Better wording 2015-12-08 13:42:05 +01:00
Claus
cbb84f79d1 Merge pull request #799 from esn303/patch-1 
Major revamp with keys added and texts fixed everywhere
 2015-12-08 11:40:42 +01:00
Rune Strand
cb07ec3157 Add dialog localization and new keys to all lang 2015-12-07 18:07:08 +01:00
Sebastiaan Janssen
7a4b7c25dd Can't use higher versions of angular-dynamic-locale 
See: https://github.com/lgalfaso/angular-dynamic-locale/issues/82
 2015-12-07 13:00:57 +01:00
Sebastiaan Janssen
a162974bf9 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into 7.4.0 2015-12-07 11:51:34 +01:00
Sebastiaan Janssen
a7377d0686 Merge pull request #939 from hartvig/dev-v7 
Fixing a little typo as reported by Chris Houston
 2015-12-07 11:49:28 +01:00
hartvig
68a4749917 Fixing a little typo 2015-12-07 11:11:02 +01:00
Sebastiaan Janssen
ff61112c18 Updates installer background 2015-12-07 10:32:24 +01:00
Sebastiaan Janssen
a427ca6d4e Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into 7.4.0 2015-12-07 10:26:26 +01:00
Sebastiaan Janssen
81763bf4d8 Merge pull request #938 from hartvig/dev-v7 
Adding number of countries to the installer faq
 2015-12-07 10:25:09 +01:00
hartvig
0e0bc9fbef Adding number of countries to the installer faq 2015-12-07 10:11:35 +01:00
Claus
964d9a9328 Closing break tag. 2015-12-06 17:55:20 +01:00
Rune Hem Strand
93f199b5e3 Add localization to Grid (en) 2015-12-04 13:23:24 +01:00
Sebastiaan Janssen
453efc02a5 Removes old obsoleted ping.aspx 2015-12-04 11:10:12 +01:00
Mads Rasmussen
58a68bba97 Fixes: U4-7387 bug preventing drag and drop upload in media library card layout 2015-12-03 13:24:09 +01:00
Stephan
22eea2b7db Fix tests 2015-12-03 12:56:59 +01:00