yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,174 Commits 4 Branches 7 Tags
90fdbb007e7393cafc16754b012f560aa804b020
Commit Graph

9808 Commits

Author SHA1 Message Date
Sebastiaan Janssen
90fdbb007e Bump version 2015-03-19 14:45:00 +01:00
Per Ploug
19e4fe5059 Grid labels header colors for delete and move actions 2015-03-19 14:33:12 +01:00
Sebastiaan Janssen
311d503d8b Updates CDF dependency to latest version 2015-03-19 12:54:00 +01:00
Per Ploug
f0fc3313e4 Tweaked borders a tiny bit 2015-03-19 12:46:29 +01:00
Per Ploug
dc7cb08824 Styling for grid editors + row labels 2015-03-19 12:29:05 +01:00
Stephan
5ddcf42bc3 U4-3753 - keep some things internal 2015-03-19 09:37:39 +01:00
Shannon
af112f6b20 Adds nicer grid editor labels on hover 2015-03-19 17:08:14 +11:00
Shannon
cbef51eaf0 Fixes: U4-6294 Feature Request 7.2.1 Grid - UX - labeling the grid editors - but will see if we can do a better job of the labeling 2015-03-19 16:10:46 +11:00
Shannon
85ba41dd06 Fixes: U4-5435 Dropdown list multiple, publish keys - single item 2015-03-19 15:50:58 +11:00
Shannon
e5cf7b089c oops, added timeouts where they cannot exist for request cache, fixes build 2015-03-19 14:47:08 +11:00
Shannon
db5c204d8c Merge branch '7.2.1-configurablemacrogrideditor' of https://github.com/mattbrailsford/Umbraco-CMS into mattbrailsford-7.2.1-configurablemacrogrideditor 2015-03-19 14:33:36 +11:00
Shannon
b9082cf390 Fixes our usages of GetCacheItem so that there is a timeout, this is needed otherwise memory won't be given back unless memory gets too high where in fact for most of these we want to give it back as soon as possible if it isn't being used. 2015-03-19 14:00:48 +11:00
Shannon
9469b0b844 Fixes: U4-6402 Grid config file should be merged with package.manifests & U4-6427 Grid config file has caching problems because it's downloaded as a static file 
This also fixes up the OutputCaching params on the BackOfficeController since OutputCache is bypassed when an action requires authentication, so now we manually do some caching when not in debug mode for authorized actions (of course auth happens before any cached response can occur). This also fixes up the static caching that was happening with the ManifestBuilder so now when that is not in use it gives back it's memory. This also fixes up any client side caching that was happening on BackOfficeController - before we were allowing client cache to happen for a few actions on that controller which is incorrect, we need to disable all client cache for all actions on that controller.
 2015-03-19 13:53:15 +11:00
Shannon
5737cdfbe2 Fixes the way HttpResponseMessages are created - they should always be created with Request.CreateReponse! 2015-03-19 12:03:55 +11:00
Shannon
1a082464e9 Fixes: U4-5127 AssetService does not support virtual paths (~/) - and fixes up some formatting 2015-03-19 11:44:37 +11:00
Shannon
e004ad31b5 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
 2015-03-19 11:36:05 +11:00
Shannon
6cf25f0043 Fixes: U4-6428 Grid configuration does not support virtual paths - and therefore is not compatible with virtual directories 2015-03-19 11:35:04 +11:00
Shannon Deminick
c0f50a4c1b Merge pull request #656 from ProfessorFarnsworth/U4-6419 
fixed issue U4-6419 by removing that character
 2015-03-19 10:05:25 +11:00
Sebastiaan Janssen
00fbc6dfcb Revert "Fixes broken bower jquery reference" 
This reverts commit c2cfd26ee6.
 2015-03-18 13:05:21 +01:00
Per Ploug
3a9ad91f8f Adds better error handling to missing grid editors 2015-03-18 11:45:22 +01:00
Per Ploug
c2cfd26ee6 Fixes broken bower jquery reference 2015-03-18 11:45:04 +01:00
Per Ploug
c5f26c7c15 Fixes: U4-6331 The grid tools overlay disable the links/buttons on smaller screens 2015-03-18 11:44:49 +01:00
Helmuth Bederna
f742c0a958 fixed issue U4-6419 by removing that character 2015-03-18 10:41:15 +01:00
Shannon Deminick
8cefe22bee Merge pull request #649 from protherj/grid-rendering-quote-fix 
Changed the surrounding quotes for Grid custom settings/styles to be double quotes
 2015-03-18 19:55:32 +11:00
