Shannon
|
f65002ea16
|
Ensures we only write the cache file if we are scanning
|
2017-04-03 21:15:50 +10:00 |
|
Shannon
|
bd1bfa416c
|
Ensures both IServiceConnector and BaseMapper are IDiscoverable because we scan for them
|
2017-04-03 21:15:34 +10:00 |
|
Shannon
|
317f96a1bd
|
removes very old logic for rescanning IAction, this is totally unecessary
|
2017-04-03 21:15:14 +10:00 |
|
Shannon
|
a42d6b954f
|
ensure that we have cache = true for ITree and IApplication because otherwise we'll be scanning but they are implicitly cached because they are IDiscoverable
|
2017-04-03 21:14:45 +10:00 |
|
Stephan
|
71b8674664
|
U4-9576 - deal with broken cache file
|
2017-04-03 09:25:27 +02:00 |
|
Shannon
|
9e3ca51286
|
fixes build error... though that check will need to be put back in
|
2017-04-03 17:17:31 +10:00 |
|
Shannon
|
0e6f2b542e
|
Merge branch 'dev-v7.6' into temp-faster-startup-less-scanning
# Conflicts:
# src/Umbraco.Core/PluginManager.cs
|
2017-04-03 16:57:57 +10:00 |
|
Claus
|
038163421b
|
Merge pull request #1849 from umbraco/temp-u4-9702
U4-9702 - event error when deleting content type container
|
2017-03-30 15:28:09 +02:00 |
|
Mads Rasmussen
|
7ce58f6e5f
|
installer image is a jpg
|
2017-03-30 12:07:43 +02:00 |
|
Sebastiaan Janssen
|
c6470decb2
|
Merge branch 'temp-U4-9687' into dev-v7.6
|
2017-03-30 11:46:37 +02:00 |
|
Sebastiaan Janssen
|
8a28639331
|
Revert commit of test variable
|
2017-03-30 11:43:48 +02:00 |
|
Sebastiaan Janssen
|
65b2b7cb82
|
Merge pull request #1848 from umbraco/temp-U4-9687
Fixes: U4-9687 Update login screen UI
|
2017-03-30 11:21:42 +02:00 |
|
Sebastiaan Janssen
|
2daf71aee4
|
Move LoginBackgroundImage to the content section instead of the security section
|
2017-03-30 11:15:12 +02:00 |
|
Sebastiaan Janssen
|
339edb2295
|
Merge branch 'dev-v7.6' into temp-U4-9687
|
2017-03-30 10:49:03 +02:00 |
|
Stephan
|
e117b764fb
|
U4-9702 - event error when deleting content type container
|
2017-03-30 10:35:41 +02:00 |
|
Emil Wangaa
|
d51082f651
|
Bumps version
|
2017-03-30 10:27:54 +02:00 |
|
Stephan
|
f2fb275b34
|
Fix post-merge issues
|
2017-03-30 09:58:27 +02:00 |
|
Shannon
|
c5f388f6bc
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6
# Conflicts:
# build/NuSpecs/UmbracoCms.Core.nuspec
# src/Umbraco.Tests/packages.config
# src/Umbraco.Web/Umbraco.Web.csproj
# src/Umbraco.Web/packages.config
# src/UmbracoExamine/UmbracoExamine.csproj
# src/umbraco.MacroEngines/packages.config
# src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
|
2017-03-30 17:03:51 +11:00 |
|
Shannon
|
4419af427b
|
Merge branch 'dev-v7.6' of https://github.com/umbraco/Umbraco-CMS into dev-v7.6
|
2017-03-30 17:02:04 +11:00 |
|
Shannon
|
dbdee5fc2c
|
U4-9655 Html Agility pack assembly binding needs to be updated via code, just in case
|
2017-03-30 17:01:30 +11:00 |
|
Shannon
|
25f5179b29
|
updates nuspec
|
2017-03-30 16:36:54 +11:00 |
|
Shannon
|
1a03bd9624
|
Logs an error if the index is rebuilding due to being corrupt
|
2017-03-30 15:49:45 +11:00 |
|
Shannon
|
6a1d60c5a7
|
U4-9692 Update to Examine 0.1.82
|
2017-03-30 15:43:06 +11:00 |
|
Shannon
|
4fef17190f
|
adds notes
|
2017-03-30 11:03:07 +11:00 |
|
Warren Buckley
|
143b9c605b
|
Merge pull request #1841 from umbraco/temp-CON-1296
Adds support for loading uninitialized trees in the treepicker
|
2017-03-29 13:31:44 +01:00 |
|
Niels Hartvig
|
d76a0271e9
|
Adds missing config element
|
2017-03-29 14:05:09 +02:00 |
|
Niels Hartvig
|
5deb483b94
|
U4-9694 Add support for specifying custom login background photo
|
2017-03-29 14:04:45 +02:00 |
|
Emil Wangaa
|
db809f30fe
|
Reverted hideHeader value to true in treepicker.controller.js - should not have been changed
|
2017-03-29 14:00:36 +02:00 |
|
Claus
|
dcb50d10c4
|
Merge pull request #1842 from umbraco/temp-U4-9685
fixes: U4-9685 Disable picking folders in the partial view picker
|
2017-03-29 13:28:33 +02:00 |
|
Niels Hartvig
|
a409b8b0f7
|
Adds server side support for configuring a background photo for login screen
|
2017-03-29 12:49:06 +02:00 |
|
Mads Rasmussen
|
a91a67ed8d
|
fixes: U4-9685 Disable picking folders in the partial view picker
|
2017-03-29 11:37:30 +02:00 |
|
Mads Rasmussen
|
af1257d4ae
|
update UI on login screen
|
2017-03-29 10:22:52 +02:00 |
|
Shannon
|
1f3e568a0d
|
fixes merge issues
|
2017-03-29 19:11:55 +11:00 |
|
Shannon
|
cb539e82d0
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6
# Conflicts:
# build/UmbracoVersion.txt
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
# src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs
# src/UmbracoExamine/UmbracoMemberIndexer.cs
|
2017-03-29 18:11:51 +11:00 |
|
Shannon Deminick
|
1432d602ba
|
Merge pull request #1838 from umbraco/temp-u4-9665
u4-9665
|
2017-03-29 18:06:28 +11:00 |
|
Shannon
|
841d2a7010
|
ensure change tracking is turned off on the dialog so the warning doesn't pop up
|
2017-03-29 17:51:31 +11:00 |
|
Shannon
|
7cdb48b6c9
|
bumps version
|
2017-03-29 16:35:37 +11:00 |
|
Shannon Deminick
|
a667058422
|
Merge pull request #1828 from umbraco/temp-u4-9655
U4-9655 - update HtmlAgilityPack version in config
|
2017-03-29 16:33:37 +11:00 |
|
Shannon Deminick
|
4ffa6bb41b
|
Merge pull request #1824 from umbraco/temp-u4-9617
U4-9617 - perf for published date
|
2017-03-29 16:29:31 +11:00 |
|
Shannon
|
77af16db55
|
Merge branch 'dev-v7' into temp-u4-9617
# Conflicts:
# src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
|
2017-03-29 16:29:18 +11:00 |
|
Emil Wangaa
|
2a44b73056
|
Adds support for loading uninitialized trees in the treepicker - is needed for CON-1296 to work
|
2017-03-28 21:19:12 +02:00 |
|
Stephan
|
85d85fa587
|
Merge pull request #1819 from umbraco/temp-u4-9623
U4-9323 - fix DataTypeDefinitionRepository prevalues cache
|
2017-03-28 17:37:04 +02:00 |
|
Stephan
|
bd27ed739d
|
Merge pull request #1810 from umbraco/temp-U4-9633
Fixes: U4-9633 Update the offline dashboard to new content and styles
|
2017-03-28 17:28:47 +02:00 |
|
Stephan
|
3938868115
|
U4-9665 - create partial view macro with file
|
2017-03-28 17:22:18 +02:00 |
|
Claus
|
140792430f
|
Merge pull request #1823 from umbraco/temp-U4-9647
fixes: U4-9647 7.6.0-beta: New template editor not set $dirty on code…
|
2017-03-28 15:15:43 +02:00 |
|
Claus
|
c04cf1fe2e
|
Merge pull request #1822 from umbraco/temp-U4-9654
fixes: U4-9654 7.6.0-beta: Legacy icons are not resolved in new listv…
|
2017-03-28 14:32:48 +02:00 |
|
Claus
|
d1d83c84a0
|
fixes icons on listviews.
|
2017-03-28 14:27:05 +02:00 |
|
Claus
|
98acc50e13
|
Merge pull request #1830 from abryukhov/patch-7
Adding new UI keys for v7.6 features
|
2017-03-28 13:56:46 +02:00 |
|
Claus
|
1a0a02463e
|
Merge pull request #1835 from umbraco/temp-U4-9680
fixes: U4-9680 The font change has made the tiny editor boxes a littl…
|
2017-03-28 13:53:23 +02:00 |
|
Claus
|
96c499a47e
|
Merge pull request #1833 from umbraco/temp-U4-9679
fixes: U4-9679 Inserting partial views in the new template editor is …
|
2017-03-28 13:46:24 +02:00 |
|