yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,718 Commits 4 Branches 7 Tags
415aaf3e2bfd4583fa74e3312270e7f970cd4861
Commit Graph

4546 Commits

Author SHA1 Message Date
Shannon
415aaf3e2b U4-7477 xss char stripping on data type names is being too agressive 2016-01-05 11:35:24 +01:00
Shannon Deminick
e89cc24d51 Merge pull request #958 from lars-erik/overridable-domain-repository 
Can't log into youtrack. Simple changes to repositoryfactory and umbr…
 2015-12-16 10:19:25 +01:00
Lars-Erik Aabech
a14f0021bd Can't log into youtrack. Simple changes to repositoryfactory and umbraco.web.ui assemblyinfo. 2015-12-16 09:50:17 +01:00
bjarnef
5a9dd11a7c Change margin-top for triangle and re-order config properties 2015-12-15 15:42:14 +01:00
bjarnef
9e6123abd3 Modify properties and styling 2015-12-15 15:42:13 +01:00
bjarnef
6c3ef2aaa9 Add more config properties 2015-12-15 15:42:13 +01:00
bjarnef
95ae504c9b Change "reversed" property to boolean 2015-12-15 15:42:12 +01:00
bjarnef
88fadcf74e Add slider bootstrap-slider v5.2.6 
Add newer version of script and add addtional properties.
 2015-12-15 15:42:12 +01:00
Claus
9c7ef46222 Merge pull request #941 from bugsancho/dev-v7 
U4-7508 - IsChildOfListView should be populated for Media items
 2015-12-15 14:18:27 +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
44ebd8d9ea Proper formatting of this file, only whitespace changes 2015-12-15 12:18:23 +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
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
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
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
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
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
Claus
25d8fc7a13 Fixing split separator for thumbnailSizes in FileUploadPropertyValueEditor. 2015-11-30 19:18:57 +01:00
Shannon
87100feb3d Fixes: U4-7467 Umbraco 7.3.2 Clean install, OWIN error after database creation and bumps version 2015-11-27 21:23:24 +01:00
Shannon Deminick
eae74b0e20 Merge pull request #931 from lars-erik/fix-u4-7329 
Actually save the domain
 2015-11-27 16:56:07 +01:00
Shannon
c4860a490f Ensures that GetUserSecondsMiddleWare uses the SystemClock for UTC Now, ensures that it only extends the ticket when necessary and not everytime this middleware is called - the same logic that OWIN normally renews tickets with, this means the cookie is not written everytime this request is made. 2015-11-27 16:43:02 +01:00
Shannon
8e6bbc3df9 Ensures that written cookies are done so consistently based on the UmbracoBackOfficeCookieAuthOptions. Ensures that when a webforms page requests token renewal that the token is not always renewed for the request, it checks if the tokens expiry correctly and only renews when necessary so the cookie is not written each time. Fixes the ForceRenewalCookieAuthenticationHandler to only write a cookie if the request is for a request that is not normally auth'd (i.e. is a webforms form that exists outside the normal /umbraco path ... legacy). 2015-11-27 16:25:39 +01:00
Lars-Erik Aabech
c16d0b77c2 Actually save the domain 2015-11-27 12:59:15 +01:00
Shannon
fd66f08520 Fixes setting auth cookie during install, removes some try/catch/swallow with some error messaging, converts some String -> string and == false updates. 2015-11-26 13:07:22 +01:00
Shannon
f62581bd38 reverts more of the caps lock 2015-11-26 11:39:49 +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
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
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
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
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
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
4c544acb42 fixes links so that working with vdirs works too. 2015-11-19 19:21:55 +01:00