-
Notifications
You must be signed in to change notification settings - Fork 720
contrib note update #1279
contrib note update #1279
Conversation
sstone1
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good bar a couple of typos 😉
| @@ -1,3 +1,11 @@ | |||
| # Contriburting to Composer | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Typo!
contrib-notes/ide-setup.md
Outdated
| @@ -1,3 +1,10 @@ | |||
| # Contriburting to Composer | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Typo!
contrib-notes/getting-started.md
Outdated
| @@ -1,9 +1,20 @@ | |||
| # Contriburting to Composer | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Typo!
contrib-notes/coding-guidelines.md
Outdated
| @@ -1,6 +1,83 @@ | |||
| # Contriburting to Composer | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Typo!
mbwhite
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updates made @sstone1
* Fix generator and exception issues
commit 46673b8debbc1bc06e942481d0f0cee3d55e814d
Merge: d3769fe9 7b9f895f
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 11:23:25 2017 +0100
Merge branch 'issue-321' of github.com:/14gracel/composer into issue-321
commit d3769fe9dccf4ea520a6ee0f1f1a0e882629e8fa
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:34:18 2017 +0100
Merges
commit 165f5f80b6ae3605868afcb84c3f99fc690a9c7e
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:55:23 2017 +0100
Fix illegalmodelexception
commit 9b1ad31ca8f4656f244ff520c9c2fdaed8df2271
Merge: 725f3821 94f4b79b
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:41:59 2017 +0100
Merge branch 'issue-321' of github.com:/14gracel/composer into issue-321
commit 94f4b79b631fec9e4ef89824b1a969a23c77fb7f
Merge: 51bedefd 725f3821
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Fri Jun 16 15:09:40 2017 +0100
Merge branch 'master' of github.com:/hyperledger/composer into issue-321
commit 725f3821a099602cc68f782aa248a9edb859dd8a
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:36:40 2017 +0100
fix predicate
commit 2964c561879c563a4eb98679f71ab0192576d02a
Merge: aa747b8f bc14a8a8
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:35:30 2017 +0100
Merge branches 'issue-1267' and 'issue-1267' of github.com:/14gracel/composer into issue-1267
commit bc14a8a8127cd6db873bc70b4c9e7a31d62ed944
Merge: aa747b8f e390dbde
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:23:43 2017 +0100
Merge branch 'issue-1267' of github.com:/14gracel/composer into issue-1267
commit e390dbde69753f40baaefa8cc8b1da3470bb76ee
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:04:59 2017 +0100
Generator updates
commit b8885b3625b205ff393a6ebe058f5367a0e40e53
Merge: 48ebf3a6 aa747b8f
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 09:02:29 2017 +0100
Merge branch 'master' of github.com:/hyperledger/composer into issue-1267
commit aa747b8f86c23ab262a4debbdf4176fcd90c224a
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:34:18 2017 +0100
Merges
commit b52b45f3a574d2a9deed272edc11203ff818d3e1
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:04:59 2017 +0100
Generator updates
commit 89fd043908c213b6b6c5225f1663f905e99577b4
Merge: 99b5a979 1f3fe00e
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:30:31 2017 +0100
Merge branch 'master' of github.com:/hyperledger/composer
commit 1f3fe00e77eb55bc4683b07143311513f85b24ff
Author: Dave Kelsey <d_kelsey@uk.ibm.com>
Date: Fri Jun 16 15:26:33 2017 +0100
Fix cert issues in playground (#1299)
Signed-off-by: Dave Kelsey <d_kelsey@uk.ibm.com>
commit 99b5a97972b9229fd4f973fc69750d98aedce2bd
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Mon Jun 19 09:12:34 2017 +0100
Merge branch 'master' of github.com:/hyperledger/composer
commit 48ebf3a692d38abacb78bfdab160b13857036952
Merge: 134c916a 189b4d22
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Fri Jun 16 13:13:44 2017 +0100
Merge branch 'master' of github.com:/14gracel/composer
commit 134c916ae38aee2df7463b95193a30a50a894c6d
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Thu Jun 15 14:02:15 2017 +0100
Changed generator text
commit 590cddeffb0d4372f1e34c996ce98db611097c3c
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Thu Jun 15 14:02:15 2017 +0100
Changed generator text
commit 57c4c8c1ee08472b12bd762d2dfa8463dc0d8f96
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 13:41:14 2017 +0100
Added BaseModelException to make error messages more consistent and give access to location in all model exceptions
commit 0c4e682a4bbbbc3c5fe7ec52c156d261ab8c0e8e
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 16:26:36 2017 +0100
Fixed license issue
commit a05bc85636ba8654b7cb60806e7bf3345114dcdf
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 15:33:01 2017 +0100
eslint config changes
commit cab79d84aba7f2838339fd4a74fc1521a7a98a13
Author: EdMoffatt <EdMoffatt@users.noreply.github.com>
Date: Wed Jun 14 22:24:57 2017 +0100
Docs branch merge (#1274)
* Remove non https playground links and fix a typo on the homepage
* fix local install command
* Fix local install SVG and correct any typos of Yeoman
* 2 buttons on homepage, fixed install02 image, re-added footer to docs pages
* Reverting some unnecessary CSS changes, and fixing another diagram
* remove some more unnecessary css
* removing yet more unnecessary css, and an unnecessary image too
* Trying to force a diagram to actually update...
commit 8db8b29716541f3c0f6fb9c81458fd571ab9675e
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 16:26:36 2017 +0100
Fixed license issue
commit e222346c632abb7f3ed85cb246a550272f8989c5
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 16:14:24 2017 +0100
Add model generator
commit d5435ca6d2aba37b56789b46e9d4d639d08325c1
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 15:33:01 2017 +0100
eslint config changes
commit 9bad69660c2db45b94ae0a7c400dbb68ceae0b51
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 15:24:26 2017 +0100
Changed options to make generators more consistent
commit 3676e35593a624b94636e20e2ccbe24fc698288b
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 13:41:14 2017 +0100
Added IllegalModelDeclaration.getShortMessage and swapped around error messages
commit 7b9f895f94b607263af2809672a63c1a7f53b1b0
Merge: 86045db1 2f46c735
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 11:01:38 2017 +0100
Merge branch 'issue-321' of github.com:/14gracel/composer into issue-321
commit 86045db1771c2fd6bb29dce56e914b62894d08db
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:55:23 2017 +0100
Fix illegalmodelexception
commit 660374be7071656f4138921b6e2c343e36e9172f
Merge: bde6e67f 02fe1e7b
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:41:59 2017 +0100
Merge branch 'issue-321' of github.com:/14gracel/composer into issue-321
commit bde6e67f388fe720f7a6cb9486358e207b5600fd
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:36:40 2017 +0100
fix predicate
commit e0909026c6287bdc0ce8039f126586a5156e869f
Merge: c5149daf 238e2070
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:35:30 2017 +0100
Merge branches 'issue-1267' and 'issue-1267' of github.com:/14gracel/composer into issue-1267
commit c5149dafd0ebc886af1dbc675651415b17d9fd8e
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:34:18 2017 +0100
Merges
commit 2f46c7350eb867a5c11df87a8995626c250faca3
Merge: 076f7f28 02fe1e7b
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:41:59 2017 +0100
Merge branch 'issue-321' of github.com:/14gracel/composer into issue-321
commit 076f7f28fad6665722b1677cead56e71e2af0f60
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:36:40 2017 +0100
fix predicate
commit 90eca2cc1846461855d7a532652a39b1bec39db7
Merge: c7e958d6 238e2070
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:35:30 2017 +0100
Merge branches 'issue-1267' and 'issue-1267' of github.com:/14gracel/composer into issue-1267
commit c7e958d61ac565c675b8349421a7d381a46d5bc7
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:34:18 2017 +0100
Merges
commit afae7504dacfab72434bbceea4521bba5015f69a
Author: Simon Stone <sstone1@uk.ibm.com>
Date: Tue Jun 20 15:05:28 2017 +0800
Expose the select statement for a query (#1333)
commit 62eedd52bfaf7eaa66abf91ed225bee171e3ce53
Author: Mark S. Lewis <mark_s_lewis@hotmail.com>
Date: Mon Jun 19 21:50:57 2017 +0100
Refactor and code tidy as part of #796 (#1296)
* 409: Use ValueGenerator strategy for generating resource values
* Use proper case for Data heading on Test page (#496)
* Change generate option to a string on composer-common.Factory functions
* Change sed command for better compatibility (#1)
Use the -i option instead of --in-place as this is a synonym but has better support across different versions of sed; in particular the default sed on MacOS only provides -i and not --in-place.
* Fix path name in weekly QA doc
* Refactor of Factory to remove duplicate code
Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com>
* Correct changelog.txt
Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com>
* Correct some logic errors getting class declarations
Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com>
* Increase unit test coverage
Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com>
* Message and unit test improvements.
Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com>
* Fix BusinessNetworkConnector tests for changes to error message text
Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com>
commit c66d6f7e1c0cba9f48aed50c2ad6d23e2fc1964d
Author: Daniel Selman <danscode@selman.org>
Date: Mon Jun 19 14:38:48 2017 +0100
Grammar, parser and model for queries (#1305)
* Fixed broken links in docs
* Workin in progress changes for query DSL
* wip
* wip
* unit testing
commit 574838b5eba3781ae7b79c395bede7d0119f4dd8
Author: caroline-church <cazfletch@gmail.com>
Date: Mon Jun 19 12:54:52 2017 +0100
Add Various Tests (#1311)
Added tests to add-connection-profile
Updated tests for connection-profile
Updated tests for connection-profile-data
Updated tests for basic models
commit 101a7cc39df953164a3f1304c752ccd8ec4b5a1e
Author: caroline-church <cazfletch@gmail.com>
Date: Mon Jun 19 10:25:16 2017 +0100
Add Drag and Drop Tests (#1308)
Added tests for FileDragDropDirective
Removed random console.logs
Updated coverage requirements
commit 60615a3e9ee308618275dde6e98667612478f88e
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:04:59 2017 +0100
Generator updates
commit bc3f605e59f5043ab71d93c2a4448b0392986919
Merge: ae44c367 8931b3b1
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:30:31 2017 +0100
Merge branch 'master' of github.com:/hyperledger/composer
commit 238e2070844778108c75a0f70f1335a407b4eae3
Merge: b7b03ca1 9cb27110
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:23:43 2017 +0100
Merge branch 'issue-1267' of github.com:/14gracel/composer into issue-1267
commit b7b03ca10a8fe1e28515dff202364a12362cf0e7
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:04:59 2017 +0100
Generator updates
commit cb5fbf03174fb4e7ae79e8d645124ba8d3af79cb
Author: Simon Stone <sstone1@uk.ibm.com>
Date: Tue Jun 20 15:05:28 2017 +0800
Expose the select statement for a query (#1333)
commit e0bbe83741d4322ca0674adae5ca1eceedd81e62
Author: Matthew B White <mbwhite@users.noreply.github.com>
Date: Tue Jun 20 03:28:11 2017 +0100
remove rm from the insatgller (#1310)
commit bd1f8a047201359d79614db45b1e911dffbe96bc
Author: Matthew B White <mbwhite@users.noreply.github.com>
Date: Tue Jun 20 02:21:14 2017 +0100
drop in the detection script for live testing (#1286)
* drop in the detection script for live testing
* correct range variable
* updates
commit 968e8346fcbc882fb006782be806fe80b2865189
Author: Mark S. Lewis <mark_s_lewis@hotmail.com>
Date: Mon Jun 19 21:50:57 2017 +0100
Refactor and code tidy as part of #796 (#1296)
* 409: Use ValueGenerator strategy for generating resource values
* Use proper case for Data heading on Test page (#496)
* Change generate option to a string on composer-common.Factory functions
* Change sed command for better compatibility (#1)
Use the -i option instead of --in-place as this is a synonym but has better support across different versions of sed; in particular the default sed on MacOS only provides -i and not --in-place.
* Fix path name in weekly QA doc
* Refactor of Factory to remove duplicate code
Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com>
* Correct changelog.txt
Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com>
* Correct some logic errors getting class declarations
Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com>
* Increase unit test coverage
Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com>
* Message and unit test improvements.
Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com>
* Fix BusinessNetworkConnector tests for changes to error message text
Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com>
commit 83bc7524cf12a2a556881ff8ef5ccacfb89afbc2
Author: Nick Lincoln <nkl199@yahoo.co.uk>
Date: Mon Jun 19 16:18:17 2017 +0100
add auto scroll to selected item in list (#1307)
commit df0143716e11a2b80aa8b8a05bc8cd7ba58dfc29
Author: Daniel Selman <danscode@selman.org>
Date: Mon Jun 19 14:38:48 2017 +0100
Grammar, parser and model for queries (#1305)
* Fixed broken links in docs
* Workin in progress changes for query DSL
* wip
* wip
* unit testing
commit 7efadd9c75ecad35ee6ccc6ad86c1fadaa0a8cad
Author: caroline-church <cazfletch@gmail.com>
Date: Mon Jun 19 12:54:52 2017 +0100
Add Various Tests (#1311)
Added tests to add-connection-profile
Updated tests for connection-profile
Updated tests for connection-profile-data
Updated tests for basic models
commit 7b0b04183c75a7b5385592ca15dad48e8da50ccd
Author: caroline-church <cazfletch@gmail.com>
Date: Mon Jun 19 10:25:16 2017 +0100
Add Drag and Drop Tests (#1308)
Added tests for FileDragDropDirective
Removed random console.logs
Updated coverage requirements
commit ac7c4ea95faf3e3db4bf83c3037f3a08270c9839
Author: caroline-church <cazfletch@gmail.com>
Date: Mon Jun 19 09:25:37 2017 +0100
Fix Multiple Scroll Bars (#1280)
Fixed the problem with getting multiple scroll bars when create resources
commit 9cb27110e440a83fec99f6d1e8ef342d3de49394
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:04:59 2017 +0100
Generator updates
commit cccb309ae44c86b7ff1920163a76107ff4e76062
Merge: 57e976cd 3a437700
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 09:02:29 2017 +0100
Merge branch 'master' of github.com:/hyperledger/composer into issue-1267
commit ae44c3674696120a7267aa0daecc240b6b06712f
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Mon Jun 19 09:12:34 2017 +0100
Merge branch 'master' of github.com:/hyperledger/composer
commit 02fe1e7ba5580e6ec3e040d03ca7c2627adb24de
Merge: 8ac2f8a3 8b0b0fcf
Author: Liam Grace <14gracel@users.noreply.github.com>
Date: Mon Jun 19 09:04:31 2017 +0100
Merge branch 'master' into issue-321
commit 8ac2f8a390b3f72ca92f73ed1dfee3b137806c19
Merge: e92aaab8 f00849e9
Author: Liam Grace <14gracel@users.noreply.github.com>
Date: Fri Jun 16 15:28:02 2017 +0100
Merge branch 'master' into issue-321
commit e92aaab825e01c49e9fa1c18a8081bc31f266f2d
Merge: 51bedefd 14c4fb38
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Fri Jun 16 15:09:40 2017 +0100
Merge branch 'master' of github.com:/hyperledger/composer into issue-321
commit 51bedefd17ae4d6b3a6417c131390a11e6025754
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 13:41:14 2017 +0100
Added BaseModelException to make error messages more consistent and give access to location in all model exceptions
commit 43d52f25c1962be2e98db571e42fe845e3b89e41
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 16:26:36 2017 +0100
Fixed license issue
commit f5763ac918f057988faee39e4d8ecce10f0d445c
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 16:14:24 2017 +0100
Add model generator
commit 272d6abb870b852c8b52d88b827d841a1048760f
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 15:33:01 2017 +0100
eslint config changes
commit 4b5833a414a2060bc0cfd7052ef5a0e360c715e5
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 15:24:26 2017 +0100
Changed options to make generators more consistent
commit fb22e2c70a92017da2e8834c2717049d9be180ee
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 13:41:14 2017 +0100
Added IllegalModelDeclaration.getShortMessage and swapped around error messages
commit 57e976cd9f6f8bf612520ff637cbc600a31f47c8
Merge: 253d3a91 189b4d22
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Fri Jun 16 13:13:44 2017 +0100
Merge branch 'master' of github.com:/14gracel/composer
commit 253d3a913cc4cec7ff6fd8e9ca3b11025a6c2a58
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Fri Jun 16 13:09:06 2017 +0100
Unit tests to detect error location issues
commit 37f2b5731b6fa2e9da17ca11012e6a40189980d2
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Thu Jun 15 14:02:15 2017 +0100
Changed generator text
commit b46c66506b6d650960897506017da87547e24d6f
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Thu Jun 15 14:02:15 2017 +0100
Changed generator text
commit 56ed74b92d824bdc59272a29fb34c96253641a93
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 13:41:14 2017 +0100
Added BaseModelException to make error messages more consistent and give access to location in all model exceptions
commit cf8226378524f5289e605d73cbdd981d95d7889b
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 16:26:36 2017 +0100
Fixed license issue
commit 09d09dc98aae4f08feb69a356e2372f09ea831e9
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 15:33:01 2017 +0100
eslint config changes
commit 79fb13ba6794f2cfefd7526c8ea8a7d751ff1ca8
Author: EdMoffatt <EdMoffatt@users.noreply.github.com>
Date: Wed Jun 14 22:24:57 2017 +0100
Docs branch merge (#1274)
* Remove non https playground links and fix a typo on the homepage
* fix local install command
* Fix local install SVG and correct any typos of Yeoman
* 2 buttons on homepage, fixed install02 image, re-added footer to docs pages
* Reverting some unnecessary CSS changes, and fixing another diagram
* remove some more unnecessary css
* removing yet more unnecessary css, and an unnecessary image too
* Trying to force a diagram to actually update...
commit d5d125b33e10165b07cb535b058eea400fcbabba
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 16:26:36 2017 +0100
Fixed license issue
commit 9a6d28771eb85798dd0946fd2bbf4fd86d3dc4e5
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 16:14:24 2017 +0100
Add model generator
commit 6b97fcb65f4e16bdb829fc9d149e872bce021946
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 15:33:01 2017 +0100
eslint config changes
commit 34e0396a0b5b740194ab0ceb07860104c7e2bfab
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 15:24:26 2017 +0100
Changed options to make generators more consistent
commit ce41a5acb6e969ed000531b8c819bfabb71497e8
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 13:41:14 2017 +0100
Added IllegalModelDeclaration.getShortMessage and swapped around error messages
commit 189b4d222ef1fc9dec3f156011a501c222d6610b
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Fri Jun 16 13:09:06 2017 +0100
Unit tests to detect error location issues
commit 345e9b0a173dcb7e665e0d46ded4bd11635e01a3
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Thu Jun 15 14:02:15 2017 +0100
Changed generator text
commit b8ebb0b6ef3f4908c3ffd2ca6e6773b2fa3c0b84
Author: EdMoffatt <EdMoffatt@users.noreply.github.com>
Date: Wed Jun 14 22:24:57 2017 +0100
Docs branch merge (#1274)
* Remove non https playground links and fix a typo on the homepage
* fix local install command
* Fix local install SVG and correct any typos of Yeoman
* 2 buttons on homepage, fixed install02 image, re-added footer to docs pages
* Reverting some unnecessary CSS changes, and fixing another diagram
* remove some more unnecessary css
* removing yet more unnecessary css, and an unnecessary image too
* Trying to force a diagram to actually update...
commit c7b1fee05f3412cef452a99a3a0886c19414178e
Author: Matthew B White <mbwhite@users.noreply.github.com>
Date: Fri Jun 16 10:03:31 2017 +0100
contrib note update (#1279)
* contrib note update
* review commens addressed
commit d1542d645898511f495f8fda25391c875f888fc8
Author: Dave Kelsey <d_kelsey@uk.ibm.com>
Date: Thu Jun 15 19:35:55 2017 +0100
fix(cert): remove hostnameOverride defaults being generated (#1285)
Signed-off-by: Dave Kelsey <d_kelsey@uk.ibm.com>
commit 7d651a0b6c58a83497266d9c65d54dcd0094470f
Author: fabric-composer-app <github@fabric-composer.org>
Date: Thu Jun 15 15:10:12 2017 +0000
Automatic version bump to 0.8.1
commit 9aad93c23e98d7dea8ed5f310d9ce897879b4e63
Author: EdProsser <edward.prosser@uk.ibm.com>
Date: Thu Jun 15 14:38:34 2017 +0100
fixes from release testing (#1284)
* Updates for work
* Adding Installing Index to ToC
* Removing Fabric Composer name
* Removing Fabric composer name
* Moving images for REST API doc
* Fabric Composer Name removal
* Fabric Composer name removal
* Other name changes (Stack Overflow, GitHub, Rocket.Chat, JavaScript)
* wording updates and bug splats
* ToC Updates
* HLv1 docs updates, couple more bug splats.
* Last edit for HLv1
* Whoops, bug splat
* Another bug splat...
* Quick fixes prereqs navbar
* intro diagram fix and bug fixes
* Fixes and updates
* Rollback optional script for v1.0
* QoL changes and rollback changes - Quickstart
* Link fixes
* Atom links fix, formatting fix
* Odd formatting fix.
* Name change and codeblock fix
* More odd formatting fixes
* Ubuntu root user doc fix + draft of bnd doc changes
* update for CLI define + deploy BNA
* last bnd update
* Events and bug fixes
* Last event thing
* Updates for #803 and #822
* removing unnecessary stuff
* Undeploy support #673
* Clarifications on undeploy
* Commit?
* Revert "Commit?"
This reverts commit 909456849dddc1b02c4e769629033031dd8c1780.
* Quick Fixes
* Quick fix for connection profile keyvalstore
* Updates to show events docs in ToC
* Quick fixes
* Last minute docs updates.
* changes from issue #912
Signed-off-by: Edward Prosser <edward.prosser@uk.ibm.com>
* Version 1 auto-generating landing pages
* Docs Updates week 2
* 1 more set of updates
* last changes
* HLFV1 Beta and Query (#1247) (#1255)
System and unit tests
Rich query support for fabric V1 alpha
Alpha 2 Support
* Move HLF v0.6 to use Duktape instead of Otto (#1257)
* Connection profile, identity import, logic.js
* Query v0.1
* Connection profile, Query, Security, Dev Guide
* Security updates for local playground
* Last minute updates
* Release test fixes
* Image fix
commit 66ab5bf100c851a00feb816c32a799e23db3ea76
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Thu Jun 15 14:02:15 2017 +0100
Changed generator text
commit 8bf88762ba05676afb011cd4e4f143cbe242a7f8
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 13:41:14 2017 +0100
Added BaseModelException to make error messages more consistent and give access to location in all model exceptions
commit eedf477c346c140384bac85bbc875f5a2058286b
Merge: e1cd479e 395d8e15
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Thu Jun 15 09:36:56 2017 +0100
Merge branch 'master' of github.com:/14gracel/composer
commit e1cd479e8539eb11ee6314b470f73b755436dc4e
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 16:26:36 2017 +0100
Fixed license issue
commit bc5e830e2df2f79490a9129ea04474c7eb8409fe
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 16:14:24 2017 +0100
Add model generator
commit 77215a81840bdd9a1cb25683dee50b7c9713b02b
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 15:33:01 2017 +0100
eslint config changes
commit 425d0e3f4b9e7267449d59caf1ad8ad8fe98b041
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 15:24:26 2017 +0100
Changed options to make generators more consistent
commit f62adb0a1f2a91bccc7873c068705de2581f22d3
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 13:41:14 2017 +0100
Added IllegalModelDeclaration.getShortMessage and swapped around error messages
commit 395d8e15ad7cf328a7fb6a3d071ef6cef7593b86
Author: EdMoffatt <EdMoffatt@users.noreply.github.com>
Date: Wed Jun 14 22:24:57 2017 +0100
Docs branch merge (#1274)
* Remove non https playground links and fix a typo on the homepage
* fix local install command
* Fix local install SVG and correct any typos of Yeoman
* 2 buttons on homepage, fixed install02 image, re-added footer to docs pages
* Reverting some unnecessary CSS changes, and fixing another diagram
* remove some more unnecessary css
* removing yet more unnecessary css, and an unnecessary image too
* Trying to force a diagram to actually update...
commit 7fb19361da3923383ddb8f41f0c9965bc488944c
Author: Dave Kelsey <d_kelsey@uk.ibm.com>
Date: Wed Jun 14 16:23:10 2017 +0100
Remove ccid conversion (#1275)
* first pass of removing ccid conversion
Signed-off-by: Dave Kelsey <d_kelsey@uk.ibm.com>
* re-add admin, adminpw, address business network name when running inside runtime.
Signed-off-by: Dave Kelsey <d_kelsey@uk.ibm.com>
* system test changes to non dot business network names
Signed-off-by: Dave Kelsey <d_kelsey@uk.ibm.com>
commit 244314fdd36f22d87af0841bdbe84ed21dc5f449
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 16:26:36 2017 +0100
Fixed license issue
commit feb5ed0ffe735b07e872c75e9d415a9c61a7d54f
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 16:14:24 2017 +0100
Add model generator
commit 9efd1dcb11ea056e4420b1facd6f7b6172da3ffa
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 15:33:01 2017 +0100
eslint config changes
commit 36f8bda2bd38fa82372a6416699c1a336829da6b
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 15:24:26 2017 +0100
Changed options to make generators more consistent
commit b01f58ef88f8c53f4c2a7f1052c334d802ae0a97
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 13:41:14 2017 +0100
Added IllegalModelDeclaration.getShortMessage and swapped around error messages
* Fix generator and exception issues
commit 46673b8debbc1bc06e942481d0f0cee3d55e814d
Merge: d3769fe9 7b9f895f
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 11:23:25 2017 +0100
Merge branch 'issue-321' of github.com:/14gracel/composer into issue-321
commit d3769fe9dccf4ea520a6ee0f1f1a0e882629e8fa
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:34:18 2017 +0100
Merges
commit 165f5f80b6ae3605868afcb84c3f99fc690a9c7e
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:55:23 2017 +0100
Fix illegalmodelexception
commit 9b1ad31ca8f4656f244ff520c9c2fdaed8df2271
Merge: 725f3821 94f4b79b
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:41:59 2017 +0100
Merge branch 'issue-321' of github.com:/14gracel/composer into issue-321
commit 94f4b79b631fec9e4ef89824b1a969a23c77fb7f
Merge: 51bedefd 725f3821
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Fri Jun 16 15:09:40 2017 +0100
Merge branch 'master' of github.com:/hyperledger/composer into issue-321
commit 725f3821a099602cc68f782aa248a9edb859dd8a
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:36:40 2017 +0100
fix predicate
commit 2964c561879c563a4eb98679f71ab0192576d02a
Merge: aa747b8f bc14a8a8
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:35:30 2017 +0100
Merge branches 'issue-1267' and 'issue-1267' of github.com:/14gracel/composer into issue-1267
commit bc14a8a8127cd6db873bc70b4c9e7a31d62ed944
Merge: aa747b8f e390dbde
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:23:43 2017 +0100
Merge branch 'issue-1267' of github.com:/14gracel/composer into issue-1267
commit e390dbde69753f40baaefa8cc8b1da3470bb76ee
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:04:59 2017 +0100
Generator updates
commit b8885b3625b205ff393a6ebe058f5367a0e40e53
Merge: 48ebf3a6 aa747b8f
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 09:02:29 2017 +0100
Merge branch 'master' of github.com:/hyperledger/composer into issue-1267
commit aa747b8f86c23ab262a4debbdf4176fcd90c224a
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:34:18 2017 +0100
Merges
commit b52b45f3a574d2a9deed272edc11203ff818d3e1
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:04:59 2017 +0100
Generator updates
commit 89fd043908c213b6b6c5225f1663f905e99577b4
Merge: 99b5a979 1f3fe00e
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:30:31 2017 +0100
Merge branch 'master' of github.com:/hyperledger/composer
commit 1f3fe00e77eb55bc4683b07143311513f85b24ff
Author: Dave Kelsey <d_kelsey@uk.ibm.com>
Date: Fri Jun 16 15:26:33 2017 +0100
Fix cert issues in playground (#1299)
Signed-off-by: Dave Kelsey <d_kelsey@uk.ibm.com>
commit 99b5a97972b9229fd4f973fc69750d98aedce2bd
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Mon Jun 19 09:12:34 2017 +0100
Merge branch 'master' of github.com:/hyperledger/composer
commit 48ebf3a692d38abacb78bfdab160b13857036952
Merge: 134c916a 189b4d22
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Fri Jun 16 13:13:44 2017 +0100
Merge branch 'master' of github.com:/14gracel/composer
commit 134c916ae38aee2df7463b95193a30a50a894c6d
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Thu Jun 15 14:02:15 2017 +0100
Changed generator text
commit 590cddeffb0d4372f1e34c996ce98db611097c3c
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Thu Jun 15 14:02:15 2017 +0100
Changed generator text
commit 57c4c8c1ee08472b12bd762d2dfa8463dc0d8f96
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 13:41:14 2017 +0100
Added BaseModelException to make error messages more consistent and give access to location in all model exceptions
commit 0c4e682a4bbbbc3c5fe7ec52c156d261ab8c0e8e
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 16:26:36 2017 +0100
Fixed license issue
commit a05bc85636ba8654b7cb60806e7bf3345114dcdf
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 15:33:01 2017 +0100
eslint config changes
commit cab79d84aba7f2838339fd4a74fc1521a7a98a13
Author: EdMoffatt <EdMoffatt@users.noreply.github.com>
Date: Wed Jun 14 22:24:57 2017 +0100
Docs branch merge (#1274)
* Remove non https playground links and fix a typo on the homepage
* fix local install command
* Fix local install SVG and correct any typos of Yeoman
* 2 buttons on homepage, fixed install02 image, re-added footer to docs pages
* Reverting some unnecessary CSS changes, and fixing another diagram
* remove some more unnecessary css
* removing yet more unnecessary css, and an unnecessary image too
* Trying to force a diagram to actually update...
commit 8db8b29716541f3c0f6fb9c81458fd571ab9675e
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 16:26:36 2017 +0100
Fixed license issue
commit e222346c632abb7f3ed85cb246a550272f8989c5
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 16:14:24 2017 +0100
Add model generator
commit d5435ca6d2aba37b56789b46e9d4d639d08325c1
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 15:33:01 2017 +0100
eslint config changes
commit 9bad69660c2db45b94ae0a7c400dbb68ceae0b51
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 15:24:26 2017 +0100
Changed options to make generators more consistent
commit 3676e35593a624b94636e20e2ccbe24fc698288b
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 13:41:14 2017 +0100
Added IllegalModelDeclaration.getShortMessage and swapped around error messages
commit 7b9f895f94b607263af2809672a63c1a7f53b1b0
Merge: 86045db1 2f46c735
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 11:01:38 2017 +0100
Merge branch 'issue-321' of github.com:/14gracel/composer into issue-321
commit 86045db1771c2fd6bb29dce56e914b62894d08db
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:55:23 2017 +0100
Fix illegalmodelexception
commit 660374be7071656f4138921b6e2c343e36e9172f
Merge: bde6e67f 02fe1e7b
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:41:59 2017 +0100
Merge branch 'issue-321' of github.com:/14gracel/composer into issue-321
commit bde6e67f388fe720f7a6cb9486358e207b5600fd
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:36:40 2017 +0100
fix predicate
commit e0909026c6287bdc0ce8039f126586a5156e869f
Merge: c5149daf 238e2070
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:35:30 2017 +0100
Merge branches 'issue-1267' and 'issue-1267' of github.com:/14gracel/composer into issue-1267
commit c5149dafd0ebc886af1dbc675651415b17d9fd8e
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:34:18 2017 +0100
Merges
commit 2f46c7350eb867a5c11df87a8995626c250faca3
Merge: 076f7f28 02fe1e7b
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:41:59 2017 +0100
Merge branch 'issue-321' of github.com:/14gracel/composer into issue-321
commit 076f7f28fad6665722b1677cead56e71e2af0f60
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:36:40 2017 +0100
fix predicate
commit 90eca2cc1846461855d7a532652a39b1bec39db7
Merge: c7e958d6 238e2070
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:35:30 2017 +0100
Merge branches 'issue-1267' and 'issue-1267' of github.com:/14gracel/composer into issue-1267
commit c7e958d61ac565c675b8349421a7d381a46d5bc7
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:34:18 2017 +0100
Merges
commit afae7504dacfab72434bbceea4521bba5015f69a
Author: Simon Stone <sstone1@uk.ibm.com>
Date: Tue Jun 20 15:05:28 2017 +0800
Expose the select statement for a query (#1333)
commit 62eedd52bfaf7eaa66abf91ed225bee171e3ce53
Author: Mark S. Lewis <mark_s_lewis@hotmail.com>
Date: Mon Jun 19 21:50:57 2017 +0100
Refactor and code tidy as part of #796 (#1296)
* 409: Use ValueGenerator strategy for generating resource values
* Use proper case for Data heading on Test page (#496)
* Change generate option to a string on composer-common.Factory functions
* Change sed command for better compatibility (#1)
Use the -i option instead of --in-place as this is a synonym but has better support across different versions of sed; in particular the default sed on MacOS only provides -i and not --in-place.
* Fix path name in weekly QA doc
* Refactor of Factory to remove duplicate code
Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com>
* Correct changelog.txt
Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com>
* Correct some logic errors getting class declarations
Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com>
* Increase unit test coverage
Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com>
* Message and unit test improvements.
Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com>
* Fix BusinessNetworkConnector tests for changes to error message text
Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com>
commit c66d6f7e1c0cba9f48aed50c2ad6d23e2fc1964d
Author: Daniel Selman <danscode@selman.org>
Date: Mon Jun 19 14:38:48 2017 +0100
Grammar, parser and model for queries (#1305)
* Fixed broken links in docs
* Workin in progress changes for query DSL
* wip
* wip
* unit testing
commit 574838b5eba3781ae7b79c395bede7d0119f4dd8
Author: caroline-church <cazfletch@gmail.com>
Date: Mon Jun 19 12:54:52 2017 +0100
Add Various Tests (#1311)
Added tests to add-connection-profile
Updated tests for connection-profile
Updated tests for connection-profile-data
Updated tests for basic models
commit 101a7cc39df953164a3f1304c752ccd8ec4b5a1e
Author: caroline-church <cazfletch@gmail.com>
Date: Mon Jun 19 10:25:16 2017 +0100
Add Drag and Drop Tests (#1308)
Added tests for FileDragDropDirective
Removed random console.logs
Updated coverage requirements
commit 60615a3e9ee308618275dde6e98667612478f88e
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:04:59 2017 +0100
Generator updates
commit bc3f605e59f5043ab71d93c2a4448b0392986919
Merge: ae44c367 8931b3b1
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:30:31 2017 +0100
Merge branch 'master' of github.com:/hyperledger/composer
commit 238e2070844778108c75a0f70f1335a407b4eae3
Merge: b7b03ca1 9cb27110
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:23:43 2017 +0100
Merge branch 'issue-1267' of github.com:/14gracel/composer into issue-1267
commit b7b03ca10a8fe1e28515dff202364a12362cf0e7
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:04:59 2017 +0100
Generator updates
commit cb5fbf03174fb4e7ae79e8d645124ba8d3af79cb
Author: Simon Stone <sstone1@uk.ibm.com>
Date: Tue Jun 20 15:05:28 2017 +0800
Expose the select statement for a query (#1333)
commit e0bbe83741d4322ca0674adae5ca1eceedd81e62
Author: Matthew B White <mbwhite@users.noreply.github.com>
Date: Tue Jun 20 03:28:11 2017 +0100
remove rm from the insatgller (#1310)
commit bd1f8a047201359d79614db45b1e911dffbe96bc
Author: Matthew B White <mbwhite@users.noreply.github.com>
Date: Tue Jun 20 02:21:14 2017 +0100
drop in the detection script for live testing (#1286)
* drop in the detection script for live testing
* correct range variable
* updates
commit 968e8346fcbc882fb006782be806fe80b2865189
Author: Mark S. Lewis <mark_s_lewis@hotmail.com>
Date: Mon Jun 19 21:50:57 2017 +0100
Refactor and code tidy as part of #796 (#1296)
* 409: Use ValueGenerator strategy for generating resource values
* Use proper case for Data heading on Test page (#496)
* Change generate option to a string on composer-common.Factory functions
* Change sed command for better compatibility (#1)
Use the -i option instead of --in-place as this is a synonym but has better support across different versions of sed; in particular the default sed on MacOS only provides -i and not --in-place.
* Fix path name in weekly QA doc
* Refactor of Factory to remove duplicate code
Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com>
* Correct changelog.txt
Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com>
* Correct some logic errors getting class declarations
Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com>
* Increase unit test coverage
Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com>
* Message and unit test improvements.
Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com>
* Fix BusinessNetworkConnector tests for changes to error message text
Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com>
commit 83bc7524cf12a2a556881ff8ef5ccacfb89afbc2
Author: Nick Lincoln <nkl199@yahoo.co.uk>
Date: Mon Jun 19 16:18:17 2017 +0100
add auto scroll to selected item in list (#1307)
commit df0143716e11a2b80aa8b8a05bc8cd7ba58dfc29
Author: Daniel Selman <danscode@selman.org>
Date: Mon Jun 19 14:38:48 2017 +0100
Grammar, parser and model for queries (#1305)
* Fixed broken links in docs
* Workin in progress changes for query DSL
* wip
* wip
* unit testing
commit 7efadd9c75ecad35ee6ccc6ad86c1fadaa0a8cad
Author: caroline-church <cazfletch@gmail.com>
Date: Mon Jun 19 12:54:52 2017 +0100
Add Various Tests (#1311)
Added tests to add-connection-profile
Updated tests for connection-profile
Updated tests for connection-profile-data
Updated tests for basic models
commit 7b0b04183c75a7b5385592ca15dad48e8da50ccd
Author: caroline-church <cazfletch@gmail.com>
Date: Mon Jun 19 10:25:16 2017 +0100
Add Drag and Drop Tests (#1308)
Added tests for FileDragDropDirective
Removed random console.logs
Updated coverage requirements
commit ac7c4ea95faf3e3db4bf83c3037f3a08270c9839
Author: caroline-church <cazfletch@gmail.com>
Date: Mon Jun 19 09:25:37 2017 +0100
Fix Multiple Scroll Bars (#1280)
Fixed the problem with getting multiple scroll bars when create resources
commit 9cb27110e440a83fec99f6d1e8ef342d3de49394
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:04:59 2017 +0100
Generator updates
commit cccb309ae44c86b7ff1920163a76107ff4e76062
Merge: 57e976cd 3a437700
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 09:02:29 2017 +0100
Merge branch 'master' of github.com:/hyperledger/composer into issue-1267
commit ae44c3674696120a7267aa0daecc240b6b06712f
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Mon Jun 19 09:12:34 2017 +0100
Merge branch 'master' of github.com:/hyperledger/composer
commit 02fe1e7ba5580e6ec3e040d03ca7c2627adb24de
Merge: 8ac2f8a3 8b0b0fcf
Author: Liam Grace <14gracel@users.noreply.github.com>
Date: Mon Jun 19 09:04:31 2017 +0100
Merge branch 'master' into issue-321
commit 8ac2f8a390b3f72ca92f73ed1dfee3b137806c19
Merge: e92aaab8 f00849e9
Author: Liam Grace <14gracel@users.noreply.github.com>
Date: Fri Jun 16 15:28:02 2017 +0100
Merge branch 'master' into issue-321
commit e92aaab825e01c49e9fa1c18a8081bc31f266f2d
Merge: 51bedefd 14c4fb38
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Fri Jun 16 15:09:40 2017 +0100
Merge branch 'master' of github.com:/hyperledger/composer into issue-321
commit 51bedefd17ae4d6b3a6417c131390a11e6025754
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 13:41:14 2017 +0100
Added BaseModelException to make error messages more consistent and give access to location in all model exceptions
commit 43d52f25c1962be2e98db571e42fe845e3b89e41
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 16:26:36 2017 +0100
Fixed license issue
commit f5763ac918f057988faee39e4d8ecce10f0d445c
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 16:14:24 2017 +0100
Add model generator
commit 272d6abb870b852c8b52d88b827d841a1048760f
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 15:33:01 2017 +0100
eslint config changes
commit 4b5833a414a2060bc0cfd7052ef5a0e360c715e5
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 15:24:26 2017 +0100
Changed options to make generators more consistent
commit fb22e2c70a92017da2e8834c2717049d9be180ee
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 13:41:14 2017 +0100
Added IllegalModelDeclaration.getShortMessage and swapped around error messages
commit 57e976cd9f6f8bf612520ff637cbc600a31f47c8
Merge: 253d3a91 189b4d22
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Fri Jun 16 13:13:44 2017 +0100
Merge branch 'master' of github.com:/14gracel/composer
commit 253d3a913cc4cec7ff6fd8e9ca3b11025a6c2a58
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Fri Jun 16 13:09:06 2017 +0100
Unit tests to detect error location issues
commit 37f2b5731b6fa2e9da17ca11012e6a40189980d2
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Thu Jun 15 14:02:15 2017 +0100
Changed generator text
commit b46c66506b6d650960897506017da87547e24d6f
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Thu Jun 15 14:02:15 2017 +0100
Changed generator text
commit 56ed74b92d824bdc59272a29fb34c96253641a93
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 13:41:14 2017 +0100
Added BaseModelException to make error messages more consistent and give access to location in all model exceptions
commit cf8226378524f5289e605d73cbdd981d95d7889b
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 16:26:36 2017 +0100
Fixed license issue
commit 09d09dc98aae4f08feb69a356e2372f09ea831e9
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 15:33:01 2017 +0100
eslint config changes
commit 79fb13ba6794f2cfefd7526c8ea8a7d751ff1ca8
Author: EdMoffatt <EdMoffatt@users.noreply.github.com>
Date: Wed Jun 14 22:24:57 2017 +0100
Docs branch merge (#1274)
* Remove non https playground links and fix a typo on the homepage
* fix local install command
* Fix local install SVG and correct any typos of Yeoman
* 2 buttons on homepage, fixed install02 image, re-added footer to docs pages
* Reverting some unnecessary CSS changes, and fixing another diagram
* remove some more unnecessary css
* removing yet more unnecessary css, and an unnecessary image too
* Trying to force a diagram to actually update...
commit d5d125b33e10165b07cb535b058eea400fcbabba
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 16:26:36 2017 +0100
Fixed license issue
commit 9a6d28771eb85798dd0946fd2bbf4fd86d3dc4e5
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 16:14:24 2017 +0100
Add model generator
commit 6b97fcb65f4e16bdb829fc9d149e872bce021946
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 15:33:01 2017 +0100
eslint config changes
commit 34e0396a0b5b740194ab0ceb07860104c7e2bfab
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 15:24:26 2017 +0100
Changed options to make generators more consistent
commit ce41a5acb6e969ed000531b8c819bfabb71497e8
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 13:41:14 2017 +0100
Added IllegalModelDeclaration.getShortMessage and swapped around error messages
commit 189b4d222ef1fc9dec3f156011a501c222d6610b
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Fri Jun 16 13:09:06 2017 +0100
Unit tests to detect error location issues
commit 345e9b0a173dcb7e665e0d46ded4bd11635e01a3
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Thu Jun 15 14:02:15 2017 +0100
Changed generator text
commit b8ebb0b6ef3f4908c3ffd2ca6e6773b2fa3c0b84
Author: EdMoffatt <EdMoffatt@users.noreply.github.com>
Date: Wed Jun 14 22:24:57 2017 +0100
Docs branch merge (#1274)
* Remove non https playground links and fix a typo on the homepage
* fix local install command
* Fix local install SVG and correct any typos of Yeoman
* 2 buttons on homepage, fixed install02 image, re-added footer to docs pages
* Reverting some unnecessary CSS changes, and fixing another diagram
* remove some more unnecessary css
* removing yet more unnecessary css, and an unnecessary image too
* Trying to force a diagram to actually update...
commit c7b1fee05f3412cef452a99a3a0886c19414178e
Author: Matthew B White <mbwhite@users.noreply.github.com>
Date: Fri Jun 16 10:03:31 2017 +0100
contrib note update (#1279)
* contrib note update
* review commens addressed
commit d1542d645898511f495f8fda25391c875f888fc8
Author: Dave Kelsey <d_kelsey@uk.ibm.com>
Date: Thu Jun 15 19:35:55 2017 +0100
fix(cert): remove hostnameOverride defaults being generated (#1285)
Signed-off-by: Dave Kelsey <d_kelsey@uk.ibm.com>
commit 7d651a0b6c58a83497266d9c65d54dcd0094470f
Author: fabric-composer-app <github@fabric-composer.org>
Date: Thu Jun 15 15:10:12 2017 +0000
Automatic version bump to 0.8.1
commit 9aad93c23e98d7dea8ed5f310d9ce897879b4e63
Author: EdProsser <edward.prosser@uk.ibm.com>
Date: Thu Jun 15 14:38:34 2017 +0100
fixes from release testing (#1284)
* Updates for work
* Adding Installing Index to ToC
* Removing Fabric Composer name
* Removing Fabric composer name
* Moving images for REST API doc
* Fabric Composer Name removal
* Fabric Composer name removal
* Other name changes (Stack Overflow, GitHub, Rocket.Chat, JavaScript)
* wording updates and bug splats
* ToC Updates
* HLv1 docs updates, couple more bug splats.
* Last edit for HLv1
* Whoops, bug splat
* Another bug splat...
* Quick fixes prereqs navbar
* intro diagram fix and bug fixes
* Fixes and updates
* Rollback optional script for v1.0
* QoL changes and rollback changes - Quickstart
* Link fixes
* Atom links fix, formatting fix
* Odd formatting fix.
* Name change and codeblock fix
* More odd formatting fixes
* Ubuntu root user doc fix + draft of bnd doc changes
* update for CLI define + deploy BNA
* last bnd update
* Events and bug fixes
* Last event thing
* Updates for #803 and #822
* removing unnecessary stuff
* Undeploy support #673
* Clarifications on undeploy
* Commit?
* Revert "Commit?"
This reverts commit 909456849dddc1b02c4e769629033031dd8c1780.
* Quick Fixes
* Quick fix for connection profile keyvalstore
* Updates to show events docs in ToC
* Quick fixes
* Last minute docs updates.
* changes from issue #912
Signed-off-by: Edward Prosser <edward.prosser@uk.ibm.com>
* Version 1 auto-generating landing pages
* Docs Updates week 2
* 1 more set of updates
* last changes
* HLFV1 Beta and Query (#1247) (#1255)
System and unit tests
Rich query support for fabric V1 alpha
Alpha 2 Support
* Move HLF v0.6 to use Duktape instead of Otto (#1257)
* Connection profile, identity import, logic.js
* Query v0.1
* Connection profile, Query, Security, Dev Guide
* Security updates for local playground
* Last minute updates
* Release test fixes
* Image fix
commit 66ab5bf100c851a00feb816c32a799e23db3ea76
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Thu Jun 15 14:02:15 2017 +0100
Changed generator text
commit 8bf88762ba05676afb011cd4e4f143cbe242a7f8
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 13:41:14 2017 +0100
Added BaseModelException to make error messages more consistent and give access to location in all model exceptions
commit eedf477c346c140384bac85bbc875f5a2058286b
Merge: e1cd479e 395d8e15
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Thu Jun 15 09:36:56 2017 +0100
Merge branch 'master' of github.com:/14gracel/composer
commit e1cd479e8539eb11ee6314b470f73b755436dc4e
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 16:26:36 2017 +0100
Fixed license issue
commit bc5e830e2df2f79490a9129ea04474c7eb8409fe
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 16:14:24 2017 +0100
Add model generator
commit 77215a81840bdd9a1cb25683dee50b7c9713b02b
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 15:33:01 2017 +0100
eslint config changes
commit 425d0e3f4b9e7267449d59caf1ad8ad8fe98b041
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 15:24:26 2017 +0100
Changed options to make generators more consistent
commit f62adb0a1f2a91bccc7873c068705de2581f22d3
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 13:41:14 2017 +0100
Added IllegalModelDeclaration.getShortMessage and swapped around error messages
commit 395d8e15ad7cf328a7fb6a3d071ef6cef7593b86
Author: EdMoffatt <EdMoffatt@users.noreply.github.com>
Date: Wed Jun 14 22:24:57 2017 +0100
Docs branch merge (#1274)
* Remove non https playground links and fix a typo on the homepage
* fix local install command
* Fix local install SVG and correct any typos of Yeoman
* 2 buttons on homepage, fixed install02 image, re-added footer to docs pages
* Reverting some unnecessary CSS changes, and fixing another diagram
* remove some more unnecessary css
* removing yet more unnecessary css, and an unnecessary image too
* Trying to force a diagram to actually update...
commit 7fb19361da3923383ddb8f41f0c9965bc488944c
Author: Dave Kelsey <d_kelsey@uk.ibm.com>
Date: Wed Jun 14 16:23:10 2017 +0100
Remove ccid conversion (#1275)
* first pass of removing ccid conversion
Signed-off-by: Dave Kelsey <d_kelsey@uk.ibm.com>
* re-add admin, adminpw, address business network name when running inside runtime.
Signed-off-by: Dave Kelsey <d_kelsey@uk.ibm.com>
* system test changes to non dot business network names
Signed-off-by: Dave Kelsey <d_kelsey@uk.ibm.com>
commit 244314fdd36f22d87af0841bdbe84ed21dc5f449
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 16:26:36 2017 +0100
Fixed license issue
commit feb5ed0ffe735b07e872c75e9d415a9c61a7d54f
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 16:14:24 2017 +0100
Add model generator
commit 9efd1dcb11ea056e4420b1facd6f7b6172da3ffa
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 15:33:01 2017 +0100
eslint config changes
commit 36f8bda2bd38fa82372a6416699c1a336829da6b
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 15:24:26 2017 +0100
Changed options to make generators more consistent
commit b01f58ef88f8c53f4c2a7f1052c334d802ae0a97
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 13:41:14 2017 +0100
Added IllegalModelDeclaration.getShortMessage and swapped around error messages
* Fixed file reference
* Fix generator and exception issues
commit 46673b8debbc1bc06e942481d0f0cee3d55e814d
Merge: d3769fe9 7b9f895f
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 11:23:25 2017 +0100
Merge branch 'issue-321' of github.com:/14gracel/composer into issue-321
commit d3769fe9dccf4ea520a6ee0f1f1a0e882629e8fa
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:34:18 2017 +0100
Merges
commit 165f5f80b6ae3605868afcb84c3f99fc690a9c7e
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:55:23 2017 +0100
Fix illegalmodelexception
commit 9b1ad31ca8f4656f244ff520c9c2fdaed8df2271
Merge: 725f3821 94f4b79b
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:41:59 2017 +0100
Merge branch 'issue-321' of github.com:/14gracel/composer into issue-321
commit 94f4b79b631fec9e4ef89824b1a969a23c77fb7f
Merge: 51bedefd 725f3821
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Fri Jun 16 15:09:40 2017 +0100
Merge branch 'master' of github.com:/hyperledger/composer into issue-321
commit 725f3821a099602cc68f782aa248a9edb859dd8a
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:36:40 2017 +0100
fix predicate
commit 2964c561879c563a4eb98679f71ab0192576d02a
Merge: aa747b8f bc14a8a8
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:35:30 2017 +0100
Merge branches 'issue-1267' and 'issue-1267' of github.com:/14gracel/composer into issue-1267
commit bc14a8a8127cd6db873bc70b4c9e7a31d62ed944
Merge: aa747b8f e390dbde
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:23:43 2017 +0100
Merge branch 'issue-1267' of github.com:/14gracel/composer into issue-1267
commit e390dbde69753f40baaefa8cc8b1da3470bb76ee
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:04:59 2017 +0100
Generator updates
commit b8885b3625b205ff393a6ebe058f5367a0e40e53
Merge: 48ebf3a6 aa747b8f
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 09:02:29 2017 +0100
Merge branch 'master' of github.com:/hyperledger/composer into issue-1267
commit aa747b8f86c23ab262a4debbdf4176fcd90c224a
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:34:18 2017 +0100
Merges
commit b52b45f3a574d2a9deed272edc11203ff818d3e1
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:04:59 2017 +0100
Generator updates
commit 89fd043908c213b6b6c5225f1663f905e99577b4
Merge: 99b5a979 1f3fe00e
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:30:31 2017 +0100
Merge branch 'master' of github.com:/hyperledger/composer
commit 1f3fe00e77eb55bc4683b07143311513f85b24ff
Author: Dave Kelsey <d_kelsey@uk.ibm.com>
Date: Fri Jun 16 15:26:33 2017 +0100
Fix cert issues in playground (#1299)
Signed-off-by: Dave Kelsey <d_kelsey@uk.ibm.com>
commit 99b5a97972b9229fd4f973fc69750d98aedce2bd
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Mon Jun 19 09:12:34 2017 +0100
Merge branch 'master' of github.com:/hyperledger/composer
commit 48ebf3a692d38abacb78bfdab160b13857036952
Merge: 134c916a 189b4d22
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Fri Jun 16 13:13:44 2017 +0100
Merge branch 'master' of github.com:/14gracel/composer
commit 134c916ae38aee2df7463b95193a30a50a894c6d
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Thu Jun 15 14:02:15 2017 +0100
Changed generator text
commit 590cddeffb0d4372f1e34c996ce98db611097c3c
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Thu Jun 15 14:02:15 2017 +0100
Changed generator text
commit 57c4c8c1ee08472b12bd762d2dfa8463dc0d8f96
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 13:41:14 2017 +0100
Added BaseModelException to make error messages more consistent and give access to location in all model exceptions
commit 0c4e682a4bbbbc3c5fe7ec52c156d261ab8c0e8e
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 16:26:36 2017 +0100
Fixed license issue
commit a05bc85636ba8654b7cb60806e7bf3345114dcdf
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 15:33:01 2017 +0100
eslint config changes
commit cab79d84aba7f2838339fd4a74fc1521a7a98a13
Author: EdMoffatt <EdMoffatt@users.noreply.github.com>
Date: Wed Jun 14 22:24:57 2017 +0100
Docs branch merge (#1274)
* Remove non https playground links and fix a typo on the homepage
* fix local install command
* Fix local install SVG and correct any typos of Yeoman
* 2 buttons on homepage, fixed install02 image, re-added footer to docs pages
* Reverting some unnecessary CSS changes, and fixing another diagram
* remove some more unnecessary css
* removing yet more unnecessary css, and an unnecessary image too
* Trying to force a diagram to actually update...
commit 8db8b29716541f3c0f6fb9c81458fd571ab9675e
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 16:26:36 2017 +0100
Fixed license issue
commit e222346c632abb7f3ed85cb246a550272f8989c5
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 16:14:24 2017 +0100
Add model generator
commit d5435ca6d2aba37b56789b46e9d4d639d08325c1
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 15:33:01 2017 +0100
eslint config changes
commit 9bad69660c2db45b94ae0a7c400dbb68ceae0b51
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 15:24:26 2017 +0100
Changed options to make generators more consistent
commit 3676e35593a624b94636e20e2ccbe24fc698288b
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Wed Jun 14 13:41:14 2017 +0100
Added IllegalModelDeclaration.getShortMessage and swapped around error messages
commit 7b9f895f94b607263af2809672a63c1a7f53b1b0
Merge: 86045db1 2f46c735
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 11:01:38 2017 +0100
Merge branch 'issue-321' of github.com:/14gracel/composer into issue-321
commit 86045db1771c2fd6bb29dce56e914b62894d08db
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:55:23 2017 +0100
Fix illegalmodelexception
commit 660374be7071656f4138921b6e2c343e36e9172f
Merge: bde6e67f 02fe1e7b
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:41:59 2017 +0100
Merge branch 'issue-321' of github.com:/14gracel/composer into issue-321
commit bde6e67f388fe720f7a6cb9486358e207b5600fd
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:36:40 2017 +0100
fix predicate
commit e0909026c6287bdc0ce8039f126586a5156e869f
Merge: c5149daf 238e2070
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:35:30 2017 +0100
Merge branches 'issue-1267' and 'issue-1267' of github.com:/14gracel/composer into issue-1267
commit c5149dafd0ebc886af1dbc675651415b17d9fd8e
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:34:18 2017 +0100
Merges
commit 2f46c7350eb867a5c11df87a8995626c250faca3
Merge: 076f7f28 02fe1e7b
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:41:59 2017 +0100
Merge branch 'issue-321' of github.com:/14gracel/composer into issue-321
commit 076f7f28fad6665722b1677cead56e71e2af0f60
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:36:40 2017 +0100
fix predicate
commit 90eca2cc1846461855d7a532652a39b1bec39db7
Merge: c7e958d6 238e2070
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:35:30 2017 +0100
Merge branches 'issue-1267' and 'issue-1267' of github.com:/14gracel/composer into issue-1267
commit c7e958d61ac565c675b8349421a7d381a46d5bc7
Author: Liam Grace <liamgrace.896@gmail.com>
Date: Tue Jun 20 10:34:18 2017 +0100
Merges
commit afae7504dacfab72434bbceea4521bba5015f69a
Author: Simon Stone <sstone1@uk.ibm.com>
Date: Tue Jun 20 15:05:28 2017 +0800
Expose the select statement for a query (#1333)
commit 62eedd52bfaf7eaa66abf91ed225bee171e3ce53
Author: Mark S. Lewis <mark_s_lewis@hotmail.com>
Date: Mon Jun 19 21:50:57 2017 +0100
Refactor and code tidy as part of #796 (#1296)
* 409: Use ValueGenerator strategy for generating resource values
* Use proper case for Data heading on Test page (#496)
* Change generate option to a string on composer-common.Factory functions
* Change sed command for better compatibility (#1)
Use the -i option instead of --in-place as this is a synonym but has better support across different versions of sed; in particular the default sed on MacOS only provides -i and not --in-place.
* Fix path name in weekly QA doc
* Refactor of Factory to remove duplicate code
Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com>
* Correct changelog.txt
Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com>
* Correct some logic errors getting class declarations
Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com>
* Increase unit test coverage
Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com>
* Message and unit test improvements.
Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com>
* Fix BusinessNetworkConnector tests for changes to error message text
Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com>
commit c66d6f7e1c0cba9f48aed50c2ad6d23e2fc1964d
Author: Daniel Selman <danscode@selman.o…
* Fix generator and exception issues commit 46673b8 Merge: d3769fe 7b9f895 Author: Liam Grace <liamgrace.896@gmail.com> Date: Tue Jun 20 11:23:25 2017 +0100 Merge branch 'issue-321' of github.com:/14gracel/composer into issue-321 commit d3769fe Author: Liam Grace <liamgrace.896@gmail.com> Date: Tue Jun 20 10:34:18 2017 +0100 Merges commit 165f5f8 Author: Liam Grace <liamgrace.896@gmail.com> Date: Tue Jun 20 10:55:23 2017 +0100 Fix illegalmodelexception commit 9b1ad31 Merge: 725f382 94f4b79 Author: Liam Grace <liamgrace.896@gmail.com> Date: Tue Jun 20 10:41:59 2017 +0100 Merge branch 'issue-321' of github.com:/14gracel/composer into issue-321 commit 94f4b79 Merge: 51bedef 725f382 Author: Liam Grace <liamgrace.896@gmail.com> Date: Fri Jun 16 15:09:40 2017 +0100 Merge branch 'master' of github.com:/hyperledger/composer into issue-321 commit 725f382 Author: Liam Grace <liamgrace.896@gmail.com> Date: Tue Jun 20 10:36:40 2017 +0100 fix predicate commit 2964c56 Merge: aa747b8 bc14a8a Author: Liam Grace <liamgrace.896@gmail.com> Date: Tue Jun 20 10:35:30 2017 +0100 Merge branches 'issue-1267' and 'issue-1267' of github.com:/14gracel/composer into issue-1267 commit bc14a8a Merge: aa747b8 e390dbd Author: Liam Grace <liamgrace.896@gmail.com> Date: Tue Jun 20 10:23:43 2017 +0100 Merge branch 'issue-1267' of github.com:/14gracel/composer into issue-1267 commit e390dbd Author: Liam Grace <liamgrace.896@gmail.com> Date: Tue Jun 20 10:04:59 2017 +0100 Generator updates commit b8885b3 Merge: 48ebf3a aa747b8 Author: Liam Grace <liamgrace.896@gmail.com> Date: Tue Jun 20 09:02:29 2017 +0100 Merge branch 'master' of github.com:/hyperledger/composer into issue-1267 commit aa747b8 Author: Liam Grace <liamgrace.896@gmail.com> Date: Tue Jun 20 10:34:18 2017 +0100 Merges commit b52b45f Author: Liam Grace <liamgrace.896@gmail.com> Date: Tue Jun 20 10:04:59 2017 +0100 Generator updates commit 89fd043 Merge: 99b5a97 1f3fe00 Author: Liam Grace <liamgrace.896@gmail.com> Date: Tue Jun 20 10:30:31 2017 +0100 Merge branch 'master' of github.com:/hyperledger/composer commit 1f3fe00 Author: Dave Kelsey <d_kelsey@uk.ibm.com> Date: Fri Jun 16 15:26:33 2017 +0100 Fix cert issues in playground (#1299) Signed-off-by: Dave Kelsey <d_kelsey@uk.ibm.com> commit 99b5a97 Author: Liam Grace <liamgrace.896@gmail.com> Date: Mon Jun 19 09:12:34 2017 +0100 Merge branch 'master' of github.com:/hyperledger/composer commit 48ebf3a Merge: 134c916 189b4d2 Author: Liam Grace <liamgrace.896@gmail.com> Date: Fri Jun 16 13:13:44 2017 +0100 Merge branch 'master' of github.com:/14gracel/composer commit 134c916 Author: Liam Grace <liamgrace.896@gmail.com> Date: Thu Jun 15 14:02:15 2017 +0100 Changed generator text commit 590cdde Author: Liam Grace <liamgrace.896@gmail.com> Date: Thu Jun 15 14:02:15 2017 +0100 Changed generator text commit 57c4c8c Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 13:41:14 2017 +0100 Added BaseModelException to make error messages more consistent and give access to location in all model exceptions commit 0c4e682 Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 16:26:36 2017 +0100 Fixed license issue commit a05bc85 Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 15:33:01 2017 +0100 eslint config changes commit cab79d8 Author: EdMoffatt <EdMoffatt@users.noreply.github.com> Date: Wed Jun 14 22:24:57 2017 +0100 Docs branch merge (#1274) * Remove non https playground links and fix a typo on the homepage * fix local install command * Fix local install SVG and correct any typos of Yeoman * 2 buttons on homepage, fixed install02 image, re-added footer to docs pages * Reverting some unnecessary CSS changes, and fixing another diagram * remove some more unnecessary css * removing yet more unnecessary css, and an unnecessary image too * Trying to force a diagram to actually update... commit 8db8b29 Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 16:26:36 2017 +0100 Fixed license issue commit e222346 Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 16:14:24 2017 +0100 Add model generator commit d5435ca Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 15:33:01 2017 +0100 eslint config changes commit 9bad696 Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 15:24:26 2017 +0100 Changed options to make generators more consistent commit 3676e35 Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 13:41:14 2017 +0100 Added IllegalModelDeclaration.getShortMessage and swapped around error messages commit 7b9f895 Merge: 86045db 2f46c73 Author: Liam Grace <liamgrace.896@gmail.com> Date: Tue Jun 20 11:01:38 2017 +0100 Merge branch 'issue-321' of github.com:/14gracel/composer into issue-321 commit 86045db Author: Liam Grace <liamgrace.896@gmail.com> Date: Tue Jun 20 10:55:23 2017 +0100 Fix illegalmodelexception commit 660374b Merge: bde6e67 02fe1e7 Author: Liam Grace <liamgrace.896@gmail.com> Date: Tue Jun 20 10:41:59 2017 +0100 Merge branch 'issue-321' of github.com:/14gracel/composer into issue-321 commit bde6e67 Author: Liam Grace <liamgrace.896@gmail.com> Date: Tue Jun 20 10:36:40 2017 +0100 fix predicate commit e090902 Merge: c5149da 238e207 Author: Liam Grace <liamgrace.896@gmail.com> Date: Tue Jun 20 10:35:30 2017 +0100 Merge branches 'issue-1267' and 'issue-1267' of github.com:/14gracel/composer into issue-1267 commit c5149da Author: Liam Grace <liamgrace.896@gmail.com> Date: Tue Jun 20 10:34:18 2017 +0100 Merges commit 2f46c73 Merge: 076f7f2 02fe1e7 Author: Liam Grace <liamgrace.896@gmail.com> Date: Tue Jun 20 10:41:59 2017 +0100 Merge branch 'issue-321' of github.com:/14gracel/composer into issue-321 commit 076f7f2 Author: Liam Grace <liamgrace.896@gmail.com> Date: Tue Jun 20 10:36:40 2017 +0100 fix predicate commit 90eca2c Merge: c7e958d 238e207 Author: Liam Grace <liamgrace.896@gmail.com> Date: Tue Jun 20 10:35:30 2017 +0100 Merge branches 'issue-1267' and 'issue-1267' of github.com:/14gracel/composer into issue-1267 commit c7e958d Author: Liam Grace <liamgrace.896@gmail.com> Date: Tue Jun 20 10:34:18 2017 +0100 Merges commit afae750 Author: Simon Stone <sstone1@uk.ibm.com> Date: Tue Jun 20 15:05:28 2017 +0800 Expose the select statement for a query (#1333) commit 62eedd5 Author: Mark S. Lewis <mark_s_lewis@hotmail.com> Date: Mon Jun 19 21:50:57 2017 +0100 Refactor and code tidy as part of #796 (#1296) * 409: Use ValueGenerator strategy for generating resource values * Use proper case for Data heading on Test page (#496) * Change generate option to a string on composer-common.Factory functions * Change sed command for better compatibility (#1) Use the -i option instead of --in-place as this is a synonym but has better support across different versions of sed; in particular the default sed on MacOS only provides -i and not --in-place. * Fix path name in weekly QA doc * Refactor of Factory to remove duplicate code Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com> * Correct changelog.txt Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com> * Correct some logic errors getting class declarations Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com> * Increase unit test coverage Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com> * Message and unit test improvements. Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com> * Fix BusinessNetworkConnector tests for changes to error message text Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com> commit c66d6f7 Author: Daniel Selman <danscode@selman.org> Date: Mon Jun 19 14:38:48 2017 +0100 Grammar, parser and model for queries (#1305) * Fixed broken links in docs * Workin in progress changes for query DSL * wip * wip * unit testing commit 574838b Author: caroline-church <cazfletch@gmail.com> Date: Mon Jun 19 12:54:52 2017 +0100 Add Various Tests (#1311) Added tests to add-connection-profile Updated tests for connection-profile Updated tests for connection-profile-data Updated tests for basic models commit 101a7cc Author: caroline-church <cazfletch@gmail.com> Date: Mon Jun 19 10:25:16 2017 +0100 Add Drag and Drop Tests (#1308) Added tests for FileDragDropDirective Removed random console.logs Updated coverage requirements commit 60615a3 Author: Liam Grace <liamgrace.896@gmail.com> Date: Tue Jun 20 10:04:59 2017 +0100 Generator updates commit bc3f605 Merge: ae44c36 8931b3b Author: Liam Grace <liamgrace.896@gmail.com> Date: Tue Jun 20 10:30:31 2017 +0100 Merge branch 'master' of github.com:/hyperledger/composer commit 238e207 Merge: b7b03ca 9cb2711 Author: Liam Grace <liamgrace.896@gmail.com> Date: Tue Jun 20 10:23:43 2017 +0100 Merge branch 'issue-1267' of github.com:/14gracel/composer into issue-1267 commit b7b03ca Author: Liam Grace <liamgrace.896@gmail.com> Date: Tue Jun 20 10:04:59 2017 +0100 Generator updates commit cb5fbf0 Author: Simon Stone <sstone1@uk.ibm.com> Date: Tue Jun 20 15:05:28 2017 +0800 Expose the select statement for a query (#1333) commit e0bbe83 Author: Matthew B White <mbwhite@users.noreply.github.com> Date: Tue Jun 20 03:28:11 2017 +0100 remove rm from the insatgller (#1310) commit bd1f8a0 Author: Matthew B White <mbwhite@users.noreply.github.com> Date: Tue Jun 20 02:21:14 2017 +0100 drop in the detection script for live testing (#1286) * drop in the detection script for live testing * correct range variable * updates commit 968e834 Author: Mark S. Lewis <mark_s_lewis@hotmail.com> Date: Mon Jun 19 21:50:57 2017 +0100 Refactor and code tidy as part of #796 (#1296) * 409: Use ValueGenerator strategy for generating resource values * Use proper case for Data heading on Test page (#496) * Change generate option to a string on composer-common.Factory functions * Change sed command for better compatibility (#1) Use the -i option instead of --in-place as this is a synonym but has better support across different versions of sed; in particular the default sed on MacOS only provides -i and not --in-place. * Fix path name in weekly QA doc * Refactor of Factory to remove duplicate code Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com> * Correct changelog.txt Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com> * Correct some logic errors getting class declarations Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com> * Increase unit test coverage Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com> * Message and unit test improvements. Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com> * Fix BusinessNetworkConnector tests for changes to error message text Signed-off-by: Mark S. Lewis <Mark_Lewis@uk.ibm.com> commit 83bc752 Author: Nick Lincoln <nkl199@yahoo.co.uk> Date: Mon Jun 19 16:18:17 2017 +0100 add auto scroll to selected item in list (#1307) commit df01437 Author: Daniel Selman <danscode@selman.org> Date: Mon Jun 19 14:38:48 2017 +0100 Grammar, parser and model for queries (#1305) * Fixed broken links in docs * Workin in progress changes for query DSL * wip * wip * unit testing commit 7efadd9 Author: caroline-church <cazfletch@gmail.com> Date: Mon Jun 19 12:54:52 2017 +0100 Add Various Tests (#1311) Added tests to add-connection-profile Updated tests for connection-profile Updated tests for connection-profile-data Updated tests for basic models commit 7b0b041 Author: caroline-church <cazfletch@gmail.com> Date: Mon Jun 19 10:25:16 2017 +0100 Add Drag and Drop Tests (#1308) Added tests for FileDragDropDirective Removed random console.logs Updated coverage requirements commit ac7c4ea Author: caroline-church <cazfletch@gmail.com> Date: Mon Jun 19 09:25:37 2017 +0100 Fix Multiple Scroll Bars (#1280) Fixed the problem with getting multiple scroll bars when create resources commit 9cb2711 Author: Liam Grace <liamgrace.896@gmail.com> Date: Tue Jun 20 10:04:59 2017 +0100 Generator updates commit cccb309 Merge: 57e976c 3a43770 Author: Liam Grace <liamgrace.896@gmail.com> Date: Tue Jun 20 09:02:29 2017 +0100 Merge branch 'master' of github.com:/hyperledger/composer into issue-1267 commit ae44c36 Author: Liam Grace <liamgrace.896@gmail.com> Date: Mon Jun 19 09:12:34 2017 +0100 Merge branch 'master' of github.com:/hyperledger/composer commit 02fe1e7 Merge: 8ac2f8a 8b0b0fc Author: Liam Grace <14gracel@users.noreply.github.com> Date: Mon Jun 19 09:04:31 2017 +0100 Merge branch 'master' into issue-321 commit 8ac2f8a Merge: e92aaab f00849e Author: Liam Grace <14gracel@users.noreply.github.com> Date: Fri Jun 16 15:28:02 2017 +0100 Merge branch 'master' into issue-321 commit e92aaab Merge: 51bedef 14c4fb3 Author: Liam Grace <liamgrace.896@gmail.com> Date: Fri Jun 16 15:09:40 2017 +0100 Merge branch 'master' of github.com:/hyperledger/composer into issue-321 commit 51bedef Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 13:41:14 2017 +0100 Added BaseModelException to make error messages more consistent and give access to location in all model exceptions commit 43d52f2 Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 16:26:36 2017 +0100 Fixed license issue commit f5763ac Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 16:14:24 2017 +0100 Add model generator commit 272d6ab Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 15:33:01 2017 +0100 eslint config changes commit 4b5833a Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 15:24:26 2017 +0100 Changed options to make generators more consistent commit fb22e2c Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 13:41:14 2017 +0100 Added IllegalModelDeclaration.getShortMessage and swapped around error messages commit 57e976c Merge: 253d3a9 189b4d2 Author: Liam Grace <liamgrace.896@gmail.com> Date: Fri Jun 16 13:13:44 2017 +0100 Merge branch 'master' of github.com:/14gracel/composer commit 253d3a9 Author: Liam Grace <liamgrace.896@gmail.com> Date: Fri Jun 16 13:09:06 2017 +0100 Unit tests to detect error location issues commit 37f2b57 Author: Liam Grace <liamgrace.896@gmail.com> Date: Thu Jun 15 14:02:15 2017 +0100 Changed generator text commit b46c665 Author: Liam Grace <liamgrace.896@gmail.com> Date: Thu Jun 15 14:02:15 2017 +0100 Changed generator text commit 56ed74b Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 13:41:14 2017 +0100 Added BaseModelException to make error messages more consistent and give access to location in all model exceptions commit cf82263 Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 16:26:36 2017 +0100 Fixed license issue commit 09d09dc Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 15:33:01 2017 +0100 eslint config changes commit 79fb13b Author: EdMoffatt <EdMoffatt@users.noreply.github.com> Date: Wed Jun 14 22:24:57 2017 +0100 Docs branch merge (#1274) * Remove non https playground links and fix a typo on the homepage * fix local install command * Fix local install SVG and correct any typos of Yeoman * 2 buttons on homepage, fixed install02 image, re-added footer to docs pages * Reverting some unnecessary CSS changes, and fixing another diagram * remove some more unnecessary css * removing yet more unnecessary css, and an unnecessary image too * Trying to force a diagram to actually update... commit d5d125b Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 16:26:36 2017 +0100 Fixed license issue commit 9a6d287 Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 16:14:24 2017 +0100 Add model generator commit 6b97fcb Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 15:33:01 2017 +0100 eslint config changes commit 34e0396 Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 15:24:26 2017 +0100 Changed options to make generators more consistent commit ce41a5a Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 13:41:14 2017 +0100 Added IllegalModelDeclaration.getShortMessage and swapped around error messages commit 189b4d2 Author: Liam Grace <liamgrace.896@gmail.com> Date: Fri Jun 16 13:09:06 2017 +0100 Unit tests to detect error location issues commit 345e9b0 Author: Liam Grace <liamgrace.896@gmail.com> Date: Thu Jun 15 14:02:15 2017 +0100 Changed generator text commit b8ebb0b Author: EdMoffatt <EdMoffatt@users.noreply.github.com> Date: Wed Jun 14 22:24:57 2017 +0100 Docs branch merge (#1274) * Remove non https playground links and fix a typo on the homepage * fix local install command * Fix local install SVG and correct any typos of Yeoman * 2 buttons on homepage, fixed install02 image, re-added footer to docs pages * Reverting some unnecessary CSS changes, and fixing another diagram * remove some more unnecessary css * removing yet more unnecessary css, and an unnecessary image too * Trying to force a diagram to actually update... commit c7b1fee Author: Matthew B White <mbwhite@users.noreply.github.com> Date: Fri Jun 16 10:03:31 2017 +0100 contrib note update (#1279) * contrib note update * review commens addressed commit d1542d6 Author: Dave Kelsey <d_kelsey@uk.ibm.com> Date: Thu Jun 15 19:35:55 2017 +0100 fix(cert): remove hostnameOverride defaults being generated (#1285) Signed-off-by: Dave Kelsey <d_kelsey@uk.ibm.com> commit 7d651a0 Author: fabric-composer-app <github@fabric-composer.org> Date: Thu Jun 15 15:10:12 2017 +0000 Automatic version bump to 0.8.1 commit 9aad93c Author: EdProsser <edward.prosser@uk.ibm.com> Date: Thu Jun 15 14:38:34 2017 +0100 fixes from release testing (#1284) * Updates for work * Adding Installing Index to ToC * Removing Fabric Composer name * Removing Fabric composer name * Moving images for REST API doc * Fabric Composer Name removal * Fabric Composer name removal * Other name changes (Stack Overflow, GitHub, Rocket.Chat, JavaScript) * wording updates and bug splats * ToC Updates * HLv1 docs updates, couple more bug splats. * Last edit for HLv1 * Whoops, bug splat * Another bug splat... * Quick fixes prereqs navbar * intro diagram fix and bug fixes * Fixes and updates * Rollback optional script for v1.0 * QoL changes and rollback changes - Quickstart * Link fixes * Atom links fix, formatting fix * Odd formatting fix. * Name change and codeblock fix * More odd formatting fixes * Ubuntu root user doc fix + draft of bnd doc changes * update for CLI define + deploy BNA * last bnd update * Events and bug fixes * Last event thing * Updates for #803 and #822 * removing unnecessary stuff * Undeploy support #673 * Clarifications on undeploy * Commit? * Revert "Commit?" This reverts commit 9094568. * Quick Fixes * Quick fix for connection profile keyvalstore * Updates to show events docs in ToC * Quick fixes * Last minute docs updates. * changes from issue #912 Signed-off-by: Edward Prosser <edward.prosser@uk.ibm.com> * Version 1 auto-generating landing pages * Docs Updates week 2 * 1 more set of updates * last changes * HLFV1 Beta and Query (#1247) (#1255) System and unit tests Rich query support for fabric V1 alpha Alpha 2 Support * Move HLF v0.6 to use Duktape instead of Otto (#1257) * Connection profile, identity import, logic.js * Query v0.1 * Connection profile, Query, Security, Dev Guide * Security updates for local playground * Last minute updates * Release test fixes * Image fix commit 66ab5bf Author: Liam Grace <liamgrace.896@gmail.com> Date: Thu Jun 15 14:02:15 2017 +0100 Changed generator text commit 8bf8876 Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 13:41:14 2017 +0100 Added BaseModelException to make error messages more consistent and give access to location in all model exceptions commit eedf477 Merge: e1cd479 395d8e1 Author: Liam Grace <liamgrace.896@gmail.com> Date: Thu Jun 15 09:36:56 2017 +0100 Merge branch 'master' of github.com:/14gracel/composer commit e1cd479 Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 16:26:36 2017 +0100 Fixed license issue commit bc5e830 Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 16:14:24 2017 +0100 Add model generator commit 77215a8 Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 15:33:01 2017 +0100 eslint config changes commit 425d0e3 Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 15:24:26 2017 +0100 Changed options to make generators more consistent commit f62adb0 Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 13:41:14 2017 +0100 Added IllegalModelDeclaration.getShortMessage and swapped around error messages commit 395d8e1 Author: EdMoffatt <EdMoffatt@users.noreply.github.com> Date: Wed Jun 14 22:24:57 2017 +0100 Docs branch merge (#1274) * Remove non https playground links and fix a typo on the homepage * fix local install command * Fix local install SVG and correct any typos of Yeoman * 2 buttons on homepage, fixed install02 image, re-added footer to docs pages * Reverting some unnecessary CSS changes, and fixing another diagram * remove some more unnecessary css * removing yet more unnecessary css, and an unnecessary image too * Trying to force a diagram to actually update... commit 7fb1936 Author: Dave Kelsey <d_kelsey@uk.ibm.com> Date: Wed Jun 14 16:23:10 2017 +0100 Remove ccid conversion (#1275) * first pass of removing ccid conversion Signed-off-by: Dave Kelsey <d_kelsey@uk.ibm.com> * re-add admin, adminpw, address business network name when running inside runtime. Signed-off-by: Dave Kelsey <d_kelsey@uk.ibm.com> * system test changes to non dot business network names Signed-off-by: Dave Kelsey <d_kelsey@uk.ibm.com> commit 244314f Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 16:26:36 2017 +0100 Fixed license issue commit feb5ed0 Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 16:14:24 2017 +0100 Add model generator commit 9efd1dc Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 15:33:01 2017 +0100 eslint config changes commit 36f8bda Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 15:24:26 2017 +0100 Changed options to make generators more consistent commit b01f58e Author: Liam Grace <liamgrace.896@gmail.com> Date: Wed Jun 14 13:41:14 2017 +0100 Added IllegalModelDeclaration.getShortMessage and swapped around error messages * Added debounce to stop playgorund hanging * Added debounce to stop playgorund hanging
Checklist
Issue/User story
Steps to Reproduce
Existing issues
Design of the fix
Validation of the fix
Automated Tests
What documentation has been provided for this pull request