yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,766 Commits 4 Branches 7 Tags
2c9e96406bfc4499ae0fc4ec2b16f66c66511bc2
Commit Graph

16766 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Warren Buckley
2c9e96406b Merge pull request #1486 from umbraco/temp-U4-8987 
U4-8987 Grid editor radiobuttonlist in settings should allow prevalue…
 2016-09-19 12:01:54 +01:00
Warren Buckley
21c7d6a667 Merge pull request #1484 from umbraco/temp-U4-8985 
U4-8985 Label for row configurations in the grid editor
 2016-09-19 10:45:22 +01:00
Warren Buckley
e0f95f18d3 Small mod to ensure the copy for the updated warning is easier to read that modifying the label is OK to do so 2016-09-19 10:07:23 +01:00
Warren Buckley
b9ffbe9a57 Merge pull request #1481 from umbraco/temp-U4-8924 
U4-8924 Heath Check: Pingback to HTTPS uses wrong protocol
 2016-09-19 09:11:38 +01:00
Sebastiaan Janssen
dc9b2b3ca8 Fix the ClickJackingCheck to make sure it adds an "s" to "http" when SSL is enforced or site is running on port 443 2016-09-19 09:44:03 +02:00
Claus
baafa604fe Merge pull request #1448 from abjerner/patch-11 
The p in picker should be uppercase
 2016-09-17 14:34:04 +02:00
Claus
e79bfebb76 U4-8987 Grid editor radiobuttonlist in settings should allow prevalues to have a label 2016-09-17 14:01:58 +02:00
Claus
efc2a8e2ea U4-8985 Label for row configurations in the grid editor 2016-09-16 23:20:47 +02:00
Claus
e79427619b Revert "U4-8984 Upgrade AutoMapper to latest 3.x" 
This reverts commit 4887302b51.
 2016-09-16 21:22:35 +02:00
Claus
4887302b51 U4-8984 Upgrade AutoMapper to latest 3.x 2016-09-16 21:21:14 +02:00
Warren Buckley
aea735f20e Merge pull request #1441 from umbraco/temp-U4-8866 
U4-8866 Deleting a parent document type fails if any documents using …
 2016-09-16 15:46:50 +01:00
Warren Buckley
7a34b490c7 Merge pull request #1468 from umbraco/temp-u4-8954 
U4-8954 - fix WhereIn issue with non-value-types
 2016-09-16 11:37:12 +01:00
Warren Buckley
8091d9a098 Resetting UmbracoSettings file in this PR back to what it was previously - seems to have been committed by mistake 2016-09-16 11:04:50 +01:00
Sebastiaan Janssen
e2e6440109 Merge pull request #1482 from romanlytvyn/temp-u4-8956 
U4-8956 PublicAccessEntry.ClearRules() triggers an unhandled exception
 2016-09-16 09:49:54 +02:00
Roman Lytvyn
caffb36ec2 U4-8956 PublicAccessEntry.ClearRules() triggers an unhandled exception 
fixed System.InvalidOperationException (Collection was modified;
enumeration operation may not execute.) by reverse iterating the
collection.
 2016-09-16 10:35:14 +03:00
Sebastiaan Janssen
0d054de6ac U4-8924 Heath Check: Pingback to HTTPS uses wrong protocol 2016-09-15 17:37:42 +02:00
Warren Buckley
5397f2c53a Merge pull request #1447 from umbraco/temp-u4-8906 
U4-8906 - optimize member perfs
 2016-09-15 15:14:34 +01:00
Warren Buckley
61b11025bd Merge pull request #1476 from umbraco/temp-U4-8966 
U4-8966 Unable to uninstall Umbraco Forms - The relative virtual path…
 2016-09-15 13:40:48 +01:00
Claus
8c8a0160a1 U4-7705 Media Picker does not render when image has been deleted 
refixing - seems to have been left out in a merge somewhere.
 2016-09-14 08:43:32 +02:00
Sebastiaan Janssen
8b37f1dc6c Really cleaned up all of the other unneeded usings now... 2016-09-12 23:29:34 +02:00
Sebastiaan Janssen
6ec7028fe8 No need to add umbraco.Utils.. also cleaned up all of the other unneeded usings 2016-09-12 23:26:39 +02:00
Sebastiaan Janssen
14c0055899 U4-8966 Unable to uninstall Umbraco Forms - The relative virtual path 'bin/Umbraco.Forms.Core.dll' is not allowed here. 2016-09-12 23:24:01 +02:00
Claus
e0981f1c44 Merge pull request #1475 from umbraco/temp-U4-8965 
U4-8965 Updates for ImageProcessor parameters to support new crop mod…
 2016-09-12 13:36:24 +02:00
