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

18901 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Shannon
3a990d9cf0 Merge remote-tracking branch 'origin/temp-u4-8604-1' into dev-v7.7 2017-06-05 09:50:17 +02:00
Stephan
832ee47564 Fix nested content prevalue cache of all things 2017-06-05 09:28:52 +02:00
leekelleher
dc3f96a292 Included a pull-request from NestedContent package 
Fixes the prevalue-editor's doctype tabs dropdownlist from reverting to default post-save.

https://github.com/umco/umbraco-nested-content/pull/131
 2017-06-05 09:28:52 +02:00
leekelleher
7806246a52 Added NestedContent to "lists" datatype group. 
Set the icon to "icon-thumbnail-list".
 2017-06-05 09:28:52 +02:00
leekelleher
e136780947 Fixed JSLint warnings 
Renamed "nestedcontent.filters.js" filename to be singular.
 2017-06-05 09:28:52 +02:00
Stephan
b9ac5a365a Sanitize editors names 2017-06-05 09:28:52 +02:00
Stephan
942d010264 Retreat Amazing Nested Content Work 2017-06-05 09:28:52 +02:00
Lars-Erik Aabech
b70241e807 Allowing blank documents configurable 2017-06-05 00:49:06 +02:00
Lars-Erik Aabech
10761a2211 Selecting blueprints made configurable 2017-06-05 00:39:16 +02:00
Lars-Erik Aabech
f392c32d63 More localization and validation of blueprints 2017-06-05 00:20:02 +02:00
Lars-Erik Aabech
95cfb6c56b More localization of blueprint actions 2017-06-04 23:44:12 +02:00
Shannon
d59e3d34f9 fix double submit 2017-06-04 23:42:33 +02:00
Shannon
1a03c7f068 Merge remote-tracking branch 'lars/temp-content-blueprints' into temp-content-blueprints 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/content/content.createblueprint.controller.js
#	src/Umbraco.Web.UI.Client/src/views/content/createblueprint.html
 2017-06-04 23:40:39 +02:00
Shannon
f52e82296f required validation and styling working 2017-06-04 23:35:53 +02:00
Lars-Erik Aabech
16868d7b51 Colors and cancelling 2017-06-04 23:04:10 +02:00
Lars-Erik Aabech
59df08f956 Merge remote-tracking branch 'origin/temp-content-blueprints' into temp-content-blueprints 2017-06-04 22:58:13 +02:00
Shannon
3c9041b00e adds refresh to content type node 2017-06-04 22:57:49 +02:00
Lars-Erik Aabech
09a39c1fe4 Right icon for "blueprint from content" action 2017-06-04 22:57:11 +02:00
Shannon
7377b7614e Renders blueprints underneath their associated document types, removes preview button 2017-06-04 22:52:18 +02:00
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