Claus
617fec171f
Merge branch 'U4-6657-mediapicker' of git://github.com/arknu/Umbraco-CMS into arknu-U4-6657-mediapicker
2015-11-24 10:33:04 +01:00
Claus
2c63866cb3
Merge pull request #909 from umbraco/U4-7270-1
...
Creates an IAsyncRenderMvcController which can be used instead of IRe…
2015-11-24 10:09:45 +01:00
kiasyn
f83c966e55
Remove unnecessary ToLowerInvariant call from PreviewMode
...
Text was being set lowercase and then injected with the preview badge markup. This meant that things such as script tags were being lowercased, breaking the javascript.
2015-11-24 10:02:14 +13:00
Tommy Enger
de41a1f1ca
Clean up the code
...
DRY
2015-11-23 16:29:09 +01:00
Tommy Enger
c9f57c6ce3
Split Get and Post
...
Split Get and Post into 2 separate methods to maintain backwards
compability
2015-11-23 15:52:36 +01:00
engern
54ab26e2ed
Simplifying thge code even further
...
Realized that we don't need to convert the exisitng dictionary to a new
dictionary.
2015-11-21 14:00:58 +01:00
engern
31dc1b2cdb
Fixes U46340
2015-11-21 13:20:13 +01:00
engern
07c714fd11
Fixes U4-7424
...
Add the possibilty to change the error message when a macro partial view
fails to render.
2015-11-21 11:33:46 +01:00
Claus
d4b9a711c6
Merge pull request #919 from umbraco/temp-U4-4641
...
Fixes: U4-4641 Feature Request: template and code editors should have insert Section, Define section buttons
2015-11-20 13:41:50 +01:00
Claus
9521742254
Fixes to MultiNodePicker when using media.
2015-11-20 13:17:28 +01:00
Claus
cdc4435f2d
Merge branch 'feature/U4-5764-node-picker-info' of git://github.com/Nicholas-Westby/Umbraco-CMS into Nicholas-Westby-feature/U4-5764-node-picker-info
2015-11-20 11:47:48 +01:00
bjarnef
a885840b9f
Move Umbraco version label to header in user dialog
2015-11-19 21:55:54 +01:00
Shannon Deminick
e5b0a4d98c
Merge pull request #854 from Spijkerboer/UKFest-U4-7322
...
Uk fest u4 7322
2015-11-19 19:26:53 +01:00
Shannon Deminick
9479d63cba
Merge pull request #899 from Acentrage/U4-7219
...
Fixes U4-7219
2015-11-19 19:24:24 +01:00
Shannon
4c544acb42
fixes links so that working with vdirs works too.
2015-11-19 19:21:55 +01:00
Shannon Deminick
c7c5f481f1
Merge pull request #879 from danieland/U4-4794--nodebug
...
U4 4794 nodebug
2015-11-19 19:10:35 +01:00
Shannon
5e8e62cbf7
missing csproj save
2015-11-19 18:29:11 +01:00
Shannon
555b520a0c
Cleans up the usages of auth cookies. OWIN is in charge of auth cookies but because we have Webforms, WebApi, MVC and OWIN, they all like to deal with cookies differently. OWIN should still be solely in charge of the auth cookies, so the auth extensions are cleaned up, the renewal now works by queuing the renewal and we have custom middleware detect if a force renewal has been queued and we renew the auth cookie there. Have obsoleted a few methods that should not be used that write auth tickets directly (this is purely for backwards compat with webforms). All of these changes now ensure that the auth cookie is renewed consistently between Webforms, WebApi, MVC and OWIN. Some changes also include ensuring that OWIN is used to sign out.
2015-11-19 18:12:21 +01:00
Simon Busborg
8053db32b6
code comments
2015-11-19 15:40:38 +01:00
Sebastiaan Janssen
3e2d59e526
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
2015-11-19 14:43:45 +01:00
Sebastiaan Janssen
9d3e967c2a
Ignore test that keeps crapping out on build server
2015-11-19 14:43:35 +01:00
Shannon
71ec09486d
Reverts the 'fix' from U4-7118 since it is incorrect. Updates the sliding expiration of the cookie/ticket when the user is supposed to be always logged in to 30 minutes in case the timeout is actually set very low in config.
2015-11-19 14:17:06 +01:00
Claus
8dadc92aa8
Fixed migration causing issues when upgrading from a site pre-migrations-table to version 7.3.2.
2015-11-19 12:01:46 +01:00
Shannon
f472f5d950
Ensures that OWIN signout method is called - this ensures that any auth middleware configured for the current user is called for sign out. Updates our cookie middleware provider to also ensure that our custom cookies are cleared when signing out with OWIN.
2015-11-19 11:57:24 +01:00
Simon Busborg
775a6f80ea
Added comments to support the changes
2015-11-19 11:47:49 +01:00
Simon Busborg
5bf8b8ecba
Used less function 'fade' instead of random color
2015-11-19 11:44:33 +01:00
Simon Busborg
397ef32665
Added hover & active state to input-label--small
2015-11-19 11:40:29 +01:00
Simon Busborg
2634e33f51
Used @fontSizeLarge variable to determine font-size for panel-dialog--header
2015-11-19 11:27:56 +01:00
Simon Busborg
6e27caa547
Added comments and notes
2015-11-19 11:11:09 +01:00
Simon Busborg
9c027dcdbc
some ui love for the panel dialogs
2015-11-19 10:32:17 +01:00
Nicholas-Westby
dcf59d2b17
Fixed typo for "forms": http://issues.umbraco.org/issue/U4-7425
2015-11-18 14:29:10 -08:00
Sebastiaan Janssen
887111318f
Update install facts
2015-11-18 20:35:36 +01:00
Sebastiaan Janssen
bf9755b27c
Don't end response so people can actually hook into PostRequestHandlerExecute
2015-11-18 19:41:20 +01:00
Sebastiaan Janssen
aca181b32e
U4-7410 Version issue with MySql.Data after upgrade to 7.3.1.
...
#U4-7410 Fixed
2015-11-18 19:39:10 +01:00
Shannon Deminick
886347e763
Merge pull request #912 from lars-erik/fix-u4-7268
...
Support generic CultureInfo as language culture
2015-11-18 18:26:09 +01:00
Shannon Deminick
9fa606e065
Merge pull request #907 from umbraco/temp-U4-7414
...
U4-7414 Deleted tab's properties should become generic properties
2015-11-18 17:01:02 +01:00
Shannon
e40ac44afd
updates test to reflect the instructions to replicate the original issue U4-7414
2015-11-18 17:00:27 +01:00
Shannon
48603fb840
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
2015-11-18 16:07:10 +01:00
Shannon
f824439180
Merge branch 'UKFest-U4-4792' of https://github.com/opelpanfan/Umbraco-CMS into opelpanfan-UKFest-U4-4792
...
Conflicts:
src/Umbraco.Core/Services/ContentService.cs
2015-11-18 16:07:01 +01:00
Shannon Deminick
b3616c9f8c
Merge pull request #911 from umbraco/temp-U4-4792
...
Fixes: U4-4792 Ancestors() on IContent throws "Object reference not set to an instance of an object."
2015-11-18 16:04:22 +01:00
Shannon
48383f2e7a
updaes null check and ensures the path isn't pre-set in the withidentity overload
2015-11-18 16:04:01 +01:00
Shannon
cb98385242
updates content/media service methods - null checks for parent IContent, dosn't use Parent() syntactic sugar methods, removes path creation in the WithIdentity methods.
2015-11-18 15:52:32 +01:00
Shannon
916bad82df
Ensures that the RenderActionInvoker isn't doing anything special so that MVC takes care of everything regarding async vs non-async and any controller descriptor/action descriptor lookups and cache. Creates a RenderIndexActionSelectorAttribute - this is used to decorate the underlying RenderMvcController.Index action. MVC will call into this method to check if the MethodInfo is valid, we then do a quick comparison of types, if the current type is the same as the reflected type, this means that the Index action has been overridden or there is no custom controller... lets use it. If the types don't match we'll do a simple reflected lookup to check if the reflected controller type (current controller) has more than one index action, if so, it means that a custom controller is in play and it has a custom index action... so we won't use the base class action and then it's up to MVC to find any other matching Index action based on the current request parameters. Added some tests for this too.
2015-11-18 14:59:29 +01:00
Claus
29ec8cb2d3
Merge pull request #857 from gerwinbouwhuis/UKFest-U4-5581
...
Uk fest u4 5581
2015-11-18 14:32:52 +01:00
Lars-Erik Aabech
04900337c7
Support generic CultureInfo as language culture
2015-11-18 14:13:32 +01:00
Claus
1433685160
MediaService assigns Path when creating media objects.
2015-11-18 09:26:45 +01:00
Stephan
c5994ed54a
Fix previous commit
2015-11-17 17:25:01 +01:00
Shannon
9fd80d791a
Creates an IAsyncRenderMvcController which can be used instead of IRenderMvcController if developers want access to an async Index action.
2015-11-17 17:05:00 +01:00
Stephan
f5f9cb676c
Fix CultureInfo leak in UmbracoApplicationBase too.
2015-11-17 16:54:24 +01:00
Claus
04e2d2370a
Fixes: U4-4792 Ancestors() on IContent throws "Object reference not set to an instance of an object."
2015-11-17 16:49:01 +01:00
