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

17008 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephan
feb120cbeb Merge branch 'dev-v7' into temp-u4-6994 2016-11-14 18:20:06 +01:00
Stephan
f5fe07ffb7 U4-6994 - more N+1 and refactoring 2016-11-14 17:52:40 +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
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
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
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
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
Claus
a0c672eb91 Merge pull request #1568 from rasmusfjord/dev-v7 
Translated dialogs to DK/EN
 2016-11-08 08:44:01 +01:00
Claus
eddd996ed6 Merge pull request #1601 from piotrwegner/dev-v7-pl-translation 
added PL translation
 2016-11-08 08:38:34 +01:00
crgrieve
c0a2326a8d Removing whitespace when parsing MNTP comma separated list. 2016-11-07 21:03:57 +00:00
crgrieve
e429f8611e Remove all whitespace when parsing MNTP allowed doctypes. 2016-11-07 20:53:59 +00:00
Claus
fcca95787b fixing backwards compatibility. 2016-11-07 13:05:17 +01:00
Ivar
8944870d4f Renamed icon-globe---europe-africa to icon-globe-europe-africa 2016-11-07 13:05:15 +01:00
Claus
b93c3d9caa Merge pull request #1564 from abryukhov/patch-6 
Update ru.xml UI language file
 2016-11-07 11:56:44 +01:00
Claus
4d2aba2577 Merge pull request #1599 from AndyFelton/U4-9147 
Modified grammar on health check dashboard
 2016-11-07 11:26:02 +01:00
Claus
ce780ee4f4 Merge pull request #1595 from AndyFelton/U4-9146 
Health check data integrity colons missing
 2016-11-07 11:24:25 +01:00
Claus
a6134bfacd Merge pull request #1569 from AronGreen/dev-v7 
Danish translations related to Redirect URL Management
 2016-11-07 11:20:43 +01:00
Claus
a96f48d0a8 changing media controller logic. 2016-11-04 13:52:36 +01:00
Piotr Wegner
4d2bf19891 added PL translation 2016-11-03 17:09:01 +00:00
Sebastiaan Janssen
0eeb481d85 Merge pull request #1586 from LottePitcher/U4-9068 
Truncate should not finish halfway through a two word unicode character
 2016-11-03 17:53:49 +01:00
Andy Felton
66bce71a8b "it's" replaced with "its" on "Checks to see if your site is revealing information in it's headers that gives away unnecessary details about the technology used to build and host it." 2016-11-03 16:51:33 +00:00
Andy Felton
b198ecbc02 Modifed grammer as follows 
MacroErrors are set to 'throw' which will prevent some or all pages in your site from loading completely when there's any errors in macros. Rectifying this will set the value to 'inline'. modifed to  "when there's any errors in macros" should be replaced with "if there are any errors in macros"
 2016-11-03 16:51:06 +00:00
Sebastiaan Janssen
ecbe058d00 Merge pull request #1591 from RachBreeze/U4-7239 
U4-7239 Now trims the parameters
 2016-11-03 17:16:22 +01:00
Andy Felton
22f37d02dc Added missing colon 2016-11-03 16:00:04 +00:00
Lotte Pitcher
c8b23195f6 When truncating if the last characters was the first half of a two word unicode character, also include the second half to avoid YSOD 2016-11-03 14:30:38 +00:00
Sebastiaan Janssen
02840965d7 Merge pull request #1577 from Draga/U4-9055 
U4-9055
 2016-11-03 15:25:03 +01:00
Sebastiaan Janssen
5b13ab255a Merge pull request #1575 from readingdancer/U4-9091 
U4-9091 - Fixed the font being used in the Media Picker for files
 2016-11-03 15:09:22 +01:00