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 |
|
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 |
|
Mads Rasmussen
|
a91a67ed8d
|
fixes: U4-9685 Disable picking folders in the partial view picker
|
2017-03-29 11:37:30 +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 |
|
Claus
|
f7e8aefeab
|
Merge pull request #1834 from umbraco/temp-u4-9666
U4-9666 - hide deprecated prop editors for macro params
|
2017-03-28 13:38:42 +02:00 |
|
Claus
|
dfa803293f
|
Merge pull request #1826 from umbraco/temp-U4-9671
Fixes: U4-9671 Fix failing client side unit tests for the content picker and template editor
|
2017-03-28 13:23:55 +02:00 |
|
Claus
|
7ade64f855
|
Merge pull request #1802 from umbraco/temp-U4-9637
U4-9637 addDashboardSection package action shouldn't add the dashboar…
|
2017-03-28 13:12:26 +02:00 |
|
Shannon Deminick
|
346e8dcaf0
|
Merge pull request #1820 from umbraco/temp-u4-9615
U4-9615 - implement way to find listviews in path fast
|
2017-03-28 16:05:25 +11:00 |
|
Shannon
|
ddfd07bf4a
|
Fixes count query
|
2017-03-28 16:04:06 +11:00 |
|
Shannon
|
a9fe46da0c
|
makes HasContainerInPath public
|
2017-03-28 15:55:45 +11:00 |
|
Shannon
|
aca1f0d186
|
Adds comments
|
2017-03-28 15:46:33 +11:00 |
|
Shannon
|
9eb415d398
|
U4-9682 Repository's have a double nested DeepCloneRuntimeCacheProvider set which means all entities are double deep cloned in and out of the cache and ensures that PreValueCollections are not also manually deep cloned.
|
2017-03-28 15:41:55 +11:00 |
|
Shannon
|
8f6b728534
|
Moves paging value to a constant
|
2017-03-28 13:37:10 +11:00 |
|
Shannon Deminick
|
2e0c09ab39
|
Merge pull request #1827 from umbraco/temp-u4-9598
U4-9598 - fix paging in UmbracoContentIndexer
|
2017-03-28 13:31:37 +11:00 |
|
Shannon Deminick
|
f211344786
|
Merge pull request #1825 from umbraco/temp-u4-9604
U4-9604 - fix current HttpContext in ManyObjectsResolverBase
|
2017-03-28 13:11:09 +11:00 |
|
Mads Rasmussen
|
f8764cdd20
|
fixes: U4-9680 The font change has made the tiny editor boxes a little to small.
|
2017-03-27 13:05:46 +02:00 |
|
Stephan
|
1d17bfd59a
|
U4-9666 - hide deprecated prop editors for macro params
|
2017-03-27 12:25:58 +02:00 |
|
Mads Rasmussen
|
98ad6ad366
|
fixes: U4-9679 Inserting partial views in the new template editor is broken
|
2017-03-27 11:27:58 +02:00 |
|
Stephan
|
68702b98f5
|
U4-9604 - add nullcheck
|
2017-03-27 08:52:10 +02:00 |
|
Stephan
|
f93caf277b
|
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into temp-u4-9604
|
2017-03-27 08:47:40 +02:00 |
|
Shannon Deminick
|
32db674397
|
Merge pull request #1813 from umbraco/temp-U4-9645
Fixes: U4-9645 RTE link dialogs should use the new picker dialog
|
2017-03-27 14:25:07 +11:00 |
|
Shannon Deminick
|
e0a7698780
|
Merge pull request #1821 from andyneil/dev-v7-lang-fixes
Dev v7 lang fixes
|
2017-03-27 14:20:41 +11:00 |
|
Shannon Deminick
|
783c74d3ba
|
Merge pull request #1829 from abryukhov/patch-6
Adding missing keys before v7.6
|
2017-03-27 14:12:08 +11:00 |
|