yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,863 Commits 4 Branches 7 Tags
e612bcae58b5e3a439fde31b7d62ec03b0684683
Commit Graph

706 Commits

Author SHA1 Message Date
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
Niels Hartvig
a162f21a70 Fixing missing mapping - let the green build lights appear 2017-01-16 19:49:57 +01:00
Niels Hartvig
ace111aefb Adding support for get, save and rename to new Partial View editor 2017-01-16 16:50:22 +01:00
Niels Hartvig
e7f7631d1e Fixes merge conflicts (needs updated ng-if in insert overlay) 2017-01-13 13:22:43 +01:00
Per Ploug
9b9db23461 Replaces the last static strings with language keys 2017-01-13 13:20:38 +01:00
Warren Buckley
5041a459d4 Merge pull request #1681 from umbraco/temp-template-editor 
Temp template editor
 2017-01-12 15:56:08 +00:00
Shannon
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
Shannon
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
Per Ploug
f036bc90c3 Fixes failing mapper test 2017-01-10 16:54:46 +01:00
Niels Hartvig
5a2687d520 Merge of temp-template-editor 2017-01-10 14:47:33 +01:00
Mads Rasmussen
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
77d47f0b28 fixes error with server side validation + data tyep editor, ensures template controller and data type controller inherit from BackOfficeNotificationsController, ensures BackOfficeNotificationsController is attributed with PrefixlessBodyModelValidator 2017-01-10 12:29:30 +11:00
Niels Hartvig
4c330c8654 Implements CodeFileController 2017-01-09 22:54:28 +01:00
Warren Buckley
5b88c57d94 Replace RequiredForPersistance with Required 2017-01-09 13:05:20 +00:00
Per Ploug
12e48d069b Fixes issue with DateTime values and strongly typed queries 2017-01-05 11:34:38 +01:00
Sebastiaan Janssen
770f96b6d5 Merge branch 'dev-v7' into dev-v7.6 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
 2017-01-05 09:47:51 +01:00
Per Ploug
8b479b57e5 Change query condition from name to alias 2017-01-05 08:45:04 +01:00
Warren Buckley
1300764770 Adding in server side validation - but need to clarify that this is the 'right' way to do it that wires up correctly/magically back to the UI components 2017-01-04 14:12:45 +00:00
Stephan
13ed3303f5 U4-9337 - url routing perfs 2017-01-04 13:56:41 +01:00
Shannon
790e30defd Simplifies all creation of UrlHelper, creates GetUmbracoApiServiceBaseUrl extensions for WebApi 2017-01-03 11:13:38 +11:00
Per Ploug
1f52a0c186 Changes the querybuilder to use the correct Where syntax 2016-12-29 01:50:43 +01:00
Brian Powell
afa39866ad Fix U4-9298 2016-12-17 21:12:45 -05:00
Stephan
d800a4198d fix meh 2016-11-15 09:14:55 +01:00
Mads Rasmussen
f6d8a980a6 Merge branch 'dev-v7' into temp-template-editor 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/belle.less
#	src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
#	src/Umbraco.Web/Umbraco.Web.csproj
 2016-11-14 11:04:15 +01:00
Claus
ff2805c428 mostly just formatting and cleanup - no changes as such. 2016-11-09 11:13:35 +01:00
Claus
69c45a4b05 Merge pull request #1612 from tnielsenskybruddk/dev-v7 
Link to member type from member properties
 2016-11-09 10:29:49 +01:00
Thomas Nielsen
cbfd04e950 Link to member type from member properties 2016-11-08 23:37:29 +01:00
Thomas Nielsen
981c0b83d3 Oops wrong pull request 2016-11-08 23:16:10 +01:00
Thomas Nielsen
16ae5cf634 Link to member type from member properties 2016-11-08 23:00:14 +01:00