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

16034 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
bab693f2ba fix build 2016-05-25 10:56:41 +02:00
Shannon
f243133b95 Merge remote-tracking branch 'origin/dev-v7' into temp-U4-265 
# Conflicts:
#	src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
 2016-05-25 09:51:46 +02:00
Shannon
2504586c26 removes initial idea of performing conversion on the server since this would be a breaking change, instead we can easily do this on the client side - and this works much better. Have added pre-values to the date/time picker to be able to enable offset times. This is enabled for the publish-at pickers since those must be offset. When the datetime is offset, it shows the server time in small text underneath the picker. Have added js unit tests for the date conversions. Have updated the datepicker controller to set the model date in a single place/method so it's consistent. 2016-05-25 09:43:31 +02:00
Sebastiaan Janssen
7f3f11ab58 Merge pull request #1279 from umbraco/temp-U4-8491 
U4-8491 Moving/Deleting Media does not sync/refresh the tree
 2016-05-24 17:22:51 +02:00
Sebastiaan Janssen
f817eefd5c Merge pull request #1280 from umbraco/temp-U4-8358 
U4-8358 Writers can't schedule publish/unpublish times
 2016-05-24 16:25:55 +02:00
Shannon
b69580967e Updates interceptor files with correct module usage - creates new request interceptor to append a custom Time-Offset header 2016-05-24 16:12:54 +02:00
Stephan
7fad91d86f Merge branch 'AndyButland-u4-8290' into dev-v7 2016-05-24 15:56:21 +02:00
Stephan
42021a56b2 U4-8290 - minor cleanup & refactoring 2016-05-24 15:55:26 +02:00
Stephan
0a4a230c07 Merge branch 'u4-8290' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-8290 2016-05-24 08:15:47 +02:00
Shannon
877b7d4af7 U4-8358 Writers can't schedule publish/unpublish times 2016-05-23 19:23:59 +02:00
Shannon
9cf5ac2f95 U4-8491 Moving/Deleting Media does not sync/refresh the tree 2016-05-23 17:44:45 +02:00
Sebastiaan Janssen
c902649768 U4-8438 Umbraco 7.4.3 NuGet package missing file 2016-05-23 10:47:54 +02:00
Sebastiaan Janssen
bbe37ea6b9 U4-8349 Cannot create Scripting Files in Umbraco 7.4.0 2016-05-23 08:55:51 +02:00
Sebastiaan Janssen
57b19e7017 Forgot semicolon, whoops! 2016-05-23 08:47:36 +02:00
Sebastiaan Janssen
43d791f9a5 U4-6504 SmtpClient Not Properly Disposed, Causing Emails to Fail Periodically 2016-05-23 08:27:30 +02:00
Sebastiaan Janssen
8c7390280e Updates this migration to only run when upgrading from 7.3.0 and higher 2016-05-20 16:36:22 +02:00
Sebastiaan Janssen
e54d374eb2 Add cmsPreviewXml table if it doesn't yet exist 2016-05-20 15:54:39 +02:00
Stephan
aea26e67b1 Merge pull request #1255 from umbraco/better-memory-xmlcache 
This fixes the LoadContentFromDatabase method
 2016-05-19 17:03:23 +02:00
Shannon
06ae15ee7c reverts the cloning change 2016-05-19 16:12:12 +02:00
Shannon
95871fde7c updates naming conventions 2016-05-19 15:22:49 +02:00
Shannon
6b954d962f Merge branch 'lars-erik-test-bases-refactoring' into dev-v7 2016-05-19 11:48:14 +02:00
Shannon
2bd81ccb90 Merge branch 'test-bases-refactoring' of https://github.com/lars-erik/Umbraco-CMS into lars-erik-test-bases-refactoring 2016-05-19 11:48:01 +02:00
Stephan
08ae03a2d4 Merge branch 'dev-v7' into better-memory-xmlcache 2016-05-17 19:10:38 +02:00
Shannon
512c19a132 U4-8461 ERROR umbraco.presentation.webservices.nodeSorter - Could not update content sort order 2016-05-17 13:27:45 +02:00
Shannon
1e468cda5d Removes unused method, ensures that Cloning only occurs once per request (sort of hacky). Before if you have a few nodes that are published but have pending changes, then perform a sort, then the xml will be cloned for as many times as there were content changes. 2016-05-17 13:26:47 +02:00
Mads Rasmussen
adebd4acd6 Merge pull request #1169 from AndyButland/u4-7468 
Fixes U4 7468 - mis-assigned translator when sending to translation
 2016-05-17 13:18:15 +02:00
