yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,127 Commits 4 Branches 7 Tags
6ea92daa70cc834cc8e33409f5f404794de025b9
Commit Graph

20127 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
e2137c9a43 Gets updating blueprints working 2017-06-04 22:07:58 +02:00
Shannon
f2b9963385 Merge remote-tracking branch 'lars/temp-content-blueprints' into temp-content-blueprints 2017-06-04 21:21:30 +02:00
Shannon
f5ad4a35cd blueprint scaffolding working 2017-06-04 21:21:16 +02:00
Lars-Erik Aabech
b55aa7c16d Filtering out properties 2017-06-04 21:20:42 +02:00
Lars-Erik Aabech
ee577da48e Merge remote-tracking branch 'origin/temp-content-blueprints' into temp-content-blueprints 2017-06-04 21:01:31 +02:00
Lars-Erik Aabech
affe3d688b English language elements for blueprints 2017-06-04 21:00:08 +02:00
Shannon
addd8946e8 Merge remote-tracking branch 'lars/temp-content-blueprints' into temp-content-blueprints 2017-06-04 20:59:13 +02:00
Shannon
d2fe3e7406 editing blueprints now working 2017-06-04 20:58:56 +02:00
Niels Hartvig
1b844421fc Updates to installer to use the new starter kit (and updates core version) 2017-06-04 20:47:33 +02:00
Lars-Erik Aabech
6b0ef0e289 Disabling content editor tests to not "break the build" 2017-06-04 18:32:34 +02:00
Lars-Erik Aabech
7c0acff9f8 Naming and correct name in notification 2017-06-04 18:29:10 +02:00
Lars-Erik Aabech
b2279a30f7 Can create docs without blueprint 2017-06-04 18:15:31 +02:00
Niels Hartvig
df9c6baed7 Updates a few numbers in the installer 2017-06-04 18:10:29 +02:00
Lars-Erik Aabech
22758c6e12 Merge remote-tracking branch 'origin/temp-content-blueprints' into temp-content-blueprints 2017-06-04 18:03:36 +02:00
Lars-Erik Aabech
f8ed2a3db4 Blueprint dialogs done(ish) 2017-06-04 18:03:07 +02:00
Shannon
c9f6778e31 Merge remote-tracking branch 'origin/dev-v7' into temp-content-blueprints 2017-06-04 17:57:15 +02:00
Shannon
494a7d54b8 Deleting works, wired up some validation for duplicate names 2017-06-04 17:57:06 +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
Shannon
b99b9b7a6b adds blueprints dictionary to ContentTypeBasic result 2017-06-04 17:31:31 +02:00
Lars-Erik Aabech
c06ac51b48 temp adding stubbed blueprints 2017-06-04 17:18:43 +02:00
Shannon
abcd6e69f0 Merge remote-tracking branch 'lars/temp-content-blueprints' into temp-content-blueprints 2017-06-04 17:17:46 +02:00
Lars-Erik Aabech
5fe22a2231 Create blueprint from content integrated & working. 2017-06-04 17:14:12 +02:00
Shannon Deminick
03cb5bf9e5 Merge pull request #1979 from lars-erik/temp-content-blueprints 
Temp content blueprints
 2017-06-04 16:51:54 +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
Sebastiaan Janssen
53357b0582 Merge pull request #1976 from umbraco/temp-U4-9980 
Temp u4 9980
 2017-06-04 14:55:23 +02:00
Sebastiaan Janssen
1164f1cdbb Merge branch 'dev-v7' into temp-U4-9980 2017-06-04 14:55:03 +02:00
Shannon
f4d0de6665 get services/repos working for blueprints along with tests 2017-06-04 14:43:28 +02:00
Niels Hartvig
7f05b80a22 Make Seb happy 2017-06-04 14:02:05 +02:00
Niels Hartvig
20239a9b71 Adds a null check to avoid breaking tests (and to comform to coding standards) 2017-06-04 14:00:51 +02:00
Brian Powell
70a0bbbe61 Change font references: icomoon -> tinymce 2017-06-03 12:49:42 -04: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
Marc Goodson
cf3343749f Revert fix to umbrequesthelper.service it was NEVER meant to be able to receive an array of a single dictionary item - actual fix is to change logResource to not pass params in this way 2017-06-02 21:04:12 +01:00
Marc Goodson
079df4a8b7 Pass logType and SinceDate as an array of key value pairs and not an array of a single dictionary - the logapi was never meant to be able to receive a dictionary... see comments on http://issues.umbraco.org/issue/U4-9489 for details 2017-06-02 21:02:46 +01:00
wanddy
7612884705 revert MediaService.cs 2017-06-02 23:41:19 +08:00
wanddy
74dc2d80fd Merge remote-tracking branch 'remotes/origin/dev-v7.6-chnfix' into dev-v7-chnfixnew 
# Conflicts:
#	src/Umbraco.Core/Services/MediaService.cs
 2017-06-02 23:33:16 +08:00
Wanddy Huang(黄仁祥)
647ebee34d Merge pull request #1 from umbraco/master-v7 
merger umbraco/dev-v7  to my dev-v7
 2017-06-02 22:43:44 +08:00
wanddy
bc444847f4 Merge branch 'dev-v7.6' of https://github.com/umbraco/Umbraco-CMS into dev-v7.6-chnfix 2017-06-02 21:47:03 +08:00
Brian Powell
24d9c60bdf Update fonts and stylesheet to include table icons missing per U4-9977 2017-06-01 21:59:31 -04:00
Sam Sperling
b5c2fc82bb U4-9973 Remove sealed modifier from ExternalSignInAutoLinkOptions class 2017-06-02 11:43:06 +10:00