Claus
2ca7304215 Merge pull request #1444 from Jeavon/u4-8876 
Update ImageCropMode & ImageCropAnchor enums with options available i…
 2016-09-12 13:33:03 +02:00
Claus
88f8052573 U4-8965 Updates for ImageProcessor parameters to support new crop modes in v. 4.4.0 2016-09-12 12:51:48 +02:00
Stephan
5afeb315ba U4-8954 - rename file 2016-09-08 10:39:56 +02:00
Stephan
c2eeff6e47 U4-8954 - fix WhereIn issue with non-value-types 2016-09-08 10:37:03 +02:00
Shannon
893c2a99be adds some comments 2016-09-08 09:30:13 +02:00
Shannon Deminick
48786fcae1 Merge pull request #1464 from umbraco/temp-U4-8939 
Temp u4 8939
 2016-09-05 15:11:23 +02:00
Sebastiaan Janssen
28b4945d36 No longer need this now that it's part of JsJQueryCore 2016-09-05 14:59:22 +02:00
Sebastiaan Janssen
4a5314d8b9 No longer need this now that it's part of JsJQueryCore 2016-09-05 14:56:06 +02:00
Shannon Deminick
c67adcc43f Merge pull request #1463 from umbraco/temp-U4-8939 
U4-8939 Old openContentPicker() method is failing
 2016-09-05 14:51:29 +02:00
Sebastiaan Janssen
0a43fea1c0 U4-8939 Old openContentPicker() method is failing 
Adding jquery-migrate to make sure legacy applications keep working
 2016-09-05 14:42:45 +02:00
Sebastiaan Janssen
a20b7f9303 Merge pull request #1457 from umbraco/temp-u4-8917 
U4-8719 - bugfix the redirect dashboard
 2016-09-05 12:48:30 +02:00
Stephan
5b9b6be383 Merge pull request #1455 from abjerner/patch-12 
Added support for progress bar/list for when uploading a single file
 2016-09-05 12:22:54 +02:00
Stephan
40f6de950c Merge pull request #1460 from umbraco/temp-U4-8938 
U4-8938 [OutputCache] headers changed from Cache-Control: public to p…
 2016-09-05 11:35:58 +02:00
Stephan
916c350352 Merge pull request #1461 from umbraco/temp-U4-8898 
U4-8898 Blank login screen after upgrade to 7.5.x
 2016-09-05 11:30:48 +02:00
Sebastiaan Janssen
4186791d9a Removing this reference for now, doesn't seem like the best way to reference a dll and the sln build fine without this 2016-09-04 13:13:45 +02:00
Sebastiaan Janssen
02cef43815 Localizing the URL tracker dashboard 2016-09-04 13:09:37 +02:00
Sebastiaan Janssen
8d291efedd In the spirit of DRY: centralized IsAdmin() check in an extension method 
Made sure that non-admins can't trigger the enable/disable URL tracker endpoint
Renamed "admin" in GetEnableState to "isUserAdmin" for clarity
 2016-09-04 11:44:16 +02:00
Sebastiaan Janssen
a5c8052439 Better error message when package install fails 2016-09-03 13:55:54 +02:00
Sebastiaan Janssen
704169abab Merge branch 'refs/heads/dev-v7' into temp-U4-8889 2016-09-03 13:27:31 +02:00
Sebastiaan Janssen
8ee8b52832 Bumps version 2016-09-03 13:26:40 +02:00
Sebastiaan Janssen
81819aa3b7 Merge branch 'refs/heads/master-v7' into dev-v7 2016-09-03 13:25:02 +02:00
Sebastiaan Janssen
90ffae5526 Adds back some try-catches that were previously removed so we can actually log the errors 2016-09-03 13:23:32 +02:00
Sebastiaan Janssen
a3c99531bf U4-8898 Blank login screen after upgrade to 7.5.x 
Moves the updating of the CDF version to the very beginning before we even redirect to the login screen so it is nicely cachebusted
 2016-09-03 10:23:17 +02:00
Sebastiaan Janssen
1b6bf2f331 U4-8938 [OutputCache] headers changed from Cache-Control: public to private 2016-09-03 10:16:34 +02:00
Stephan
fee217e8d7 U4-8719 - minor fix 2016-09-02 15:01:58 +02:00
Stephan
c05a28a901 U4-8719 - bugfix the redirect dashboard, move to content section 2016-09-02 14:54:18 +02:00
Stephan
fa45cd1a88 tmp 2016-09-02 14:44:16 +02:00