Stephan
|
b893df035b
|
Files were committed by mistake
|
2017-03-10 08:48:26 +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 |
|
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 |
|
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 |
|
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 |
|
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
|
639d04381e
|
Bump version
|
2017-01-26 14:48:19 +01:00 |
|
Warren Buckley
|
c1fcb37642
|
Adds keys for DA file but appends them with DA to try & make it clear they need some translation love as my Danish is to be desired :)
|
2017-01-23 16:08:38 +00:00 |
|
Warren Buckley
|
0bba68a7f5
|
Added keys needed in EN lang files
|
2017-01-23 16:06:37 +00:00 |
|
Per Ploug
|
eefd13547c
|
More localization of querybuilder
|
2017-01-19 12:53:39 +01:00 |
|
Claus
|
29d86b8675
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6
|
2017-01-19 12:08:23 +01:00 |
|
Sebastiaan Janssen
|
fc3b08e374
|
Merge pull request #1626 from Mark320/U4-9192
U4-9192 Add jQuery migrate for user controls used in tabs
|
2017-01-19 11:35:44 +01:00 |
|
Mads Rasmussen
|
86ffd66c8a
|
update danish translations
|
2017-01-19 09:50:18 +01:00 |
|
Niels Hartvig
|
051af5c48e
|
Wire up the editors and controllers
|
2017-01-19 09:49:27 +01:00 |
|
Sebastiaan Janssen
|
54e460cf5b
|
U4-9392 Upgrade ImageProcessor with cache header and high CPU fix
U4-9393 Upgrade to Examine 0.1.80
|
2017-01-18 11:47:23 +01:00 |
|
Mads Rasmussen
|
01f50a243b
|
translate master template and no macros
|
2017-01-17 14:13:20 +01:00 |
|
Shannon
|
44732e5f52
|
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/DatabaseContext.cs
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
|
2017-01-17 18:21:45 +11:00 |
|
Claus
|
e0d281bb4b
|
Merge pull request #1616 from abryukhov/patch-6
Update UI lang file for ru-ru
|
2017-01-16 11:26:23 +01:00 |
|