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
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
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
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
Mads Rasmussen
4adc645580
Merge branch '7.4.0' into temp-U4-7366
2015-11-19 22:19:52 +01:00
bjarnef
a885840b9f
Move Umbraco version label to header in user dialog
2015-11-19 21:55:54 +01:00
Rune Strand
664f80364b
Add content visible when sorting
...
Add cell sorting
2015-11-19 21:54:59 +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
2ba7cdc789
Fixes: U4-6659 Examine: Specific doctype not being indexed
2015-11-19 19:06:31 +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
16f1fa1678
Merge branch 'dev-v7' into 7.4.0
2015-11-19 14:44:54 +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