Shannon
37b219f6e1 Fixes: U4-4942 Widget disappears in RTE when there is a space in the macro alias 2015-03-18 19:52:45 +11:00
Shannon Deminick
300a46f1b2 Merge pull request #613 from gildebrand/patch-4 
parseMacroSyntax accepts other characters than a-z
 2015-03-18 19:17:33 +11:00
Shannon
9aa5df43bf Fixes: U4-5956 Feature request: Enhance the preview mode with labels clearly explaining the current view 2015-03-18 19:14:47 +11:00
Shannon
02b0e4dd6a Fixes: U4-6380 ClientDependency Bug on server - Can't Access Backoffice 2015-03-18 19:06:41 +11:00
Shannon
9c1d3fabb8 Fixes: U4-6418 Loading back office with ClientDependency does not respect the configured value for the compositeFileHandlerPath 2015-03-18 19:04:49 +11:00
Shannon
e9e84a7faa Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-03-18 19:03:57 +11:00
Shannon
137d8553de Fixes: U4-6417 When including a $schema element in package.manifest with a url schema, the regex will incorrectly strip required characters 2015-03-18 19:03:46 +11:00
Sebastiaan Janssen
7210c6cd95 U4-6384 Incorrect Error Message When Uploading Large File 
#U4-6384 Fixed Due in version 7.2.3
 2015-03-17 17:59:24 +01:00
Stephan
6856f9f341 Merge pull request #654 from umbraco/U4-274-disable-alttemplate 
U4-274 - Adds config option to disable alternative templates
 2015-03-17 14:32:08 +01:00
Sebastiaan Janssen
d24ef3650e U4-274 - Adds config option to disable alternative templates 2015-03-17 13:50:33 +01:00
Shannon
2feef247ed Fixes: U4-3562 Cannot preview when no template is assigned 2015-03-17 19:31:46 +11:00
Stephan
4974e2a2ce U4-6306 - hostname validation issue 2015-03-16 10:52:54 +01:00
Stephan
3eb0dac48a U4-3753 - fix the build 2015-03-16 09:28:24 +01:00
Stephan
a44b19da18 U4-6320 - fix default scrubbing interval, set to 4hrs 2015-03-16 09:16:28 +01:00
kgiszewski
f06a468fb4 Fix for U4-6395, U4-6117 2015-03-13 11:40:04 -04:00
Stephan
420c334af4 U4-3753 - refactor 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-03-12 15:03:46 +01:00
Stephan
20b21c86ea U4-3753 - add a way to get the rendering culture of a content 2015-03-12 15:02:18 +01:00
Shannon
d2083673be Fixes: U4-3420 Firefox v25.0 - Right click context menu doesn't work - this felt like being a web dev 10 years ago when you had to code totally differently for each browser. Firefox unfortunatley treats 'a' tags differently than anything else and combined with angular saying you can have empty 'href' tags doesn't work. In the end, the fix was easy, just remove the empty (supposed to be supported) href attributes from the 'a' tags in the tree, then the contextmenu starts working in firefox and the events can be canceled as per normal. This commit also moves the angular localization library to use bower. 2015-03-10 13:02:34 +11:00
Shannon
fe40b8fe99 ok, fixes the null check for real this time. 2015-03-09 17:53:58 +11:00
Shannon
dd477a0cbe whoops, fixes comparison on lazy val 2015-03-09 17:37:25 +11:00
Shannon
2834ccdc2b Fixes: U4-6344 TinyMCE RTE style_formats configuration changes 2015-03-09 17:31:29 +11:00
Shannon
b3f6f48834 fixes ugly null check on ContentTypeSort comparison 2015-03-09 16:42:30 +11:00
Shannon
4544520b66 Fixes: U4-6303 SaveAndPublishWithStatus error - updates to latest Examine with the fix. 2015-03-09 15:06:32 +11:00
Shannon
017663833a Missing a fairly critical log entry 2015-03-06 16:54:55 +11:00
Shannon
9a5923771d fixes changing the underscore of a user language to culture. 2015-03-06 16:05:37 +11:00
Shannon
0932c980e9 Fixes: U4-6307 Incorrect culture assigned to user (missing region code) 2015-03-06 16:01:49 +11:00