merge to master-2 #2110
Merged
merge to master-2 #2110
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Updated arc.js, test env and subgraph * join and quit --> join to match new arc.js * updated doc to Join instead of JoinAndQuit
* upgrade provider packages * update package-lock * remove webpack from dependencies * package-lock * lint * refactor, fix bugs * better console info on errors * clean up account profile loguc * remove unused webReducer stuff * merge conflict errors * added some i18next * upgrade provider packages * remove webpack from dependencies * package-lock * refactor, fix bugs * better console info on errors * clean up account profile loguc * merge conflict errors * added some i18next * package-lock * 3box fix for identity-wallet * fix bug in SAVE_THREEBOX * revert to 3box 1.20.3 * fix error in follow * remove Try Edit button * clean up canEdit logic * remove console.log statements * fix merge conflict * fix compile error * Update translation.json * update package-lock
* fething daos balances * Support for DAOs total holdings ; sorting by total holdings * Update translation.json Missing comma after resolving conflicts.
…turns balances only for registered DAOs (#2089)
* updated chrome driver for tests * updated version also for seleniumArgs * automatic update to the latest chrome driver * updated webdriverio * updated selenium * Update .travis.yml Removing auto version fetch as I'm not sure if it's working properly right now. Will check it next time.
* added default value and placeholder * removed default value * added dafualt value back * data field is now optional with default value * change text in placeholder
* update subgraph enpoints to v8_12 * also for mainnet
* Updated arc.js, test env and subgraph (#2072) * Updated arc.js, test env and subgraph * join and quit --> join to match new arc.js * updated doc to Join instead of JoinAndQuit * Plugin manager create proposal modal has a left border and padding like the other modals (#2071) * fix UI where votes screwed up (#2070) * Better UI for DAO history page (#2069) * Update documentation (#2062) * updated documentation regarding i18next * updated with global variables for styling * example added * better example * refactor and fix issues relating 3box operations (#2018) * upgrade provider packages * update package-lock * remove webpack from dependencies * package-lock * lint * refactor, fix bugs * better console info on errors * clean up account profile loguc * remove unused webReducer stuff * merge conflict errors * added some i18next * upgrade provider packages * remove webpack from dependencies * package-lock * refactor, fix bugs * better console info on errors * clean up account profile loguc * merge conflict errors * added some i18next * package-lock * 3box fix for identity-wallet * fix bug in SAVE_THREEBOX * revert to 3box 1.20.3 * fix error in follow * remove Try Edit button * clean up canEdit logic * remove console.log statements * fix merge conflict * fix compile error * Update translation.json * update package-lock * fix issue when a proposal card is not always clickable (#2077) * revert subgraph endpoint domain (#2078) Co-authored-by: roienatan <34843014+roienatan@users.noreply.github.com> Co-authored-by: Doug Kent <dkent600@users.noreply.github.com>
* updated daocreator version * updated package lock
* eliminate fortawesome * Update github.svg New line at EOF * missing fortawesome for dao creator * fix bad layout of an icon on Safari
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.