268 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Matthias Kretschmann	1e02037a18	Merge branch 'master' into feature/assets-styling	2019-04-01 12:41:39 +02:00
Matthias Kretschmann	7b8a49c6e9	Merge pull request #41 from oceanprotocol/feature/oep-8-files ... update file metadata structure	2019-04-01 12:39:13 +02:00
Matthias Kretschmann	708dbf6936	Merge branch 'master' into feature/oep-8-files	2019-04-01 12:26:59 +02:00
Matthias Kretschmann	6fc52ff57a	Merge pull request #45 from oceanprotocol/feature/packages ... bump packages	2019-04-01 12:26:38 +02:00
Matthias Kretschmann	217bbfc9c8	travis tweaks to speed up builds	2019-04-01 12:20:42 +02:00
Matthias Kretschmann	78761cbe2d	bump packages	2019-04-01 12:12:20 +02:00
Matthias Kretschmann	213a9956b6	merge fix	2019-03-29 18:04:35 +01:00
Matthias Kretschmann	9cc5fb3a79	make amount of recent history items configurable	2019-03-29 18:04:35 +01:00
Matthias Kretschmann	6eda278f1b	fix search links	2019-03-29 18:04:34 +01:00
Matthias Kretschmann	e01da4293c	category images prototype ... * ref #30	2019-03-29 18:04:34 +01:00
Matthias Kretschmann	5a9ac24df1	files consume flow workaround and UX improvements	2019-03-29 18:04:34 +01:00
Matthias Kretschmann	a24a2b983e	fix consume flow	2019-03-29 18:04:34 +01:00
Matthias Kretschmann	1585a4a2f9	prepare retrieving and displaying files metadata	2019-03-29 18:04:34 +01:00
Matthias Kretschmann	2715acb2fb	fix user assets listing	2019-03-29 18:04:34 +01:00
Matthias Kretschmann	4977b28f1b	Files styling	2019-03-29 18:04:34 +01:00
Matthias Kretschmann	19c4d1c662	components reorganisation	2019-03-29 18:04:12 +01:00
Matthias Kretschmann	d4c8d05477	make AssetsUser component more usable	2019-03-29 18:04:12 +01:00
Matthias Kretschmann	17b955a815	Invoices -> History	2019-03-29 18:04:12 +01:00
Matthias Kretschmann	5b67e11f94	new list style for asset listing	2019-03-29 18:04:11 +01:00
Matthias Kretschmann	3fabfa7b35	Merge branch 'master' into feature/oep-8-files	2019-03-29 17:20:05 +01:00
Matthias Kretschmann	3c54a69fa9	Merge pull request #42 from oceanprotocol/feature/typography ... switch to @oceanprotocol/typographies package	2019-03-29 15:05:06 +01:00
Matthias Kretschmann	ecd5742b22	compression tweaks	2019-03-28 16:00:09 +01:00
Matthias Kretschmann	420e127190	switch to @oceanprotocol/typographies package	2019-03-28 15:25:46 +01:00
Matthias Kretschmann	df14f6bab2	Merge branch 'master' into feature/oep-8-files	2019-03-28 13:17:04 +01:00
Matthias Kretschmann	769d377bde	Merge pull request #39 from oceanprotocol/feature/dev-instructions ... dev instructions	2019-03-28 12:55:12 +01:00
Matthias Kretschmann	bfc0e6548a	update file metadata structure	2019-03-28 12:26:16 +01:00
Jernej Pregelj	205f1c448d	Merge branch 'master' into feature/dev-instructions	2019-03-28 10:14:33 +01:00
Jernej Pregelj	3a26cc39e0	Merge pull request #32 from oceanprotocol/feature/consume-flow ... consume flow	2019-03-28 10:13:47 +01:00
Matthias Kretschmann	fec194bc3f	add prerequisites	2019-03-27 15:46:26 +01:00
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