Bjarke Berg
|
4d5d94d3ed
|
7173 - Refactored to inject IUmbracoVersion instead of using Current.
|
2019-11-20 10:50:15 +01:00 |
|
Bjarke Berg
|
a49b313080
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
|
2019-11-19 11:05:32 +01:00 |
|
Shannon
|
31f51516d2
|
removes old config transforms for v7 -> v8 no longer needed
|
2019-11-19 11:53:05 +11:00 |
|
mikkelhm
|
6faa5d79d3
|
Close unclosed key element in italian language file
|
2019-11-18 22:17:39 +01:00 |
|
Shannon
|
4338a8f32d
|
Merge branch 'netcore/dev' into netcore/feature/AB3594_move_exsiting_configuration_to_own_project
|
2019-11-18 20:23:31 +11:00 |
|
Shannon
|
cd3a97ce75
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Abstractions/Constants-Conventions.cs
|
2019-11-18 19:58:42 +11:00 |
|
Bjarke Berg
|
47a0326e9c
|
Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB3594_move_exsiting_configuration_to_own_project
|
2019-11-15 11:43:05 +01:00 |
|
Bjarke Berg
|
a97e131891
|
Bump version o 8.6 (8.5 reserved for MB release)
|
2019-11-14 14:00:49 +01:00 |
|
Bjarke Berg
|
c0dc545c27
|
Fix for csproj
|
2019-11-14 13:54:04 +01:00 |
|
Bjarke Berg
|
7c72fb57f2
|
Merge remote-tracking branch 'origin/v8/8.3' into v8/dev
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
# src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
# src/Umbraco.Web/Cache/LanguageCacheRefresher.cs
|
2019-11-14 13:40:32 +01:00 |
|
Bjarke Berg
|
ba73ad5792
|
Merge remote-tracking branch 'skttl/grid-editor-name-templates' into v8/dev
# Conflicts:
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
# src/Umbraco.Web.UI/config/grid.editors.config.js
|
2019-11-14 13:08:05 +01:00 |
|
Shannon
|
89f5cec832
|
Fixes System.ComponentModel.Annotations to keep working with aspnet framework
|
2019-11-14 17:00:21 +11:00 |
|
Shannon Deminick
|
d0f534e2f4
|
Merge pull request #7120 from umbraco/netcore/feature/AB3649-move-manifest-stuff
Netcore: Move manifest code
|
2019-11-14 12:10:25 +11:00 |
|
Bjarke Berg
|
2e200779f9
|
Merge branch 'netcore/feature/abstract-systemdirectories' into netcore/feature/AB3594_move_exsiting_configuration_to_own_project
|
2019-11-13 14:20:21 +01:00 |
|
Bjarke Berg
|
c9a99f52aa
|
Can't have the path info on IOHelper, because that leads to a cycle between config and IOHelper. Now you need to go directly to config, if you need a path
|
2019-11-13 14:15:50 +01:00 |
|
Bjarke Berg
|
9889967b83
|
Merge branch 'netcore/feature/abstract-systemdirectories' into netcore/feature/AB3594_move_exsiting_configuration_to_own_project
# Conflicts:
# src/Umbraco.Abstractions/Configuration/GlobalSettingsExtensions.cs
# src/Umbraco.Core/ConfigsExtensions.cs
# src/Umbraco.Core/Configuration/GlobalSettings.cs
# src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
|
2019-11-13 12:38:56 +01:00 |
|
Bjarke Berg
|
683c0da468
|
Moved stuff from SystemDirectories into constants and IOHelper to avoid a circular dependency
|
2019-11-13 11:56:32 +01:00 |
|
Bjarke Berg
|
6b0f7ce038
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/feature/AB3594_move_exsiting_configuration_to_own_project
# Conflicts:
# src/Umbraco.Abstractions/Constants-Conventions.cs
|
2019-11-13 08:39:13 +01:00 |
|
Bjarke Berg
|
424260ac2b
|
Merge branch 'netcore/feature/abstract-systemdirectories' into netcore/feature/AB3594_move_exsiting_configuration_to_own_project
# Conflicts:
# src/Umbraco.Core/ConfigsExtensions.cs
|
2019-11-12 15:32:45 +01:00 |
|
Bjarke Berg
|
42904d63aa
|
Fixed views
|
2019-11-12 15:32:03 +01:00 |
|
Bjarke Berg
|
6d18b3f363
|
Merge branch 'netcore/feature/AB3649-move-manifest-stuff' into netcore/feature/AB3594_move_exsiting_configuration_to_own_project
|
2019-11-12 14:11:08 +01:00 |
|
Bjarke Berg
|
7eef6b4037
|
https://github.com/umbraco/Umbraco-CMS/issues/7125 - Updates the projects to use the same versions as required by our nuspec
|
2019-11-12 08:50:31 +01:00 |
|
Jan Skovgaard
|
a2551521e4
|
Settings dashboard: Add translations (#6880)
|
2019-11-11 20:48:52 +01:00 |
|
Bjarke Berg
|
ed82bd05c6
|
AB3649 - Abstracted IPropertyType, IProperty and IPropertyValue
|
2019-11-08 14:27:27 +01:00 |
|
Bjarke Berg
|
2ce67dcf9a
|
Merge branch 'netcore/feature/non-static-iohelper' into netcore/feature/AB3594_move_exsiting_configuration_to_own_project
# Conflicts:
# src/Umbraco.Core/Manifest/ManifestParser.cs
# src/Umbraco.Tests/Composing/CompositionTests.cs
|
2019-11-08 07:55:23 +01:00 |
|
Bjarke Berg
|
13507c0e13
|
AB3653 - Static IOHelper -> IIOHelper (Moved into Current as a first step 😭)
|
2019-11-08 07:51:14 +01:00 |
|
Richard Thompson
|
0d2c2846d4
|
Corrected the model variable name
The model variable name is registerModel rather than profileModel.
|
2019-11-07 15:21:11 +00:00 |
|
Bjarke Berg
|
05569440c4
|
Post merge fixes - Port number
|
2019-11-07 14:47:41 +01:00 |
|
Bjarke Berg
|
563f58afa6
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
# src/SolutionInfo.cs
|
2019-11-07 14:34:45 +01:00 |
|
Bjarke Berg
|
c6ca955d5a
|
Move some of the config to Umbraco.Configuration
|
2019-11-07 13:02:29 +01:00 |
|
KB
|
d41e5bb27f
|
Update JQuery CDN In partial snippets, to use newer version without vulnerability
|
2019-11-05 18:16:47 +00:00 |
|
Bjarke Berg
|
3df329deb2
|
bump version and remove unused references
|
2019-11-05 16:52:22 +01:00 |
|
Søren Kottal
|
1c70d04ce2
|
Moves editor name part out of template. Adds null checking in templates
|
2019-11-05 15:33:29 +01:00 |
|
Jan Skovgaard
|
68de8a1fa6
|
Video dashboard (Settings & Members): Add translations (#6881)
|
2019-11-05 12:20:00 +01:00 |
|
Jan Skovgaard
|
c8ec7ce8ba
|
Profiling dashboard: Add translations (#6879)
|
2019-11-05 12:10:41 +01:00 |
|
Jan Skovgaard
|
8dd92bc720
|
NuCache dashboard: Add translation keys (#6867)
|
2019-11-05 11:46:55 +01:00 |
|
Jan Skovgaard
|
fd649ea0e2
|
Languages: Add missing "none" translation (#6865)
|
2019-11-05 10:27:27 +01:00 |
|
Jan Skovgaard
|
1759813795
|
Examine management dashboard: Add missing translations (#6866)
|
2019-11-05 10:20:11 +01:00 |
|
Bjarke Berg
|
1732fad780
|
Merge remote-tracking branch 'origin/v8/feature/mb-embed' into netcore/feature/mb_embed
|
2019-11-05 07:54:49 +01:00 |
|
Bjarke Berg
|
88e57277fa
|
Bump version to 8.4.0
|
2019-11-04 12:58:08 +01:00 |
|
Shannon
|
37fce725ff
|
Updates UI to allow updating a culture for a language and warn the user if they are changing it, updates the controller to be able to udpate a culture on a lang
|
2019-11-04 11:42:46 +01:00 |
|
Bjarke Berg
|
501f9495a9
|
Bumb version to 8.3
|
2019-11-04 11:30:52 +01:00 |
|
Shannon
|
065e3c1ba3
|
removes the MB package
|
2019-11-01 11:33:15 +11:00 |
|
Bjarke Berg
|
34d9e0cd09
|
Merge branch 'v8/dev' into v8/feature/mb-embed
|
2019-10-31 12:33:01 +01:00 |
|
Bjarke Berg
|
bf16a5936e
|
Merge remote-tracking branch 'origin/v8/feature/mb-embed' into v8/feature/mb-embed
|
2019-10-31 12:32:51 +01:00 |
|
Bjarke Berg
|
5c82968829
|
Merge remote-tracking branch 'origin/v8/dev' into v8/dev
|
2019-10-31 12:32:12 +01:00 |
|
Bjarke Berg
|
851a4e0d56
|
Fix Umbraco.Web.UI.csproj after auto merge
|
2019-10-31 11:49:43 +01:00 |
|
Bjarke Berg
|
ad6343719b
|
Merge branch 'v8/8.2' into v8/dev
# Conflicts:
# src/SolutionInfo.cs
|
2019-10-31 11:48:53 +01:00 |
|
Bjarke Berg
|
ef38fc1a6d
|
Bump version to 8.2.2
|
2019-10-31 10:02:08 +01:00 |
|
Bjarke Berg
|
eade92e803
|
Merge remote-tracking branch 'origin/v8/dev' into vx/feature/unicore
# Conflicts:
# src/Umbraco.Core/ObjectExtensions.cs
# src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
# src/Umbraco.Core/StringExtensions.cs
# src/Umbraco.Web.UI.Client/package-lock.json
|
2019-10-30 13:35:48 +01:00 |
|