Shannon
e2f9c90dc6
Merge branch 'dev-v7.7' into temp-content-blueprints
2017-06-05 10:23:10 +02:00
Shannon
7d1aedc0d3
fixes unit tests
2017-06-05 10:17:18 +02:00
Stephan
942d010264
Retreat Amazing Nested Content Work
2017-06-05 09:28:52 +02:00
Shannon
b99b9b7a6b
adds blueprints dictionary to ContentTypeBasic result
2017-06-04 17:31:31 +02:00
Shannon
765decf3b1
Merge remote-tracking branch 'origin/dev-v7.6' into dev-v7
...
# Conflicts:
# build/UmbracoVersion.txt
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Core/Services/MediaService.cs
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
# src/Umbraco.Web/Trees/PartialViewMacrosTree.cs
# src/Umbraco.Web/Trees/PartialViewsTree.cs
2017-05-17 20:00:29 +10:00
Shannon
ec9020f63e
Fixes mappings
2017-04-28 13:34:32 +10:00
Dave Long
b88e714050
Fixed Serialization issue in Password Reset Validate Model
2017-04-21 08:33:21 +02:00
Shannon
d19bebc404
Merge branch 'dev-v7.6' into temp-U4-7009
2017-04-18 20:10:27 +10:00
Shannon
46dd86c745
Moves logic for checking if the current user (based on the current thread) is an admin and in which case can reset the password to an extension method
2017-04-18 20:09:27 +10:00
Sebastiaan Janssen
e2dc4f36ad
U4-9762 ezSearch package complains about pickers in macro parameters
2017-04-12 13:39:38 +02:00
Shannon
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
Shannon
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
Shannon
a9fe46da0c
makes HasContainerInPath public
2017-03-28 15:55:45 +11:00
Stephan
a23c150738
U4-9617 - fix
2017-03-23 17:51:30 +01:00
Stephan
085a678266
U4-9617 - perf for published date
2017-03-23 17:44:07 +01:00
Stephan
fe11d4770d
U4-9615 - implement way to find listviews in path fast
2017-03-23 14:07:45 +01:00
Shannon
1bfb63fe86
Adds validation for file names
2017-03-21 18:35:13 +11:00
Stephan
7b506fadc6
U4-9611 - minor fix
2017-03-16 14:35:54 +01:00
Sebastiaan Janssen
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
Sebastiaan Janssen
a2ca753dd9
Use RelatedLink class instead of weird extra inline class, convert UDI values
2017-03-14 10:26:13 +01:00
Shannon
05f8870424
Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6
2017-03-14 17:25:40 +11:00
Søren Gregersen
1b7ce8bcde
Removed weird comment
...
removed "this" as remark for NewPassword
2017-03-12 21:20:24 +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
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
Per Ploug
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
Shannon
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
Shannon
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
Shannon
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
Shannon
e612bcae58
Merge branch 'refs/heads/dev-v7.6' into temp-U4-9310
2017-02-10 10:04:58 +11:00
Shannon
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
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
Shannon
179523224a
Merge remote-tracking branch 'refs/remotes/origin/dev-v7.6' into temp-U4-9310
2017-02-07 12:15:54 +11:00
Shannon
db86f6e1ee
Fixes up issues reported on review and adds a null check
2017-02-03 11:49:22 +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
Emil Wangaa
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
Claus
46c7737c17
Merge pull request #1714 from umbraco/temp-u4-9441
...
Fixes tree syncing issues
2017-02-01 14:04:18 +01:00
Shannon
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
Shannon
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
Per Ploug
90448f1c78
Added comments and made helper internal
2017-01-31 11:06:14 +01:00
Emil Wangaa
431f91b900
Adds an api endpoint for getting the available snippets in the Umbraco folder
2017-01-30 14:57:08 +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
Shannon
0078a5d8cc
Getting the media picker wired up for udi
2017-01-30 16:54:01 +11:00
Shannon
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
Shannon
547351a719
Merge remote-tracking branch 'refs/remotes/origin/dev-v7.6' into temp-U4-9310
2017-01-28 00:25:25 +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
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
Shannon
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
