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
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
a9fe46da0c
makes HasContainerInPath public
2017-03-28 15:55:45 +11:00
a23c150738
U4-9617 - fix
2017-03-23 17:51:30 +01:00
085a678266
U4-9617 - perf for published date
2017-03-23 17:44:07 +01:00
fe11d4770d
U4-9615 - implement way to find listviews in path fast
2017-03-23 14:07:45 +01:00
1bfb63fe86
Adds validation for file names
2017-03-21 18:35:13 +11:00
7b506fadc6
U4-9611 - minor fix
2017-03-16 14:35:54 +01:00
e1942d96d0
Incorporate Stephane's feedback: if we already know we're getting list of int or udi, we don't need to cast, or even test for the PropertyEditorAlias
2017-03-15 23:22:53 +01:00
a2ca753dd9
Use RelatedLink class instead of weird extra inline class, convert UDI values
2017-03-14 10:26:13 +01:00
05f8870424
Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6
2017-03-14 17:25:40 +11:00
1b7ce8bcde
Removed weird comment
...
removed "this" as remark for NewPassword
2017-03-12 21:20:24 +01:00
5291558b23
Further refactoring, using attributes, moving and removing some classes, using DI where necessary.
2017-03-08 14:27:39 +01:00
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
d3582e2296
An ID is required on all items edited in backoffice editors
...
The ID is required when an item is saved, as the routing will
automatically redirect based on this ID - files, does not have an ID -
so the filepath is used in the same as it is used for the tree
2017-02-22 15:47:36 +00:00
b4eb9f333e
Gets the member picker working with mini list views, falls back to Examine search for when searching on member types - since the EntityService doesn't support that currently, gets the icon mapped correctly for members,
2017-02-21 13:49:58 +11:00
6ae06ad2e0
Merge remote-tracking branch 'refs/remotes/origin/dev-v7.6' into temp-U4-9470
...
# Conflicts:
# src/Umbraco.Web/Editors/EntityController.cs
2017-02-15 17:41:12 +11:00
8387c435d4
Gets mini list view working so that only nodes with children show the arrow, added GetPagedChildren to EntityController
2017-02-15 17:40:10 +11:00
e612bcae58
Merge branch 'refs/heads/dev-v7.6' into temp-U4-9310
2017-02-10 10:04:58 +11:00
a20cc60c10
Updates new UDI pickers that have start nodes for pre-values to also store UDIs for their prevalues, this has a knock on effect in that we need to be able to inject some server side config for pre-value editors (otherwise we'd have to make diff udi prevalue editors but that isn't very re-usable), so have implemented that and then updated all of the logic to deal with the udi idType.
2017-02-08 16:15:27 +11:00
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
179523224a
Merge remote-tracking branch 'refs/remotes/origin/dev-v7.6' into temp-U4-9310
2017-02-07 12:15:54 +11:00
db86f6e1ee
Fixes up issues reported on review and adds a null check
2017-02-03 11:49:22 +11:00
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
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
c21837e906
Merge remote-tracking branch 'origin/dev-v7.6' into temp-U4-9429
...
# Conflicts:
# src/Umbraco.Web/Editors/CodeFileController.cs
2017-02-02 10:24:42 +01:00
46c7737c17
Merge pull request #1714 from umbraco/temp-u4-9441
...
Fixes tree syncing issues
2017-02-01 14:04:18 +01:00
ff6ea0b42e
Merge remote-tracking branch 'refs/remotes/origin/dev-v7.6' into temp-U4-9310
...
# Conflicts:
# src/Umbraco.Core/Models/UmbracoObjectTypes.cs
2017-02-01 15:23:29 +11:00
384a31e3c6
Gets member picker working with UDI, ensures that the GUID is indexed for all things - can't believe this wasn't being done, updates the search model mapper to return the UDI
2017-02-01 15:19:52 +11:00
90448f1c78
Added comments and made helper internal
2017-01-31 11:06:14 +01:00
431f91b900
Adds an api endpoint for getting the available snippets in the Umbraco folder
2017-01-30 14:57:08 +01:00
b05c4711ce
Fixes tree syncing issues
2017-01-30 13:33:05 +01:00
74c167ed03
U4-9413 moving links to document and media to top of generic properties.
2017-01-30 13:18:30 +01:00
0078a5d8cc
Getting the media picker wired up for udi
2017-01-30 16:54:01 +11:00
9ef53536bf
Updates the base editor models to include a readonly UDI, updates all model mappers to map the UDI,
2017-01-28 01:14:24 +11:00
547351a719
Merge remote-tracking branch 'refs/remotes/origin/dev-v7.6' into temp-U4-9310
2017-01-28 00:25:25 +11:00
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
0a2e5badd0
Merge branch 'temp-template-editor' into dev-v7.6
2017-01-26 18:27:10 +01:00
90b0bf9d82
Merge branch 'dev-v7.6' into temp-template-editor
2017-01-26 18:26:32 +01:00
a5af5ba1a9
Adds new property to PropertyEditor's to mark them as deprecated so they don't show up in the data type list unless they are already selected
2017-01-17 18:54:50 +11:00
a162f21a70
Fixing missing mapping - let the green build lights appear
2017-01-16 19:49:57 +01:00
ace111aefb
Adding support for get, save and rename to new Partial View editor
2017-01-16 16:50:22 +01:00
e7f7631d1e
Fixes merge conflicts (needs updated ng-if in insert overlay)
2017-01-13 13:22:43 +01:00
9b9db23461
Replaces the last static strings with language keys
2017-01-13 13:20:38 +01:00
5041a459d4
Merge pull request #1681 from umbraco/temp-template-editor
...
Temp template editor
2017-01-12 15:56:08 +00:00
8a11b0f7a8
publisizes a constant (moves it to where it should be), publicizes another required class for deploy, bumps version
2017-01-12 17:33:30 +11:00
cfd8d39878
Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6
...
# Conflicts:
# build/NuSpecs/UmbracoCms.nuspec
# src/Umbraco.Tests/Umbraco.Tests.csproj
2017-01-12 13:39:15 +11:00
f036bc90c3
Fixes failing mapper test
2017-01-10 16:54:46 +01:00
5a2687d520
Merge of temp-template-editor
2017-01-10 14:47:33 +01:00
82ab7c4a01
Merge branch 'temp-template-editor' into temp-U4-9324
...
# Conflicts:
# src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
2017-01-10 11:52:03 +01:00
Shannon