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

5078 Commits

Author SHA1 Message Date
Shannon
1361e017a2 Merge branch 'u4-222' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-222 
Conflicts:
	src/Umbraco.Core/Security/BackOfficeUserManager.cs
	src/Umbraco.Web.UI.Client/src/less/pages/login.less
	src/Umbraco.Web.UI.Client/src/routes.js
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
	src/Umbraco.Web.UI/web.Template.config
	src/Umbraco.Web/Editors/AuthenticationController.cs
	src/Umbraco.Web/Editors/BackOfficeController.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2016-04-12 18:07:25 +02:00
Shannon
36255709e6 U4-8297 Custom MembershipProvider search doesn't work in the listview 2016-04-07 18:16:03 +02:00
Shannon
506ed9f866 U4-8286 Add OWIN startup events to the UmbracoDefaultOwinStartup class 2016-04-07 17:51:09 +02:00
Shannon
f87bec398d U4-8239 DisableBrowserCacheAttribute causing YSOD when a previous exceptions is thrown before the filter kicks in 2016-04-07 16:44:45 +02:00
bjarnef
9d5af4ad5e Merge branch 'dev-v7' of git://github.com/umbraco/Umbraco-CMS into dev-v7-U4-6425 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html
 2016-04-06 20:20:22 +02:00
Sebastiaan Janssen
c856795cb7 Fix hilariously wrong copy/pasted TODO comments.. 2016-04-05 08:03:47 +02:00
madden-tom
2d514ac09e Added check for publish permissions to remove option for Publish At a… 
U4-287 "Publish at" circumvents "Send for approval/publishing"
 2016-04-05 08:01:05 +02:00
Sebastiaan Janssen
8e8b8bdea1 Revert "Removes old obsoleted ping.aspx" 
This reverts commit 453efc02a5.

Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

U4-8274 '/umbraco/ping.aspx' is missing
 2016-04-04 09:20:59 +02:00
Sebastiaan Janssen
680396daab Localize server-side error message for disallowed file uploads 2016-04-03 12:08:23 +02:00
Stephan
c3055ca43f U4-8103 - fix DisableBrowserCacheAttribute to handle exceptions 2016-03-31 16:37:16 +02:00
Stephan
61fe0a4a93 U4-2954 - refresh domain cache when emptying recycle bin 2016-03-30 17:56:34 +02:00
Shannon
43e23829ae updates EnsurePartialViewMacroViewContextFilterAttribute to check for child actions 2016-03-23 10:06:13 +01:00
Shannon
b9af6f631a U4-8220 ModelState and ViewData is not carried through when using the obsolete Content.GetGridHtml method 2016-03-22 11:23:09 +01:00
Shannon
cd401f5e37 U4-8216 Hijacked controller actions fail with custom RenderModel subclass due to ModelBinding error 2016-03-21 16:12:34 +01:00
Stephan
0f90d357cf U4-8043 - reboot application when PureLive models go wrong 2016-03-18 16:14:06 +01:00
Shannon
9e3d7a1cce updates default pipeline marker stage for the preview middleware, updates MembershipHelper to not throw an exception if the Role manager is disabled. 2016-03-18 11:05:39 +01:00
Shannon
5230f55f44 moves attribute 2016-03-16 14:52:40 +01:00
Shannon
f93fee28dd U4-8165 Ensure browsers are not caching service requests 2016-03-16 14:51:04 +01:00
Shannon Deminick
fc7cfea4ad Merge pull request #1179 from umbraco/temp-U4-8175 
U4-8175 - fix PropertyType.PropertyGroupId inconsistencies
 2016-03-16 14:18:03 +01:00
Stephan
ecdca378c6 U4-8175 - fix PropertyType.PropertyGroupId inconsistencies 2016-03-16 13:41:58 +01:00
Shannon Deminick
5af4d02f44 Merge pull request #1177 from umbraco/temp-U4-7109 
U4-7109 - could not change language in Culture and Hostnames
 2016-03-16 10:48:35 +01:00
Shannon
2f9b526465 Only apply preview auth if Umbraco is fully configured 2016-03-16 10:41:33 +01:00
Stephan
800e02bccf Bugfix model mapper for PropertyTypeDisplay 2016-03-16 10:19:06 +01:00
Shannon Deminick
693b0dba24 Merge pull request #1161 from umbraco/temp-U4-4219 
U4-4219 Can't Preview protected pages
 2016-03-16 10:18:06 +01:00
