Skip to content
This repository was archived by the owner on Mar 8, 2020. It is now read-only.

Issue 1239 #1356

Merged
merged 8 commits into from
Jun 23, 2017
Merged

Issue 1239 #1356

merged 8 commits into from
Jun 23, 2017

Conversation

@liam-grace
Copy link
Contributor

@liam-grace liam-grace commented Jun 21, 2017

No description provided.

@liam-grace
Fix generator and exception issues
3f422a4 
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
@liam-grace
Added debounce to stop playgorund hanging
0156dc6
@liam-grace
Added debounce to stop playgorund hanging
f14c2cb
dselman
dselman reviewed Jun 21, 2017
View reviewed changes
Copy link
Contributor

@dselman dselman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@caroline-church Can you review this please.

@liam-grace liam-grace requested a review from cazfletch June 22, 2017 08:54
cazfletch
cazfletch previously requested changes Jun 22, 2017
View reviewed changes
Copy link
Contributor

@cazfletch cazfletch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new directive should have some tests

@liam-grace liam-grace requested a review from jt-nti June 22, 2017 16:14
jt-nti
jt-nti suggested changes Jun 23, 2017
View reviewed changes
Copy link
Contributor

@jt-nti jt-nti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. Just a left over console log to take out please

packages/composer-playground/src/app/directives/debounce/debounce.directive.ts Outdated
ngOnInit(): void {
const eventStream = Observable.fromEvent(this.elementRef.nativeElement, 'keyup')
.map(() => {
console.log('@14gracel');
Copy link
Contributor

@jt-nti jt-nti Jun 23, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left a console.log in there

@liam-grace
Copy link
Contributor Author

liam-grace commented Jun 23, 2017

Brill, thanks. Just updated

@jt-nti jt-nti dismissed cazfletch’s stale review June 23, 2017 09:42

Directive now has tests

@liam-grace liam-grace merged commit 724c31e into hyperledger-archives:master Jun 23, 2017
@liam-grace liam-grace deleted the issue-1239 branch July 14, 2017 15:54
@snyk-bot snyk-bot mentioned this pull request Sep 9, 2021
Open
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

3 more reviewers

@dselman dselman dselman left review comments

@jt-nti jt-nti jt-nti approved these changes

@cazfletch cazfletch cazfletch left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@liam-grace @dselman @jt-nti @cazfletch