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

13388 Commits

Author SHA1 Message Date
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
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
Stephan
271f4e7a4a U4-8413 - fix missing ServersLock object 2016-05-10 12:29:13 +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
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
Stephan
67996cdb64 U4-8406 - restart app pool by unloading domain and support read-only web.config 2016-05-04 08:45:50 +02:00
Claus
729b179473 Merge pull request #1242 from umbraco/temp-u4-8370 
U4-8370 - fix broken upgrade
 2016-05-03 12:54:47 +02:00
Claus
20b67e47be Fixed property name to match property of the dynamic. 2016-05-03 12:54:22 +02:00
Shannon Deminick
52b6e04ad4 Merge pull request #1248 from rustyswayne/dev-v7 
Appends forum link to developer comment for reference when evaluating code removal.
 2016-05-03 11:35:56 +02:00
Claus
1186b7cb47 Merge pull request #1246 from umbraco/temp-u4-2508 
U4-2508 - improve culture detection in 404 situation
 2016-05-03 11:02:31 +02:00
Shannon
f03daf819e Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-05-02 23:06:45 +02:00
Shannon
febaddaaef U4-8394 When persisting the xml cache file it double loads the full xml structure into memory before writing it to a file 2016-05-02 23:05:46 +02:00
rs@merchello.com
029e50dd3c Appends comment and forum reference to developer comment for reference when evaluating code removal. 2016-05-02 13:17:13 -07:00
Simon Busborg
2a87c926f3 Merge pull request #1234 from bjarnef/dev-v7-U4-8343 
Localize "unsaved changes" dialog.
 2016-05-02 10:44:47 +02:00
Simon Busborg
f7ee47a37f Fixes U4-8029 Editor settings for "Grid Layouts" is too wide and text overflows 2016-05-02 10:18:37 +02:00
Stephan
6dea69c5a1 U4-2508 - improve culture detection in 404 situation 2016-04-27 19:09:49 +02:00
Chriztian Steinmeier
066ef6809b Change the language keys necessary for the fix 2016-04-26 23:36:42 +02:00
Mads Rasmussen
4b682e0669 Merge pull request #1201 from bjarnef/dev-v7-U4-8022 
U4-8022 - Fix issues with tree icons + legacy icons
 2016-04-25 21:13:14 +02:00
Mads Rasmussen
4886631d54 Merge pull request #1202 from bjarnef/dev-v7-U4-7967 
U4-7967 - Fix errors when saving document type when no icon is selected
 2016-04-25 20:14:11 +02:00
Stephan
2c3c0eae12 U4-8370 - fix broken upgrade 2016-04-25 17:10:10 +02:00
Stephan
fb99e375d0 U4-5699 - update template alias in gui after saving 2016-04-25 14:14:55 +02:00
Stephan
7e9a14be83 RteMacroRenderingValueConverter should return an IHtmlString 2016-04-25 11:18:22 +02:00
Claus
9b39f712be U4-3411 Adding new language doesn't sync the tree 2016-04-25 10:11:54 +02:00
bjarnef
fcdf212c4c Rename area alias 2016-04-24 18:42:46 +02:00
Asbjørn Riis-Knudsen
deb74939af U4-8365: Fix decimal property value converter to work on non EN-US cultures 2016-04-23 17:54:37 +02:00
Søren Gregersen
bad1372313 Update ICacheProvider.cs 
Not really an abstract class... :)
 2016-04-23 15:58:18 +02:00