Commit Graph

17422 Commits

Author SHA1 Message Date
Shannon Deminick
6898d9b270 Merge pull request #1657 from umbraco/temp-u4-9250
U4-9250 - Guid all the Macros
2016-12-23 10:24:12 +11:00
Shannon
0aa8a5c243 more whitespace fixing 2016-12-23 09:41:23 +11:00
Shannon
c5326fc5c9 fixes whitespace in version file 2016-12-23 09:31:54 +11:00
Mads Rasmussen
4c97c689e9 Fixes: U4-9199 Grid RTE (rich text editor/ tinyMCE) does not have a max height, causing the user to have to scroll up to see RTE menu buttons 2016-12-22 14:06:23 +01:00
Stephan
9431e878f3 Version 7.6.0-alpha035 2016-12-22 11:34:33 +01:00
Stephan
3ac71a37e8 U4-9250 - add more tests 2016-12-22 11:24:01 +01:00
Stephan
0ac5e0daf4 U4-9250 - rename GetAllAll method - yea that was bad 2016-12-22 11:14:09 +01:00
Stephan
f3a7ada586 U4-9250 - add keys to ctors 2016-12-22 11:10:45 +01:00
Shannon
bd4f3ad0d9 bumps umb version so the build works. 2016-12-22 18:44:47 +11:00
Shannon
8083edddb9 Adds check to DetermineInstalledVersion to detect if it's 7.6 based on the new DB changes 2016-12-22 16:36:25 +11:00
Shannon
886942c4e8 Updated MacroServiceTests to include testing for the Key 2016-12-22 15:24:54 +11:00
Stephan
7576c8138e U4-9250 - fix tests 2016-12-21 16:47:32 +01:00
Stephan
b3a6c70ae7 U4-9250 - revert some changes 2016-12-21 15:34:17 +01:00
Stephan
ef28173511 U4-9250 - fixes 2016-12-21 15:23:23 +01:00
Stephan
b25cb9995f U4-9250 - Guid the IMacroService 2016-12-21 15:23:22 +01:00
Stephan
38e8e1cf9c U4-9250 - fix migration 2016-12-21 15:23:22 +01:00
Stephan
f25641b2a7 U4-9250 - Guid all the Macros 2016-12-21 15:23:22 +01:00
Sebastiaan Janssen
c88ee55e8d Merge pull request #1656 from umbraco/temp-u4-9240
U4-9240 - kill umbracoDeployChecksum
2016-12-21 09:14:10 +01:00
Sebastiaan Janssen
f2f4c23c80 Merge pull request #1652 from umbraco/U4-9301
Updates login controller to not accept non local urls
2016-12-20 13:55:31 +01:00
Stephan
01340e0316 U4-9240 - kill umbracoDeployChecksum 2016-12-20 11:26:34 +01:00
Claus
67ea15706e Merge pull request #1651 from umbraco/temp-U4-9282
U4-9282 Rollback not working
2016-12-20 11:24:05 +01:00
Claus
5cc75b8cc3 Merge pull request #1654 from umbraco/temp-U4-9302
U4-9302 Add logging of non security related connection string details…
2016-12-20 11:01:50 +01:00
Claus
653ac66ff3 Merge pull request #1653 from umbraco/temp-U4-9262
U4-9262 CleanForXss breaks rgba() values set as grid background color…
2016-12-20 10:32:36 +01:00
Shannon
3f7e593bc2 U4-9302 Add logging of non security related connection string details when the connection fails 2016-12-20 14:10:06 +11:00
Shannon
39505cd868 U4-9262 CleanForXss breaks rgba() values set as grid background color style 2016-12-20 13:27:53 +11:00
Shannon
0daaa3e785 Revert "Merge pull request #1618 from AliSheikhTaheri/U4-9180"
This reverts commit 4050a375bc, reversing
changes made to a058f26462.
2016-12-20 12:28:45 +11:00
Shannon Deminick
4050a375bc Merge pull request #1618 from AliSheikhTaheri/U4-9180
U4-9180 Optimise Log4net
2016-12-20 11:08:11 +11:00
Niels Hartvig
da27108d0d Updates login controller to not accept non local urls 2016-12-19 10:44:22 +01:00
hartvig
a058f26462 Update README.md 2016-12-19 09:20:21 +01:00
Shannon
c8f0f05570 U4-9246 Should ship with numRecompilesBeforeAppRestart="50" to avoid max recompilations reached errors 2016-12-19 17:10:29 +11:00
Shannon
347ed2896a U4-9282 Rollback not working 2016-12-19 16:58:24 +11:00
Shannon
5c40a1f9e9 bumps version 2016-12-19 16:42:05 +11:00
Brian Powell
afa39866ad Fix U4-9298 2016-12-17 21:12:45 -05:00
Shannon
7254db40eb publicizes ExamineExtensions.ConvertSearchResultToPublishedContent 2016-12-15 17:44:32 +11:00
Shannon
04481c33e7 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-12-15 10:45:57 +11:00
Shannon
4c107470c3 updates some angular docs 2016-12-15 10:43:53 +11:00
Stephan
4863052a08 Revert "deploy-11 - implement DeployVersionAttribute"
This reverts commit f51a086137.
2016-12-13 10:58:19 +01:00
Stephan
cb09681cb0 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 2016-12-13 10:36:33 +01:00
Stephan
b9b7c9f965 More database fixing (sqlCE) 2016-12-13 10:35:37 +01:00
Warren Buckley
4b39f490f3 Merge pull request #1602 from cheeseytoastie/U4-9148_-_Splash_screen_apostophe_typo
U4-9148 noNodes Splash screen apostrophe char typo fixed (in "Be a pa…
2016-12-09 13:32:53 +00:00
Sebastiaan Janssen
c607ceda48 Merge pull request #1557 from tompipe/U4-9127-SortMemberProperties
Fixed issue with member properties sort order
2016-12-09 08:59:52 +01:00
Claus
d4acd4629a Merge pull request #1646 from umbraco/temp-U4-9259
Lazily creates the static queries instead of eagerly, this fixes an i…
2016-12-08 10:09:32 +01:00
Shannon
b413b7b5af Lazily creates the static queries instead of eagerly, this fixes an issue of if these services are accessed before Umbraco has booted 2016-12-08 12:48:44 +11:00
Stephan
0415e910dc Merge pull request #1645 from umbraco/temp-U4-9255
U4-9255 Not having access to settings section causes backoffice user …
2016-12-07 13:06:24 +01:00
Claus
960040e51e U4-9255 Not having access to settings section causes backoffice user to be logged out when browsing media list views 2016-12-07 12:57:29 +01:00
Emil Wangaa
5936f72263 Merge pull request #1643 from umbraco/temp-u4-9249
U4-9249 - fix member type standard properties
2016-12-07 12:25:01 +01:00
Stephan
ba27c7e8e8 U4-9249 - fix member type standard properties 2016-12-06 15:46:17 +01:00
Stephan
b4ef37a61a More database fixing 2016-12-05 16:39:20 +01:00
Stephan
6c4185dc01 Version 7.6.0-alpha032 2016-12-05 12:13:11 +01:00
Stephan
f51a086137 deploy-11 - implement DeployVersionAttribute 2016-12-05 11:58:17 +01:00