Shannon
d826f04b54 Ensures sort order is accurate to what is in the database 2016-05-17 12:17:05 +02:00
Simon Busborg
4752a83135 Fixes: U4-8362 Inserting image in a grid with Firefox shows full-size rather than scaled image 2016-05-17 11:02:07 +02:00
Mads Rasmussen
6a593d8b5e Merge pull request #1245 from greystate/U4-8377 
Fix for U4-8377
 2016-05-17 10:42:12 +02:00
Mads Rasmussen
38bc38486a Merge pull request #1229 from bjarnef/dev-v7-U4-8300 
Wrap text "Include all child nodes" in a label
 2016-05-17 10:13:06 +02:00
Mads Rasmussen
b3f50368e5 Merge pull request #1228 from bjarnef/dev-v7-U4-8330 
Fix line-height when using custom icon font as section icon
 2016-05-17 09:19:38 +02:00
Shannon
f130e86c88 U4-8448 Background task runner missing a null check during shutdown 2016-05-12 12:27:02 +02:00
Shannon
8d5556d4bc Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-05-12 11:16:46 +02:00
Shannon
4d0dc90042 Revert "RteMacroRenderingValueConverter should return an IHtmlString" 
This reverts commit 7e9a14be83.
 2016-05-12 11:16:39 +02:00
Claus
acb1aeabda Merge pull request #1261 from umbraco/temp-U4-8371 
U4-8371 Dont ship with the {machinename} token for Examine
 2016-05-12 10:55:52 +02:00
Claus
f5e433fd3c Merge pull request #1260 from umbraco/temp-U4-7295 
U4-7295 Examine search with the data in the grid should be easier OOTB
 2016-05-12 10:52:18 +02:00
Simon Busborg
a3efb74ad3 Merge pull request #1240 from arknu/decimal-parsing 
U4-8365: Fix decimal property value converter to work on non EN-US cultures
 2016-05-11 13:33:48 +02:00
Simon Busborg
924eac1b95 Merge pull request #1235 from bjarnef/dev-v7-U4-8347 
Fix localization of listview buttons/links actions.
 2016-05-11 10:06:51 +02:00
Shannon
fb55b0a60b U4-8371 Dont ship with the {machinename} token for Examine 2016-05-10 18:32:32 +02:00
Shannon
7ae1060f50 U4-7295 Examine search with the data in the grid should be easier OOTB 2016-05-10 18:25:18 +02:00
Shannon Deminick
d11ae23fe3 Merge pull request #1259 from umbraco/temp-u4-8413 
U4-8413 - fix missing ServersLock object
 2016-05-10 13:51:10 +02:00
Stephan
271f4e7a4a U4-8413 - fix missing ServersLock object 2016-05-10 12:29:13 +02:00
AndyButland
4f3d82cf10 Change field to which data is saved for a data type if provided in prevalues and handle potential mis-matched types on display 2016-05-10 10:50:59 +02:00
Simon Busborg
50e92b80f9 Changed from int to Nvarchar for the multimediapicker 2016-05-09 14:35:55 +02:00
Simon Busborg
9cd33abd5b Merge pull request #1130 from jamescoxhead/U4-7315 
U4-7315 Make new media picker default in new installs
 2016-05-09 14:30:29 +02:00
AndyButland
7b6bcd24ae Added value type as a pre-value to the label property editor 2016-05-08 23:39:47 +02:00
AndyButland
7858521c8b Converted usage of property editor value type strings to constants 2016-05-08 22:05:23 +02:00
Shannon Deminick
f79a1f1a71 Merge pull request #1253 from umbraco/temp-u4-8406 
U4-8406 - restart app pool by unloading domain and support read-only …
 2016-05-04 16:51:41 +02:00
Shannon
0d11b15b3f This fixes the LoadContentFromDatabase method - before this was storing every single xml node in memory in dictionaries (x2) and then performing the re-organization of all nodes afterwords to construct a document, now we just read each row and organize the document accordingly, 2016-05-04 16:36:43 +02:00
Stephan
5f8747b4d3 U4-1780 - detect colliding urls (#1243) 
* U4-1780 - detect colliding urls

* U4-1780 - fix error message

* U4-1780 - fix XmlHelper issue with sortOrder

* U4-1780 - bugfix
 2016-05-04 12:45:20 +02:00