Shannon
|
ed0f0f7942
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6
# Conflicts:
# src/Umbraco.Core/Configuration/CoreDebug.cs
# src/Umbraco.Core/Publishing/PublishingStrategy.cs
# src/Umbraco.Core/Umbraco.Core.csproj
|
2017-03-23 12:24:16 +11:00 |
|
Shannon
|
6c1e271fa8
|
Fixes styling and fixing error message quotes to make it more clear
|
2017-03-23 11:27:46 +11:00 |
|
Shannon
|
0fd3af6828
|
Fixes release version of tinymceconfig
|
2017-03-22 18:32:28 +11:00 |
|
Shannon
|
8e03a1ffca
|
Updates tha a and img tags in the rte to use a data-udi attribute when udi's are used
|
2017-03-22 18:17:59 +11:00 |
|
Sebastiaan Janssen
|
241ccf00a5
|
U4-6566 Membership provider useLegacyEncoding should default to false
|
2017-03-14 17:05:24 +01:00 |
|
Sebastiaan Janssen
|
3bddceb17b
|
Put the rewrite section in system.webServer where it belongs
|
2017-03-14 11:00:41 +01:00 |
|
Shannon
|
4a829154db
|
Adds documentation link to IIS Rewrite rules
|
2017-03-14 17:10:39 +11:00 |
|
Shannon
|
f8073f429f
|
adds debug transforms to ensure that any urlrewriting stuff is removed when the sln is built
|
2017-03-14 16:36:15 +11:00 |
|
Shannon Deminick
|
04d37c590b
|
Merge pull request #1786 from umbraco/temp-U4-9004
U4-9004 Remove URLRewriting.net dependency
|
2017-03-14 16:25:41 +11:00 |
|
Shannon
|
2087332b69
|
removes committed Deploy dashboard config
|
2017-03-13 12:58:44 +11:00 |
|
Shannon
|
df04100ff6
|
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.Core/Persistence/Querying/ExpressionVisitorBase.cs
# src/Umbraco.Core/Persistence/Querying/SqlExpressionExtensions.cs
# src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
# src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
# src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
# src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
# src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Core/Services/MediaService.cs
# src/Umbraco.Core/Umbraco.Core.csproj
# src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
# src/Umbraco.Tests/Umbraco.Tests.csproj
# src/Umbraco.Web.UI.Client/src/less/tree.less
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
# src/Umbraco.Web/Editors/EntityController.cs
# src/Umbraco.Web/Editors/MediaController.cs
|
2017-03-10 10:40:28 +01:00 |
|
Stephan
|
b893df035b
|
Files were committed by mistake
|
2017-03-10 08:48:26 +01:00 |
|
Sebastiaan Janssen
|
13aa615745
|
U4-9004 Remove URLRewriting.net dependency
|
2017-03-09 11:41:36 +01:00 |
|
Stephan
|
d1111009e3
|
Fix SemVer lib version
|
2017-03-08 18:45:00 +01:00 |
|
Shannon Deminick
|
1722831bf5
|
Merge pull request #1640 from umbraco/temp-u4-7318
Value Converters for All Core Property Editors
|
2017-03-08 14:29:40 +01:00 |
|
Shannon
|
5291558b23
|
Further refactoring, using attributes, moving and removing some classes, using DI where necessary.
|
2017-03-08 14:27:39 +01:00 |
|
Claus
|
7fa8f04b11
|
deploy-257 Downgrade Core and Deploy to framework 4.5
|
2017-03-08 11:20:48 +01:00 |
|
nengberg
|
8a133938e6
|
Adds missing swedish translation for document type without template
|
2017-03-08 09:57:32 +01:00 |
|
Michael Razmgah
|
b080825bb2
|
Updating sv.xml with correct translation
|
2017-03-06 21:31:42 +01:00 |
|
Shannon
|
a9c5877e5b
|
Merge branch 'refs/heads/dev-v7.6' into temp-u4-7318
# Conflicts:
# src/Umbraco.Web.UI/config/umbracoSettings.config
# src/Umbraco.Web/Umbraco.Web.csproj
|
2017-03-01 15:04:00 +01:00 |
|
Warren Buckley
|
29b297e072
|
Add in UI translation items
|
2017-02-22 10:59:12 +00:00 |
|
Warren Buckley
|
8f73514c1d
|
An initial start of localising the keyboard shortcut dialog for template editor (Only adding keys into en.xml for now)
|
2017-02-22 10:56:18 +00:00 |
|
Sebastiaan Janssen
|
76b696e3bf
|
U4-9559 Security: files of type xhtml should not be allowed to be uploaded to the media section
|
2017-02-22 11:12:24 +01:00 |
|
Sebastiaan Janssen
|
0b9a3ef68a
|
Bump version
|
2017-02-22 10:26:37 +01:00 |
|
Sebastiaan Janssen
|
52dce66598
|
Bump version
|
2017-02-21 08:49:34 +01:00 |
|
Shannon
|
422dd1a627
|
Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6
|
2017-02-16 13:22:59 +11:00 |
|
Sebastiaan Janssen
|
759e444624
|
Merge pull request #1467 from ArnoldV/dev-v7
U4-8990 Updated Dutch Language File
|
2017-02-15 22:39:44 +01:00 |
|
Warren Buckley
|
e619c402b4
|
Merge branch 'temp-U4-9310' into dev-v7.6
# Conflicts:
# src/Umbraco.Core/UdiEntityType.cs
|
2017-02-14 11:53:38 +00:00 |
|
Claus
|
b519d68e1a
|
fixing PartialViewMacrosTree and ScriptTree in trees.Release.config.
|
2017-02-13 13:34:35 +01:00 |
|
Claus
|
deb8d652c5
|
fixing PartialViewsTreeController reference in trees.Release.config.
|
2017-02-13 12:44:16 +01:00 |
|
Sebastiaan Janssen
|
7c64f1aa0d
|
Merge pull request #1745 from umbraco/temp-U4-7385
Fixes: U4-7385 Improve UI for listview - Make it clearer that users can search children
|
2017-02-10 16:43:35 +01:00 |
|
Shannon
|
e612bcae58
|
Merge branch 'refs/heads/dev-v7.6' into temp-U4-9310
|
2017-02-10 10:04:58 +11:00 |
|
Arnold Visser
|
7da7c1e5a1
|
Addes all new/missing fields since last edit
Checked against the English version
|
2017-02-09 13:47:31 +01:00 |
|
Shannon
|
ce0821e2d6
|
Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6
# Conflicts:
# build/NuSpecs/UmbracoCms.Core.nuspec
# src/Umbraco.Tests/Umbraco.Tests.csproj
|
2017-02-09 13:20:33 +11:00 |
|
Claus
|
24063c403a
|
Merge remote-tracking branch 'origin/dev-v7.6' into temp-U4-1324
Conflicts:
src/Umbraco.Core/packages.config
src/Umbraco.Tests/packages.config
|
2017-02-08 09:14:27 +01:00 |
|
Shannon
|
f4f1f6774d
|
U4-9499 Update to latest Json.Net
|
2017-02-08 17:47:32 +11:00 |
|
Warren Buckley
|
92acc3d331
|
Merge pull request #1736 from umbraco/temp-U4-9429
U4-9429 Make new create dialogs for code files (or rethink snippets)
|
2017-02-07 21:28:43 +00:00 |
|
Warren Buckley
|
ba6705a706
|
Merge branch 'dev-v7.6' into temp-U4-9314
|
2017-02-07 17:27:07 +00:00 |
|
Mads Rasmussen
|
c9f99d7f42
|
localise create items
|
2017-02-07 16:35:33 +01:00 |
|
Mads Rasmussen
|
2669c68df0
|
fixes: U4-9468 Mini list view: add empty state for no children + no search result
|
2017-02-07 11:55:45 +01:00 |
|
Sebastiaan Janssen
|
389b29599b
|
U4-9495 ImageProcessor high CPU usage when trimCache=true
|
2017-02-07 10:29:11 +01:00 |
|
Shannon
|
0e727f91da
|
Merge branch 'refs/heads/dev-v7.6' into temp-U4-9310
# Conflicts:
# src/UmbracoExamine/UmbracoMemberIndexer.cs
|
2017-02-07 13:21:02 +11:00 |
|
Shannon
|
a71ec8dd81
|
Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6
|
2017-02-07 12:50:44 +11:00 |
|
Mikkel Holck Madsen
|
72aebd3ecf
|
Merge branch 'dev-v7' into temp-U4-9458
|
2017-02-06 21:44:26 +01:00 |
|
Shannon
|
72910cb35e
|
Updates everything to .Net 4.6.2, had to update the semver reference too - no breaking changes though
|
2017-02-07 00:22:34 +11:00 |
|
Sebastiaan Janssen
|
5a8e37f5b4
|
U4-9492 Update to latest ImageProcessor
|
2017-02-06 13:46:10 +01:00 |
|
Shannon
|
40ed77103f
|
Updates to latest 1.x version of log4net (before the real 2.x version) with binding redirects and codebase binding redirects to redirect from non-signed to signed version
|
2017-02-06 23:07:20 +11:00 |
|
Shannon
|
d598fdce54
|
Updates to latest Examine release
|
2017-02-03 12:03:56 +11:00 |
|
Shannon
|
547351a719
|
Merge remote-tracking branch 'refs/remotes/origin/dev-v7.6' into temp-U4-9310
|
2017-01-28 00:25:25 +11:00 |
|
Shannon
|
371c4ae1a3
|
Starts creating new UDI picker property editors
|
2017-01-28 00:22:12 +11:00 |
|