239 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jernej Pregelj	1ce9d3ef72	category error fix	2019-03-26 17:42:24 +01:00
Jernej Pregelj	e6a3fe6ec1	consume flow working with brizo accounts	2019-03-26 16:10:07 +01:00
Jernej Pregelj	5bf25d4622	Merge pull request #37 from oceanprotocol/fix/publish-categories ... fix publishing nested categories in array	2019-03-26 10:55:53 +01:00
Jernej Pregelj	d134e025a4	fix publishing nested categories in array	2019-03-26 10:48:32 +01:00
Jernej Pregelj	07f6d22a36	npm install	2019-03-25 16:26:26 +01:00
Jernej Pregelj	8de81991df	Merge branch 'master' into feature/consume-flow	2019-03-25 16:23:34 +01:00
Matthias Kretschmann	92cdbbe50f	Merge pull request #35 from oceanprotocol/feature/dev ... More simple dev setup for client/server split	2019-03-25 16:09:37 +01:00
Jernej Pregelj	da361c98ff	linting	2019-03-25 15:27:43 +01:00
Jernej Pregelj	c6f1e35c54	Merge branch 'master' into feature/consume-flow	2019-03-25 15:25:31 +01:00
Jernej Pregelj	60203d1e43	Merge branch 'feature/consume-flow' of https://github.com/oceanprotocol/commons-marketplace into feature/consume-flow	2019-03-25 15:23:21 +01:00
Jernej Pregelj	5aa574455a	squid-js use new functions	2019-03-25 15:22:45 +01:00
Matthias Kretschmann	95be609eff	cleanup	2019-03-25 13:45:56 +01:00
Matthias Kretschmann	5282044ea8	package.json updates	2019-03-25 13:13:55 +01:00
Matthias Kretschmann	b649289ab0	update client build command	2019-03-25 12:26:20 +01:00
Matthias Kretschmann	d79e7c28af	dependency updates	2019-03-25 12:06:26 +01:00
Matthias Kretschmann	2a0401be7f	testing tweaks	2019-03-25 11:52:24 +01:00
Matthias Kretschmann	c49fc85017	start command	2019-03-25 10:57:42 +01:00
Matthias Kretschmann	18741c02aa	global build script	2019-03-23 22:18:53 -03:00
Matthias Kretschmann	7e42991706	one dev interface for client & server	2019-03-23 22:10:00 -03:00
Jernej Pregelj	366f48b9ad	Merge pull request #34 from oceanprotocol/fix/frontend-fixes ... Fix/frontend fixes	2019-03-22 16:52:28 +01:00
Jernej Pregelj	50b5382cfb	linting	2019-03-22 15:46:52 +01:00
Jernej Pregelj	5b27c850d6	listing asset fixes, network name	2019-03-22 15:45:38 +01:00
Jernej Pregelj	b355fbe508	Merge pull request #33 from oceanprotocol/feature/changelog ... add changelog	2019-03-22 14:23:02 +01:00
Pedro Gutiérrez	f64ea2ac71	preventing errors showing not found assets	2019-03-22 13:38:22 +01:00
Jernej Pregelj	57ef7eecdf	add changelog	2019-03-22 10:05:25 +01:00
Jernej Pregelj	b823078bab	lint fixes	2019-03-21 12:24:51 +01:00
Jernej Pregelj	4890d2f27b	consume flow	2019-03-21 12:15:35 +01:00
Jernej Pregelj	853b78e1d9	Merge pull request #19 from oceanprotocol/feature/frontpage ... Front-page tweaks & user asset list	2019-03-20 15:59:34 +01:00
Jernej Pregelj	7555ced58b	merge	2019-03-20 15:27:00 +01:00
Jernej Pregelj	4da9c92f92	Merge pull request #29 from oceanprotocol/feature/invoice-view ... add invoice view	2019-03-20 12:37:05 +01:00
Jernej Pregelj	2fcaf39479	add readme	2019-03-20 12:16:51 +01:00
Jernej Pregelj	e1f690d90d	lint fixes	2019-03-20 12:08:28 +01:00
Jernej Pregelj	40d7b5f936	merge fix	2019-03-20 11:48:43 +01:00
Jernej Pregelj	165975ee53	merge	2019-03-20 11:43:13 +01:00
Jernej Pregelj	7f4ea34c2d	Merge pull request #28 from oceanprotocol/feature/microservice-urlchecker ... root app->/client, microservice in /server	2019-03-20 11:24:08 +01:00
Jernej Pregelj	601a0bd993	lint fixes	2019-03-20 10:52:53 +01:00
Jernej Pregelj	43d0847d48	display published	2019-03-20 10:49:37 +01:00
Jernej Pregelj	cd03398dcf	fix travis nodejs version	2019-03-11 11:12:54 +01:00
Jernej Pregelj	5a4d25ada1	add invoice view	2019-03-11 11:06:08 +01:00
Jernej Pregelj	165e4acd9d	style fixes	2019-03-07 15:30:52 +01:00
Jernej Pregelj	37d2f19c1b	travis node pinn	2019-03-07 15:06:43 +01:00
Jernej Pregelj	db98fdd077	travis script permissions	2019-03-07 15:02:10 +01:00
Jernej Pregelj	bf537c73d8	fix travis path	2019-03-07 14:57:55 +01:00
Jernej Pregelj	4bfc5e2802	setup travis	2019-03-07 14:56:07 +01:00
Jernej Pregelj	cd62912a6e	fix travis	2019-03-07 14:54:30 +01:00
Jernej Pregelj	bbf7df087d	root app->/client, microservice in /server	2019-03-07 14:41:27 +01:00
Jernej Pregelj	214c5358eb	Merge pull request #25 from oceanprotocol/feature/account-popup ... Account & Faucet UI	2019-03-05 15:36:13 +01:00
Jernej Pregelj	c52fa5d0bf	path fix	2019-03-05 15:21:41 +01:00
Jernej Pregelj	b95e7dfc9f	Merge branch 'master' into feature/account-popup	2019-03-05 15:05:01 +01:00
Jernej Pregelj	7f39b4eeb9	Merge pull request #23 from oceanprotocol/feature/publish-wizard ... New publish flow	2019-03-05 14:56:28 +01:00