Shannon
|
92ce064d30
|
DOH! Revert "Fixes database context issue during startup when there is no db configured" pushed to the wrong branch
|
2017-02-07 12:40:28 +11:00 |
|
Shannon
|
ab3bfa4e92
|
Fixes database context issue during startup when there is no db configured
|
2017-02-07 12:39:35 +11:00 |
|
Warren Buckley
|
c8408760df
|
Merge pull request #1737 from umbraco/temp-U4-9474
Fixes: U4-9474 Update macro picker to follow the new picker UI
|
2017-02-06 16:03:25 +00:00 |
|
Warren Buckley
|
5834649abc
|
Merge pull request #1733 from umbraco/temp-U4-9466
fixes: U4-9466 Duplicate reorder links for Umbraco grid
|
2017-02-06 15:36:04 +00:00 |
|
Mads Rasmussen
|
2eda70542f
|
rename macro container to macro picker
|
2017-02-06 16:16:26 +01:00 |
|
Mads Rasmussen
|
a2a17faca1
|
Fixes: U4-9474 Update macro picker to follow the new picker UI
|
2017-02-06 16:11:51 +01:00 |
|
Shannon
|
6f16b98b32
|
regression issue from refactoring how media works with Deploy
|
2017-02-07 00:57:44 +11:00 |
|
Mads Rasmussen
|
483762a984
|
fixes: U4-9466 Duplicate reorder links for Umbraco grid
|
2017-02-06 12:50:34 +01:00 |
|
Shannon
|
d0ea8e83ad
|
Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6
|
2017-02-06 19:49:00 +11:00 |
|
Shannon
|
c16ce4ce1f
|
Merge branch 'dev-v7.6' of https://github.com/umbraco/Umbraco-CMS into dev-v7.6
|
2017-02-03 10:21:10 +11:00 |
|
Shannon
|
86021c5052
|
Adds remaining core methods to make 2FA providers work if you know how to wire it up
|
2017-02-03 00:47:28 +11:00 |
|
Shannon
|
5060e709d1
|
Fixed merge conflicts, adds required methods to auth controllers.
|
2017-02-02 22:11:34 +11:00 |
|
Claus
|
46c7737c17
|
Merge pull request #1714 from umbraco/temp-u4-9441
Fixes tree syncing issues
|
2017-02-01 14:04:18 +01:00 |
|
Claus
|
06c829eb27
|
initializing stringbuilder with text instead of appending after init.
trimming end instead of both beginning and end, since we know whats in the beginning.
|
2017-02-01 14:03:03 +01:00 |
|
Shannon
|
5b2212829c
|
Small performance change which makes a fairly large impact when rebuilding very large indexes.
|
2017-02-01 13:02:22 +11:00 |
|
Morten Christensen
|
fa56f1a59d
|
Merge branch 'dev-v7' into dev-v7.6
|
2017-01-31 12:27:40 +01:00 |
|
Morten Christensen
|
546209ddb5
|
Merge pull request #1716 from umbraco/temp-U4-9451
U4-9451 Package installation custom user control is not displayed aft…
|
2017-01-31 12:24:52 +01:00 |
|
Morten Christensen
|
1e7c44ead0
|
Merge remote-tracking branch 'origin/temp-U4-9451' into dev-v7.6
|
2017-01-31 11:38:41 +01:00 |
|
Per Ploug
|
90448f1c78
|
Added comments and made helper internal
|
2017-01-31 11:06:14 +01:00 |
|
Warren Buckley
|
6956e01861
|
Merge pull request #1713 from umbraco/temp-U4-9413
U4-9413 moving links to document and media to top of generic properties.
|
2017-01-31 09:37:34 +00:00 |
|
Claus
|
f3b364022a
|
bumping version for deploy.
|
2017-01-31 10:33:57 +01:00 |
|
Claus
|
56ae2b709d
|
adding deploy entity types for forms.
|
2017-01-31 10:31:45 +01:00 |
|
Shannon
|
54bda6f12a
|
U4-9451 Package installation custom user control is not displayed after a package is installed
|
2017-01-31 15:40:02 +11:00 |
|
Mads Rasmussen
|
0acc202740
|
Merge pull request #1712 from umbraco/temp-U4-9410
U4-9410 Hook up delete dialog for Code Files
|
2017-01-30 20:50:36 +01:00 |
|
Per Ploug
|
b05c4711ce
|
Fixes tree syncing issues
|
2017-01-30 13:33:05 +01:00 |
|
Claus
|
74c167ed03
|
U4-9413 moving links to document and media to top of generic properties.
|
2017-01-30 13:18:30 +01:00 |
|
Claus
|
4ad0c1bb89
|
cleaning usings.
|
2017-01-30 13:14:19 +01:00 |
|
Claus
|
67da15330e
|
U4-9410 Hook up delete dialog for Code Files
delete dialogs for partialviews, partialviewmacros and scripts.
+ fixed codefileResource.
+ fixed comments in MemberTypesDeleteController.
|
2017-01-30 11:56:30 +01:00 |
|
Sebastiaan Janssen
|
690af8e494
|
Merge pull request #1711 from umbraco/temp-U4-9444
U4-9444 SessionState is not available when rendering macro contents i…
|
2017-01-30 10:00:40 +01:00 |
|
Shannon
|
a458e7daf0
|
Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6
# Conflicts:
# build/UmbracoVersion.txt
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
# src/Umbraco.Web/Umbraco.Web.csproj
|
2017-01-30 16:55:12 +11:00 |
|
Shannon
|
9d06ce53a4
|
U4-9444 SessionState is not available when rendering macro contents in the Rich Text Editor
|
2017-01-30 13:22:47 +11:00 |
|
Stephan
|
d85cb9e15e
|
Fix FileSystemProviderManagerTests
|
2017-01-28 10:04:43 +01:00 |
|
Mads Rasmussen
|
19a4cf774b
|
Merge pull request #1680 from umbraco/temp-U4-9352
Implements CodeFileController
|
2017-01-27 10:49:07 +01:00 |
|
Mads Rasmussen
|
ab00ba8a12
|
Merge branch 'dev-v7.6' into temp-U4-9352
# Conflicts:
# src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
|
2017-01-27 10:39:31 +01:00 |
|
Claus
|
57e2a19023
|
changing parameter name for IGridCellValueConnector.IsConnector.
|
2017-01-27 10:16:01 +01:00 |
|
Claus
|
daa80a7bf6
|
Merge pull request #1709 from umbraco/temp-U4-9435-2
U4-9435 Fix breaking change made in U4-9312
|
2017-01-27 09:05:47 +01:00 |
|
Shannon
|
8152e7cb92
|
Doh, forgot a file change for tests - fixes build
|
2017-01-27 16:55:29 +11:00 |
|
Shannon Deminick
|
adccb4161e
|
Merge pull request #1707 from umbraco/temp-u4-9438
U4-9438 - fix nasty issue with reading properties in VersionableRepos…
|
2017-01-27 16:52:10 +11:00 |
|
Shannon
|
72a0187295
|
Writes unit test to confirm the correct property data iteration in GetPropertyCollection
|
2017-01-27 16:50:44 +11:00 |
|
Shannon
|
24d6287918
|
Adds string overloads just in case
|
2017-01-27 16:21:01 +11:00 |
|
Shannon
|
55900a3464
|
Updates MediaController and MediaTypeController to have the same method signature supporting both INT and GUID with a custom action selector to handle the ambiguity
|
2017-01-27 16:09:35 +11:00 |
|
Sebastiaan Janssen
|
a5a42854ef
|
Bump version to alpha055
|
2017-01-26 22:02:18 +01:00 |
|
Warren Buckley
|
784c84a166
|
Merge pull request #1474 from umbraco/temp-U4-8963
U4-8963 Updates for ImageProcessor parameters to support background c…
|
2017-01-26 20:45:35 +00:00 |
|
Sebastiaan Janssen
|
f5d78a4d04
|
Merge pull request #1708 from umbraco/temp-U4-9440
Fixes: U4-9440 Update the last few Danish translations for template e…
|
2017-01-26 19:51:54 +01:00 |
|
Mads Rasmussen
|
b334e0ccb2
|
Fixes: U4-9440 Update the last few Danish translations for template editor
|
2017-01-26 19:45:05 +01:00 |
|
Sebastiaan Janssen
|
0a2e5badd0
|
Merge branch 'temp-template-editor' into dev-v7.6
|
2017-01-26 18:27:10 +01:00 |
|
Sebastiaan Janssen
|
90b0bf9d82
|
Merge branch 'dev-v7.6' into temp-template-editor
|
2017-01-26 18:26:32 +01:00 |
|
Sebastiaan Janssen
|
6bcd1e44f9
|
If translation is not done yet, better to leave it English so at least it kind of makes sense
|
2017-01-26 18:24:56 +01:00 |
|
Sebastiaan Janssen
|
36e9bb4d78
|
Merge pull request #1705 from umbraco/temp-v758-recyclebin-fix
Fixes U4-9437
|
2017-01-26 17:31:31 +01:00 |
|
Warren Buckley
|
4c06ead056
|
Merge pull request #1698 from umbraco/temp-U4-9419
fixes: U4-9419 The new content picker adds picked items in a random o…
|
2017-01-26 16:21:03 +00:00 |
|