Skip to content
This repository has been archived by the owner on Jul 1, 2022. It is now read-only.

chore: merge develop into master #14

Merged
merged 36 commits into from
Mar 18, 2018
Merged

chore: merge develop into master #14

merged 36 commits into from
Mar 18, 2018

Conversation

epiqueras
Copy link
Contributor

No description provided.

epiqueras and others added 30 commits January 30, 2018 09:58
Add new presentational components and the required mocks and tests to test them:

Components:

* Text Input (default, touched, valid, error)
* Typography Kit
* Dispute Card
* Nav Bar
* Toasts (info, message, success, error, confirm, etc)

Mocks:

* Timezone
* Current time

Also add the --pure-lockfile flag to the travis-ci install script.
* fix(create-reducer): check that reducer owns resource before reacting

* feat(disputes): fetch and display list of disputes

* feat(disputes): add disputes route

* docs(readme): commit .env file and add Meta Mask link

* feat(app): handle 404 routes

Closes #14

* feat(create-form-generator): implement wizard form

* feat(components): pad Page Not Found

* test(create-form-generator): test wizard form

* feat(components): implement table/list

* feat(disputes): implement list page

* feat(table): don't make parent take 100% height if not needed

* feat(testing-panel): finish implementing testing panel and form utils
* feat: add new redux utils and dapp-api flow

* chore(git): track .env file

* feat(dates): implement new date time string design

* feat(components): implement Notification Card

* feat(components): implement Balance Pie Chart

* feat(home): finish implementing home page UI

* feat(disputes): new column layout
* feat(components): implement Anchored List for dispute page

* feat(components): smooth-scroll and stacking in Anchored List

* feat(dispute): implement dispute/appeal details

* feat(dispute): implement evidence

* feat(dispute): implement ruling

* feat(ruling): hover over blocks

* docs: fix JSDoc tags

* refactor: clean up some comments

* feat(anchored-list): extend PureComponent

* ci(scripts): add kleros-js-scripts

* fix(dependencies): update kleros-js-scripts

* feat(env): new arbitrator

* feat(env): another arbitrator

* feat(arbitrator): activate PNK action and saga

* feat(arbitrator): activate PNK

* fix(dependencies): update broken version of kleros-api

* feat(disputes): show list of disputes and navigate to details page

* feat(dispute): pull in live data to dispute detail page
@epiqueras epiqueras merged commit 9a63883 into master Mar 18, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants