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

18857 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lars-Erik Aabech
f8ed2a3db4 Blueprint dialogs done(ish) 2017-06-04 18:03:07 +02:00
Lars-Erik Aabech
6dd9fc2780 Create dialog shows available blueprints and passes id to create page. 2017-06-04 17:49:21 +02:00
Lars-Erik Aabech
c06ac51b48 temp adding stubbed blueprints 2017-06-04 17:18:43 +02:00
Lars-Erik Aabech
5fe22a2231 Create blueprint from content integrated & working. 2017-06-04 17:14:12 +02:00
Lars-Erik Aabech
79fa7db631 Merge remote-tracking branch 'origin/temp-content-blueprints' into temp-content-blueprints 2017-06-04 16:44:53 +02:00
Lars-Erik Aabech
4574bf2de2 Reverting inadvertent file changes 2017-06-04 16:37:33 +02:00
Shannon
3351a3e112 Merge remote-tracking branch 'origin/temp-content-blueprints' into temp-content-blueprints 2017-06-04 16:29:53 +02:00
Shannon
584c3e4c19 adds parameters to the content editor directive 2017-06-04 16:27:59 +02:00
Shannon Deminick
479f6a1525 Merge pull request #1977 from lars-erik/temp-content-blueprints 
Temp content blueprints
 2017-06-04 16:14:29 +02:00
Lars-Erik Aabech
6f55515f11 Merge branch 'temp-content-blueprints' of https://github.com/umbraco/Umbraco-CMS into temp-content-blueprints 2017-06-04 16:07:51 +02:00
Lars-Erik Aabech
9f0639ba24 Create blueprint from content action 
In process of adding blueprints to create content dialog
 2017-06-04 16:07:11 +02:00
Shannon
028903c306 Creates endpoint to create a blueprint 2017-06-04 16:00:25 +02:00
Shannon
adb02c96a7 Gets blueprint tree controller working, makes the content editor a directive :O 2017-06-04 15:54:51 +02:00
Shannon
f4d0de6665 get services/repos working for blueprints along with tests 2017-06-04 14:43:28 +02:00
Sebastiaan Janssen
c4b07cc3ae Merge pull request #1974 from umbraco/temp-U4-9980 
Adds support for keys in package content
 2017-06-03 18:36:28 +02:00
Sebastiaan Janssen
771935b8a5 Update PackagingService.cs 2017-06-03 18:36:00 +02:00
Niels Hartvig
73bb401f81 Updating to TryParse to make Sir Janssen happy :-) 2017-06-03 18:34:09 +02:00
Niels Hartvig
8ccbe4c1e4 Adds support for keys in package content 2017-06-03 17:34:31 +02:00
Sebastiaan Janssen
92f609ff71 Merge pull request #1969 from umbraco/temp-U4-9974 
U4-9974 EnablePropertyValueConverter does the opposite
 2017-06-01 13:32:51 +02:00
Sebastiaan Janssen
7e6f7f8a2b Bumps version 2017-06-01 13:04:31 +02:00
Claus
c5419e700b the legacy converter should not be associated to RelatedLinks2Alias and should only be enabled if EnablePropertyValueConverters is false, otherwise the other converter should be used. 2017-06-01 13:03:56 +02:00
Sebastiaan Janssen
cb09094632 U4-9974 EnablePropertyValueConverter does the opposite 2017-06-01 10:57:15 +02:00
Sebastiaan Janssen
72404e68a0 Merge pull request #1968 from umbraco/temp-u4-9927 
U4-9927 - fix migration
 2017-05-31 16:36:42 +02:00
Sebastiaan Janssen
2c451c5cfe Remove debug tracing 2017-05-31 16:29:26 +02:00
Stephan
af7f83f0f6 U4-9927 - fix migration 2017-05-31 15:49:15 +02:00
Shannon
5b3c2178a2 Revert "Merge pull request #1729 from marcemarc/marcemarc-U4-9480" 
This reverts commit 145f789631, reversing
changes made to 78bc38fe1b.
 2017-05-31 15:26:22 +02:00
Shannon Deminick
145f789631 Merge pull request #1729 from marcemarc/marcemarc-U4-9480 
U4-9489 - dictonaryToQueryString only returns first dictionary item
 2017-05-31 15:17:11 +02:00
