Sebastian Gerske
|
8b83b29c82
|
ignore line with bitwise operator
|
2018-10-30 08:10:04 +01:00 |
|
Sebastian Gerske
|
0860b5ebd7
|
Merge remote-tracking branch 'origin/develop' into feature/secret_store
|
2018-10-29 17:41:56 +01:00 |
|
Sebastian Gerske
|
df56556e87
|
added serviceAgreementTemplates, wip
|
2018-10-29 17:28:40 +01:00 |
|
Jernej Pregelj
|
4e52e10a4b
|
url fix
|
2018-10-29 16:55:32 +01:00 |
|
Jernej Pregelj
|
af376eb7ee
|
changes in search paths & type
|
2018-10-29 16:38:23 +01:00 |
|
Sebastian Gerske
|
bb6de972eb
|
added business objects form DIDRegistry and ServieAgreement, Added tests for DIDRegistry
|
2018-10-29 10:53:22 +01:00 |
|
Sebastian Gerske
|
61d27e082e
|
optimize import
|
2018-10-26 13:46:47 +02:00 |
|
Sebastian Gerske
|
fb5dcaf522
|
added secret store
|
2018-10-26 13:37:09 +02:00 |
|
Sebastian Gerske
|
dd227e74ed
|
merge
|
2018-10-26 12:16:40 +02:00 |
|
Sebastian Gerske
|
ee1dd8e30b
|
Merge remote-tracking branch 'origin/feature/search' into feature/secret_store
# Conflicts:
# src/models/Config.ts
# src/ocean/Ocean.ts
# test/config.ts
# test/keeper/ContractBase.test.ts
# test/keeper/ContractHandler.test.ts
# test/keeper/Keeper.test.ts
# test/ocean/Account.test.ts
# test/ocean/Asset.test.ts
# test/ocean/Ocean.test.ts
# test/ocean/Order.test.ts
|
2018-10-26 12:14:49 +02:00 |
|
Sebastian Gerske
|
43119ed606
|
added fetch mock
|
2018-10-26 11:57:26 +02:00 |
|
Sebastian Gerske
|
33b642c2c3
|
resolve merge conflicts
|
2018-10-26 10:57:40 +02:00 |
|
Sebastian Gerske
|
300918e687
|
merge develop
|
2018-10-26 10:48:53 +02:00 |
|
Sebastian Gerske
|
2063530297
|
Merge remote-tracking branch 'origin/develop' into feature/secret_store
# Conflicts:
# src/ocean/Ocean.ts
# test/ocean/Asset.test.ts
|
2018-10-26 10:46:32 +02:00 |
|
Sebastian Gerske
|
192eecc3ae
|
added searchAssets
|
2018-10-26 10:40:46 +02:00 |
|
Sebastian Gerske
|
b06cd5e303
|
rename provider -> aquarius
|
2018-10-25 17:26:26 +02:00 |
|
Sebastian Gerske
|
7eae00014e
|
added secret store
|
2018-10-25 17:18:57 +02:00 |
|
Sebastian Gerske
|
794b57ecd5
|
added config needed for the secret store
|
2018-10-25 17:17:24 +02:00 |
|
Sebastian Gerske
|
717ca1d07c
|
moved secret store to secret-store-client-js
|
2018-10-22 13:39:31 +02:00 |
|
Sebastian Gerske
|
b172a245b1
|
added encrypt and decrypt document
|
2018-10-22 12:46:27 +02:00 |
|
Sebastian Gerske
|
da5386f490
|
added holder for parity document key storage, wip, added unit tests
|
2018-10-22 09:06:36 +02:00 |
|
Sebastian Gerske
|
2662a7795b
|
added secret store connection
|
2018-10-19 13:42:24 +02:00 |
|
Sebastian Gerske
|
62e54032fb
|
added reference to the secret store lib ultra-wip
|
2018-10-18 16:03:26 +02:00 |
|
Sebastian Gerske
|
43a9306132
|
refactoring
|
2018-10-18 13:12:23 +02:00 |
|
Sebastian Gerske
|
7f5f7606dc
|
adapted changes from squid discussion, updated interface definition
|
2018-10-18 13:06:52 +02:00 |
|
Sebastian Gerske
|
c26ff3e594
|
reflect changes for trilobite
|
2018-10-18 12:02:40 +02:00 |
|
Sebastian Gerske
|
1b8aa52c40
|
next iteration
|
2018-10-18 09:19:10 +02:00 |
|
Sebastian Gerske
|
5719a667ea
|
added purchase functiuonality
|
2018-10-17 18:24:01 +02:00 |
|
Sebastian Gerske
|
9fb6f296f3
|
register returns string now instead of the asset again
|
2018-10-17 10:41:56 +02:00 |
|
Sebastian Gerske
|
c690cf3465
|
return string on register method because we dont need that asset back but the asset id.
|
2018-10-17 10:36:00 +02:00 |
|
Sebastian Gerske
|
0285c90d3c
|
optimize
|
2018-10-17 10:12:40 +02:00 |
|
Sebastian Gerske
|
61bd56ba54
|
fixed imports
|
2018-10-16 15:08:04 +02:00 |
|
Sebastian Gerske
|
7b904dc9b3
|
fixed imports
|
2018-10-16 15:02:44 +02:00 |
|
Sebastian Gerske
|
19201ef6e7
|
new squid design
|
2018-10-16 14:56:18 +02:00 |
|
Sebastian Gerske
|
a3e55f7352
|
adapt code rules from codacy
|
2018-10-11 14:16:59 +02:00 |
|
Sebastian Gerske
|
1cc9e2bcbf
|
removed obsolete config
|
2018-10-10 14:12:39 +02:00 |
|
Sebastian Gerske
|
ac18db1365
|
added order unit tests, refactoring
|
2018-10-10 11:02:00 +02:00 |
|
Sebastian Gerske
|
bac7c9e4f0
|
added unit tests, added code coverage
|
2018-10-09 15:24:36 +02:00 |
|
Sebastian Gerske
|
df0e6b57a6
|
tried to fix caseing
|
2018-10-09 11:12:37 +02:00 |
|
Sebastian Gerske
|
8c95036d99
|
tried to fix caseing
|
2018-10-09 11:12:08 +02:00 |
|
Sebastian Gerske
|
fbeae84eda
|
reworked event handling
|
2018-10-09 10:55:53 +02:00 |
|
Sebastian Gerske
|
d8b9248bad
|
migrate to web3
|
2018-10-05 16:16:48 +02:00 |
|
Sebastian Gerske
|
06fd240e56
|
fixed unit test
|
2018-10-05 16:12:54 +02:00 |
|
Sebastian Gerske
|
bd06445b82
|
interface changes, web3 migration
|
2018-10-05 12:34:31 +02:00 |
|
Sebastian Gerske
|
543af59cf3
|
use promise function of getId
|
2018-10-05 10:59:48 +02:00 |
|
Sebastian Gerske
|
b8ae411835
|
fixed web3 version evaluation
|
2018-10-04 16:17:32 +02:00 |
|
Sebastian Gerske
|
5db73589ee
|
added logging
|
2018-10-04 16:11:57 +02:00 |
|
Sebastian Gerske
|
f4f32ab402
|
reword event handling
|
2018-10-04 13:14:03 +02:00 |
|
Sebastian Gerske
|
02079ad012
|
fix codacy finding
|
2018-10-02 10:37:02 +02:00 |
|
Sebastian Gerske
|
5dbc868686
|
new linter styles
|
2018-10-02 10:06:26 +02:00 |
|