Commit Graph

17285 Commits

Author SHA1 Message Date
Stephan
9d2fb0dd03 Fix after merges 2016-11-14 19:01:44 +01:00
Stephan
a5695b71eb Merge pull request #1553 from umbraco/temp-U4-9105
U4-9105 SPIKE: Ensure our Lambda expression tree parsers at our service layer are not performance bottlenecks
2016-11-14 18:58:16 +01:00
Stephan
2b9ffdb6b9 Merge branch origin/dev-v7 into dev-v7-deploy 2016-11-14 18:53:53 +01:00
Stephan
539e7c80bf Merge branch origin/dev-v7 into temp-U4-9105 2016-11-14 18:45:56 +01:00
Stephan
cfc1704c64 Fix build after merge 2016-11-14 18:33:16 +01:00
Stephan
bbe1cb1813 Merge branch origin/dev-v7 into temp-u4-6994 2016-11-14 18:31:36 +01:00
Stephan
feb120cbeb Merge branch 'dev-v7' into temp-u4-6994 2016-11-14 18:20:06 +01:00
Stephan
2bc07ad4cc Merge branch 'dev-v7' into temp-U4-9105 2016-11-14 18:13:45 +01:00
Sebastiaan Janssen
1c036b1a11 Merge pull request #1562 from umbraco/temp-u4-9136
Temp u4 9136
2016-11-14 18:04:37 +01:00
Stephan
f5fe07ffb7 U4-6994 - more N+1 and refactoring 2016-11-14 17:52:40 +01:00
Shannon
213f02cbc6 Revert "U4-7833 Changing doc type results in invalid cache, lucene indexes, etc..."
This reverts commit 3deda7efab.
2016-11-14 17:39:46 +01:00
Shannon
2de465e8f3 Ensures that indexes are rebuild for items that have had their content type's or property type's aliases changed, also ensures that the content refresher kicks in if a property type alias has changed (this wasn't previously being done) 2016-11-14 17:39:28 +01:00
Sebastiaan Janssen
5b714572e3 Bump version 2016-11-14 17:04:55 +01:00
Sebastiaan Janssen
8e95acb4c5 Merge pull request #1561 from umbraco/temp-U4-9132
U4-9132 Macros from packages are empty when restored
2016-11-14 17:02:07 +01:00
Sebastiaan Janssen
0439e5782e Merge pull request #1542 from umbraco/temp-u4-9115
U4-9115 - move locks to umbracoLocks table
2016-11-14 16:18:48 +01:00
Sebastiaan Janssen
740abb1426 We don't support C# 6 yet 2016-11-14 16:18:20 +01:00
Stephan
df12f19c53 U4-9115 - fix issue 2016-11-14 16:08:21 +01:00
Sebastiaan Janssen
9c40218f48 Merge pull request #1551 from umbraco/temp-U4-9104
U4-9104 Update the UmbracoExamine logic for Media to read the data di…
2016-11-14 15:41:31 +01:00
Sebastiaan Janssen
714b7019c5 Fix unit tests to have the correct types as well 2016-11-14 15:38:50 +01:00
Sebastiaan Janssen
935d010dd2 The foreach is actually more readable 2016-11-14 15:26:25 +01:00
Sebastiaan Janssen
199c502396 Get the correct types 2016-11-14 15:24:41 +01:00
Ali Sheikh Taheri
19b24b5109 Added maximum number of backups to keep. 2016-11-14 11:56:21 +00:00
Ali Sheikh Taheri
3aaa33ebe9 added .log file extension for backup logs. 2016-11-14 11:55:09 +00:00
Ali Sheikh Taheri
4ae7a32e29 Fix for maximum file size. 2016-11-14 11:54:42 +00:00
Claus
f2c406f168 Merge pull request #1572 from umbraco/temp-U4-4196-gkonings-html5-dropzone
U4-4196 U7 - Umbraco HTML5 Drop Zone should honor media types
2016-11-14 09:59:22 +01:00
Claus
2115367353 updating the migration to include only needed ids.
formatting stuff in js.
2016-11-14 09:57:17 +01:00
Claus
9e24b694b3 adding migration to retain functionality as it has always been in root when upgrading. 2016-11-10 13:09:22 +01:00
Claus
4f5bc9eb89 updating MediaController with AutoSelect option. 2016-11-10 12:36:52 +01:00
Mads Rasmussen
f9d8754d88 add support for one custom media type 2016-11-10 12:00:07 +01:00
Mads Rasmussen
07c2a14321 If there is only 1 allowed media type set the alias to auto to let the server decide 2016-11-10 11:13:00 +01:00
Mads Rasmussen
e77bddd0f2 add filtering of media types 2016-11-10 11:08:28 +01:00
Stephan
42522f5af3 U4-6994 - remove N+1 in ContentRepository.GetByPublishedVersion, .GetAllVersions 2016-11-09 17:21:14 +01:00
Stephan
5c3d605d34 U4-9077 - in addition, deal with N+1 for relations 2016-11-09 15:33:28 +01:00
Claus
3deda7efab U4-7833 Changing doc type results in invalid cache, lucene indexes, etc...
For now: add messages in the UI to tell people they need to publish the items again and rebuilt their indexes.
2016-11-09 13:09:31 +01:00
Stephan
b441c73604 U4-9077 - relation type cache refresher + policy 2016-11-09 13:05:23 +01:00
Claus
df59596775 Merge branch 'crgrieve-U4-4410' into dev-v7 2016-11-09 11:49:20 +01:00
Claus
cdb0c57416 readding the fix crgrieve did for treepicker.controller.js. 2016-11-09 11:48:32 +01:00
Claus
0749c6865d Merge branch 'U4-4410' of git://github.com/crgrieve/Umbraco-CMS into crgrieve-U4-4410 2016-11-09 11:40:25 +01:00
Stephan
a80bb1e219 Merge branch 'U4-9077' of https://github.com/lars-erik/Umbraco-CMS into temp-u4-9077 2016-11-09 11:36:42 +01:00
Claus
ff2805c428 mostly just formatting and cleanup - no changes as such. 2016-11-09 11:13:35 +01:00
Claus
69c45a4b05 Merge pull request #1612 from tnielsenskybruddk/dev-v7
Link to member type from member properties
2016-11-09 10:29:49 +01:00
Claus
737244a65e Merge pull request #1567 from tnielsenskybruddk/dev-v7
Link to mediatype from media properties
2016-11-09 10:15:14 +01:00
Claus
7018969d14 removing unused language keys. 2016-11-09 09:29:43 +01:00
Claus
d1ba7f31f8 Merge pull request #1566 from rpjengaard/dev-v7
Removed old options for linked targets and replaced with checkbox ins…
2016-11-09 09:18:27 +01:00
Thomas Nielsen
cbfd04e950 Link to member type from member properties 2016-11-08 23:37:29 +01:00
Thomas Nielsen
981c0b83d3 Oops wrong pull request 2016-11-08 23:16:10 +01:00
Thomas Nielsen
16ae5cf634 Link to member type from member properties 2016-11-08 23:00:14 +01:00
Claus
4a42bfa9bb U4-9160 Headline in the "Republish entire site" dialog is not translated 2016-11-08 10:53:29 +01:00
Claus
3e32652b24 Merge pull request #1565 from abjerner/patch-13
Headline in the "Republish entire site" dialog is now translated
2016-11-08 10:52:42 +01:00
Claus
957096a70a fixing links to be https. 2016-11-08 10:33:05 +01:00