13645 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Sebastiaan Janssen	4baaafd006	Also remove change password dashboard from nuget package	2015-11-26 11:57:37 +01:00
Shannon	3f7293304d	removes password change dashboard from release	2015-11-26 11:55:42 +01:00
Shannon	f62581bd38	reverts more of the caps lock	2015-11-26 11:39:49 +01:00
Shannon	9782e3711e	Revert "Update bower.json with ngCapsLock" ... This reverts commit f0e1460550. Conflicts: src/Umbraco.Web.UI.Client/bower.json	2015-11-26 10:54:43 +01:00
Shannon	1f4ba9cfdc	ignores file that shouldn't be there	2015-11-26 10:36:15 +01:00
Shannon	ba4f0cc6a4	remove file that shouldn't be checked in	2015-11-26 10:35:28 +01:00
Shannon	fc84821e8b	fixes U4-6340 Partial view macro with parameters not working in RTE - to use a Model to post with the same Action name	2015-11-26 10:32:43 +01:00
Shannon Deminick	0fcf0b505a	Merge pull request #922 from engern/U4-6340 ... Fixes U4-6340 : Partial view macro with parameters not working in RTE and Grid (backend)	2015-11-26 09:54:24 +01:00
Shannon	d300146cf6	trips content/media names, makes sure that the content type editor when rendering template names html encodes the names.	2015-11-25 20:44:53 +01:00
Shannon	c8482b9f59	Revert "Merge pull request #875 from Phosworks/U4-7312" ... This reverts commit 14265fc964, reversing changes made to 18c3345e47. Conflicts: src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js src/Umbraco.Web/Editors/ImagesController.cs	2015-11-25 20:27:58 +01:00
Shannon	b7795e19ef	Changes bigthumbnail pr to not cache per second, just minute	2015-11-25 20:21:24 +01:00
Shannon	c97617f5b5	Fixes: U4-7461 xss vulnerability in content type editor	2015-11-25 20:15:28 +01:00
Shannon Deminick	14265fc964	Merge pull request #875 from Phosworks/U4-7312 ... Changed web api GetBigThumbnail to image processor	2015-11-25 19:52:14 +01:00
Shannon	18c3345e47	Fixes U4-7459 XSRF protection bypass - ensures tokens are checked for the non-editor api controllers	2015-11-25 19:39:24 +01:00
Shannon	924a016ffe	Fixes U4-7457 Server side request forgery (xsrf) in feedproxy.aspx	2015-11-25 18:05:57 +01:00
Claus	a02b41e9d2	Merge pull request #927 from umbraco/temp-U4-7307 ... U4-7307 Windows Authentication prompts for Windows login after Umbrac…	2015-11-25 15:22:36 +01:00
Shannon	068c4a0b16	Fixes PR for U4-7362 Add message to login screen if Caps Lock is on	2015-11-25 11:22:12 +01:00
Shannon Deminick	f7d28d769a	Merge pull request #886 from bjarnef/dev-v7-U4-7362 ... Add message to login screen if Caps Lock is on	2015-11-25 11:01:47 +01:00
Claus	9a07e206d8	Merge pull request #874 from andydale1982/U4-7323_(#871)‏ ... U4 7323 (#871)‏	2015-11-25 10:51:41 +01:00
Shannon Deminick	0edb71f4aa	Merge pull request #917 from bjarnef/dev-v7-move-umb-version-in-dialog ... Move Umbraco version label to header in user dialog	2015-11-25 10:51:36 +01:00
Shannon Deminick	b376207ef6	Merge pull request #868 from opelpanfan/UKFest-U4-7324 ... U4-7324 Member Picker search results doesn't show correct icons	2015-11-25 10:33:59 +01:00
Shannon	6d0aa824ad	U4-7307 Windows Authentication prompts for Windows login after Umbraco login	2015-11-24 16:31:18 +01:00
Claus	89afacf161	Merge pull request #915 from umbraco/temp-U4-7380 ... U4-7380 Backoffice timeouts after 7.3.1 upgrade	2015-11-24 11:35:01 +01:00
Claus	0fa6940bb6	Merge branch 'arknu-U4-6657-mediapicker' into dev-v7	2015-11-24 10:37:11 +01:00
Claus	1353b0a592	Reordering flex properties - recess module crashes with out of memory exception if they are in the other order.	2015-11-24 10:35:54 +01:00
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
Sebastiaan Janssen	18d3aa9ee2	Merge pull request #926 from kiasyn/patch-1 ... Remove unnecessary ToLowerInvariant call from PreviewMode	2015-11-23 22:17:07 +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
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	9fee3f5873	Merge pull request #918 from umbraco/temp-U4-5764 ... Related to: U4-5764 - adding in Open button on content/media picker	2015-11-20 12:09:21 +01:00
Claus	cb10578e19	Merge branch 'Nicholas-Westby-feature/U4-5764-node-picker-info' into temp-U4-5764	2015-11-20 11:52:25 +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
bjarnef	62173cef58	Merge remote-tracking branch 'refs/remotes/umbraco/dev-v7' into dev-v7	2015-11-19 21:12:24 +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