Stephan
0cf6548f86 U4-7109 - could not change language in Culture and Hostnames 2016-03-15 17:26:05 +01:00
Stephan
8e82ff5450 Merge pull request #1173 from umbraco/temp-U4-8012 
U4-8012 Generic properties tab disappears on the edit Member Type win…
 2016-03-15 16:24:21 +01:00
Shannon
d5fe8c11c8 U4-8065 Inherited from is empty - reverts 10617d1bd5, turns out this is why we needed that property value 2016-03-15 15:08:53 +01:00
Shannon
3fdb122e91 U4-8012 Generic properties tab disappears on the edit Member Type window after upgrade to 7.4 2016-03-15 14:44:03 +01:00
Shannon Deminick
710dda164f Merge pull request #1166 from umbraco/temp-U4-7708 
U4-7708 Using a RTE Macro Partial Form (SurfaceController) & Doctype …
 2016-03-15 13:57:27 +01:00
Claus
c306f94a6a Merge pull request #1154 from pynej/fix-stylesheet-tree-sync 
Fix for issue causing the entire stylesheets tree to reload when …
 2016-03-15 12:46:59 +01:00
Claus
4fa6e70e72 Merge pull request #1140 from jamescoxhead/U4-7746 
U4-7746 - use flat icon in partial views tree
 2016-03-15 09:22:18 +01:00
Stephan
6ad2853bce Merge pull request #1165 from umbraco/temp-U4-7949 
U4-7949 The task runner has completed YSOD when using the Umbraco Pac…
 2016-03-10 18:29:08 +01:00
Shannon
e60e4e52fc U4-7708 Using a RTE Macro Partial Form (SurfaceController) & Doctype Hijack Controller causes problem with submissions 2016-03-10 18:00:14 +01:00
Sebastiaan Janssen
b2407eab98 Merge pull request #1107 from bjarnef/dev-v7-tinymce-font-icons 
Change icons for richtext editor config
 2016-03-10 17:47:46 +01:00
Shannon
11f9cdead0 U4-6366 Issue assigning member roles on MemberService.Saved event 2016-03-10 15:52:34 +01:00
Shannon
4a11bf68f3 U4-7949 The task runner has completed YSOD when using the Umbraco Package installer 2016-03-10 15:23:52 +01:00
Warren Buckley
0cb7f220ea Merge pull request #1149 from umbraco/temp-U4-4700 
U4-4700 List View Doesn't Respect User Permissions
 2016-03-10 08:52:38 +00:00
Shannon
af1fe425a2 udpates ext method to specify an explicit marker stage, updates UmbracoDefaultOwinStartup to be more flexible with the methods to override. 2016-03-09 19:37:37 +01:00
Shannon
22385d40db U4-4219 Can't Preview protected pages 2016-03-09 17:35:50 +01:00
Shannon
be0bacd895 Ensures all angular views are cache busted so browser cache is not an issue after upgrading. 2016-03-08 17:23:54 +01:00
Shannon
372a768dca U4-4700 List view doesn't respect user permissions - makes the buttons show/hide based on the selected items instead of the current item. 2016-03-08 15:53:22 +01:00
Warren Buckley
94ea677ec0 Merge pull request #1146 from umbraco/temp-U4-7641 
U4-7641 - enable content type copy
 2016-03-08 09:38:16 +00:00
Shannon Deminick
19fb920aa1 Merge pull request #1150 from umbraco/temp-U4-7823 
U4-7823 - stop flooding the log with errors getting media 0
 2016-03-07 17:58:49 +01:00
Shannon Deminick
f35e1604ca Merge pull request #1141 from umbraco/temp-U4-8030 
U4-8030 - Fix RenderModelBinder issue with surface
 2016-03-07 17:53:31 +01:00
Shannon
b9765c3bec fixes RenderModelBinder to use base implementation,adds unit tests 2016-03-07 17:52:28 +01:00
Shannon
5f365241a8 updates RenderModelBinder to simply check for IPublishedContent or IRenderModel 2016-03-07 16:29:40 +01:00
Shannon
9c121f0044 Fixes RenderModelBinder to inherit from DefaultModelBinder and use the default logic if the model in the route values is not IRenderModel 2016-03-07 16:26:30 +01:00
Shannon
a707d23692 Allows for specifying explicit product names by overriding the property in MigrationStartupHander 2016-03-07 15:13:31 +01:00
Shannon Deminick
112453a032 Merge pull request #1144 from umbraco/temp-U4-8077 
U4-8077 - ensure product name in migration event handlers
 2016-03-07 14:09:29 +01:00
Jeremy Pyne
83e679ba5e Fix for issue causing the entire stylesheets tree to reload when selecting a item. 2016-03-02 16:00:33 -05:00