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

12264 Commits

Author SHA1 Message Date
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
Mads Rasmussen
8bfb77d3fe add client side validation for max file size in list view grid-layout, list view list-layout and media picker 2015-11-25 19:18:14 +01:00
Mads Rasmussen
89fd42be25 add server error to html 2015-11-25 19:16:14 +01:00
Shannon
924a016ffe Fixes U4-7457 Server side request forgery (xsrf) in feedproxy.aspx 2015-11-25 18:05:57 +01:00
Simon Busborg
dbbccb4e40 Ensure drag/drop media uploads show notifications - since the way this works has been overhauled in 7.4 
Awaits `maxFileSize` variable from U4-7394 ( http://issues.umbraco.org/issue/U4-7394 )
 2015-11-25 15:46:34 +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
Simon Busborg
66ee3503a5 UI love to the different states of the grid – much polish, such click, wow colors 2015-11-25 15:09:02 +01:00
Mads Rasmussen
9a8501c90c Fixes: U4-7387 It's not possible to select folders in listview in media section 2015-11-25 13:51:57 +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
Claus
ea12a883f3 Merge pull request #925 from umbraco/temp-U4-7394 
Fixes: U4-7394 Missing maxFilseSize variable from web.config in the b…
 2015-11-25 09:43:55 +01:00
Simon Busborg
9b1983a239 Added labels to show when styles/config are added to rows/cells 2015-11-25 09:27:11 +01:00
Mads Rasmussen
5797c65a1d Fixes: U4-7446 Grid - Confirm dialog on delete row/cell 2015-11-25 09:24:19 +01:00
Shannon
6d0aa824ad U4-7307 Windows Authentication prompts for Windows login after Umbraco login 2015-11-24 16:31:18 +01:00
Mads Rasmussen
776a9bc8e2 Fixes: U4-7442 Grid - Hide Layout picker when only one layout is configured 2015-11-24 14:03:53 +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
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
Mads Rasmussen
c81b034568 Fixes: U4-7441 Grid - Hide row picker when Grid has content (show + icon) 2015-11-23 19:57:15 +01:00
Simon Busborg
692e09871a Comments, TODOs, and general cleanup in umb-grid 2015-11-23 16:46:59 +01: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
Shannon
bb3a9c0e2e Fixes: U4-7394 Missing maxFilseSize variable from web.config in the backoffice 2015-11-23 15:19:13 +01:00
Simon Busborg
e15b11389a Merge branch '7.4.0' into temp-U4-7366 2015-11-23 15:08:01 +01:00
Mads Rasmussen
522d9d148f Fixes: U4-7449 Cannot create datatype in new content type editor 2015-11-23 15:03:26 +01:00
Simon Busborg
36361bf9e8 Changed dropzone UI, to display link. Pulled SVG source from file into image file. 2015-11-23 14:13:12 +01:00
Claus
f09e3c206c Fixed formatting... 2015-11-23 13:45:17 +01:00
Claus
2415403149 Fixes: U4-7392 It's not possible to upload folders in the media root 2015-11-23 13:43:31 +01:00
Rune Strand
e4660115cd Dirty hack for Frankfurt 2015-11-23 13:05:41 +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
Stephan
0f0b612de3 Refactor EntityContainer with (sort-of) proper repository 2015-11-20 18:37:00 +01:00
Stephan
3fe235fa35 Sanitize content types .ContentTypeComposition and .PropertyTypes 2015-11-20 18:36:55 +01:00
Stephan
ee72621042 Fix development server port 2015-11-20 18:36:54 +01:00
Stephan
67c7ed1810 Fix propertyGroup.ParentId migration 2015-11-20 18:36:53 +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
Mads Rasmussen
4adc645580 Merge branch '7.4.0' into temp-U4-7366 2015-11-19 22:19:52 +01:00