Sebastiaan Janssen
e27e95cb1a U4-9952 Can not save XSLT files in 7.6 2017-05-31 11:11:56 +02:00
Mikkel Holck Madsen
cdbc3fa8cd Merge pull request #1967 from umbraco/temp-U4-9971 
U4-9971 Special "square bracket" notation in Umbraco.Field not working
 2017-05-31 10:55:17 +02:00
Sebastiaan Janssen
6feb7b222f U4-9971 Special "square bracket" notation in Umbraco.Field not working 2017-05-31 10:18:10 +02:00
mikkelhm
b0a739b4ac Bump version to 7.6.2 2017-05-29 15:07:37 +02:00
Sebastiaan Janssen
728dee070f Merge pull request #1965 from umbraco/temp-U4-9894-2 
U4-9894 UDI Pickers and all 'v2' property editors shouldn't observe t…
 2017-05-29 14:27:18 +02:00
Claus
4a735770e2 Merge pull request #1961 from umbraco/temp-U4-9937 
fixes: U4-9937 RTE Media Picker - Cannot add image to RTE after searching
 2017-05-29 11:42:05 +02:00
Shannon
d54b3a0cc3 U4-9894 UDI Pickers and all 'v2' property editors shouldn't observe the EnablePropertyValueConverters setting 2017-05-29 09:38:16 +02:00
Claus
f962a3db20 Merge pull request #1953 from umbraco/temp-U4-9935 
U4-9935 UmbracoHelper doesn't have querying methods for handling UDI
 2017-05-29 09:34:29 +02:00
mikkelhm
39851d2475 Ignoring the StringEncodingTest2 as AppVeyors framework settings is doing weird things, that makes it fail 2017-05-26 13:31:29 +02:00
Mikkel Holck Madsen
28adbc17ef Merge pull request #1963 from umbraco/temp-deploy-324 
deploy-324 - fix udi encoding
 2017-05-26 13:14:29 +02:00
Shannon Deminick
4b9a13078e Merge pull request #1957 from umbraco/temp-U4-9940 
U4-9940 Make it easy to get the integer Id of an item from it's Udi
 2017-05-25 23:58:23 +10:00
Sebastiaan Janssen
17cce9a666 Make EntityService private 2017-05-25 15:40:26 +02:00
Sebastiaan Janssen
39da34e1c7 Attempt to force .NET 4.5 for tests 2017-05-25 13:14:56 +02:00
Sebastiaan Janssen
55dc927c8b Does this help get the StringEncodingTest2 to run? Doubt it. 2017-05-25 12:07:20 +02:00
Sebastiaan Janssen
6e3ff59dfb Adds GetIdForUdi to UmbracoHelper 2017-05-25 11:04:40 +02:00
Sebastiaan Janssen
08eab00627 Adds GetIdForUdi method to IEntityService 2017-05-25 10:48:28 +02:00
Sebastiaan Janssen
c4fae9b272 Remove extension method 2017-05-25 10:47:15 +02:00
Stephan
51186bea24 deploy-324 - fix udi encoding 2017-05-24 11:20:01 +02:00
Shannon Deminick
5c5bacaab4 Merge pull request #1962 from bjarnef/dev-v7-U4-9571 
Fix overwriting background repeat and position on legacy tree icons
 2017-05-24 18:00:18 +10:00
Bjarne Fyrstenborg
5a4e6df99c Merge remote-tracking branch 'upstream/dev-v7' into dev-v7-U4-9571 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/tree.less
 2017-05-24 09:40:14 +02:00
Bjarne Fyrstenborg
22f8a4c5dd Fix overwriting background repeat and position on legacy tree icons 2017-05-24 09:24:26 +02:00
Shannon Deminick
aaf7ae0331 Merge pull request #1960 from umbraco/temp-u4-9936 
U4-9936 - fix xml cache refresh in lb
 2017-05-24 16:15:03 +10:00
Shannon Deminick
8459a058c6 Merge pull request #1956 from umbraco/temp-U4-9898 
U4-9898 Reset password should unlock a locked account
 2017-05-24 15:36:33 +10:00