Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Task PM-671: Merge dev to master (#402)
* update readme and package.json * Task: Add Deploy/Build Steps for Olympia (#322) * test build * add deploy for olympia * allow dynamic import syntax when running jest * fix build * fix build * Update travis deployment script * Task PM-589: Refactor transactions page (#321) * Use oracle.outcome instead of inexisting oracle.winningOutcome PM-587 * Add transactions route PM-589" * Move actions, reducers, selectors, middlewares to src/store PM-589 * Move transactions actions,store, selectors to transactions route PM-589 * Refactor modal reducer PM-589 * Refactor notifications reducer PM-589 * Fix reducer/selector for notifications * Import fix * Finish notifications reducer PM-589 * remove unused import PM-589 * TXs selector WIP PM-589 * Use arrays instead of maps in components PM-589 * Remove unused import in TransactionFloaterContainer PM-589 * remove console.logs in selectors, fix tx model PM-589 * Fix notifications proptype PM-589 * convert tx record to a js object pm-589 * Load/dump middlewares WIP PM-589 * root reducer fix PM-589 * Fix failing test PM-589 * fix typos PM-589 * Small codestyle fix PM-589 * fix deploy for olympia * Task PM-602: Add ToS, PP and RDP to set mainnet address modal (#324) * Add fields to set mainnet address modal PM-602 * Add redux-form proptypes PM-602 * Add PP, TOS, RDP to set mainnet address modal PM-602 * Fix bugs for non-tournament builds, move tos pp and rdp to assets/content PM-602 * fix config overwrites * hotfix configuration issues * Bug PM-588: Styling bugs (#326) * Fix bunch of styling bugs PM-602 * Fix header styling * Update packages PM-588 * Update packages * Gnosisdb to tradingdb (#328) * Development to master (#312) * Refactor components to use CSS Modules (#307) * Refactor App, backdropprovider, marketDetail, notifications * Remove react-modal * Refactor App container * Fix eslint warnings * Fix notification icon * Update packages, fix animation * MenuAccountDropdown css modules * Trying to fix build * Trying to fix build * Configure bootstrap loader * Add normalize.css * Task/use css modules everywhere (#311) * Refactor App, backdropprovider, marketDetail, notifications * Remove react-modal * Refactor App container * Fix eslint warnings * Fix notification icon * Update packages, fix animation * MenuAccountDropdown css modules * Trying to fix build * Trying to fix build * Configure bootstrap loader * Add normalize.css * Load bootstrap table styles * add lauti to whitelist * fix casing for lautis address * Update README.md * Development to master (#319) * Refactor components to use CSS Modules (#307) * Refactor App, backdropprovider, marketDetail, notifications * Remove react-modal * Refactor App container * Fix eslint warnings * Fix notification icon * Update packages, fix animation * MenuAccountDropdown css modules * Trying to fix build * Trying to fix build * Configure bootstrap loader * Add normalize.css * Task/use css modules everywhere (#311) * Refactor App, backdropprovider, marketDetail, notifications * Remove react-modal * Refactor App container * Fix eslint warnings * Fix notification icon * Update packages, fix animation * MenuAccountDropdown css modules * Trying to fix build * Trying to fix build * Configure bootstrap loader * Add normalize.css * Load bootstrap table styles * Use oracle.outcome instead of inexisting oracle.winningOutcome PM-587 (#314) * Task PM-586: Use CSS modules in components (#313) * PM-586 Refactor TransactionFloater * Transaction floater proptypes fixPM-586 * Fix NoMarkets component PM-586 * Remove react-immutable-proptypes in prod PM-586 * master to dev (#318) * Development to master (#312) * Refactor components to use CSS Modules (#307) * Refactor App, backdropprovider, marketDetail, notifications * Remove react-modal * Refactor App container * Fix eslint warnings * Fix notification icon * Update packages, fix animation * MenuAccountDropdown css modules * Trying to fix build * Trying to fix build * Configure bootstrap loader * Add normalize.css * Task/use css modules everywhere (#311) * Refactor App, backdropprovider, marketDetail, notifications * Remove react-modal * Refactor App container * Fix eslint warnings * Fix notification icon * Update packages, fix animation * MenuAccountDropdown css modules * Trying to fix build * Trying to fix build * Configure bootstrap loader * Add normalize.css * Load bootstrap table styles * add lauti to whitelist * fix casing for lautis address * Update README.md * Development (#320) * Refactor components to use CSS Modules (#307) * Refactor App, backdropprovider, marketDetail, notifications * Remove react-modal * Refactor App container * Fix eslint warnings * Fix notification icon * Update packages, fix animation * MenuAccountDropdown css modules * Trying to fix build * Trying to fix build * Configure bootstrap loader * Add normalize.css * Task/use css modules everywhere (#311) * Refactor App, backdropprovider, marketDetail, notifications * Remove react-modal * Refactor App container * Fix eslint warnings * Fix notification icon * Update packages, fix animation * MenuAccountDropdown css modules * Trying to fix build * Trying to fix build * Configure bootstrap loader * Add normalize.css * Load bootstrap table styles * Use oracle.outcome instead of inexisting oracle.winningOutcome PM-587 (#314) * Task PM-586: Use CSS modules in components (#313) * PM-586 Refactor TransactionFloater * Transaction floater proptypes fixPM-586 * Fix NoMarkets component PM-586 * Remove react-immutable-proptypes in prod PM-586 * master to dev (#318) * Development to master (#312) * Refactor components to use CSS Modules (#307) * Refactor App, backdropprovider, marketDetail, notifications * Remove react-modal * Refactor App container * Fix eslint warnings * Fix notification icon * Update packages, fix animation * MenuAccountDropdown css modules * Trying to fix build * Trying to fix build * Configure bootstrap loader * Add normalize.css * Task/use css modules everywhere (#311) * Refactor App, backdropprovider, marketDetail, notifications * Remove react-modal * Refactor App container * Fix eslint warnings * Fix notification icon * Update packages, fix animation * MenuAccountDropdown css modules * Trying to fix build * Trying to fix build * Configure bootstrap loader * Add normalize.css * Load bootstrap table styles * add lauti to whitelist * fix casing for lautis address * Update README.md * updated dockerfile and added docker-compose (#315) * Fix icon name PM-595 (#317) * Update README.md * Task: Add Deploy/Build Steps for Olympia on Master (#323) * add deploy for olympia * fix build * fix build * fix deploy for olympia * fix config overwrites * hotfix configuration issues * hotfix configuration issues * Update config.json * Update config.json * Update config.json * Update config.json * Fix olympia dev config * Task PM-612: Filter markets by collateral token address from config (#330) * Filter markets by collateral token address from config PM-612 * Codestyle fix PM-612 * Use {} for collateral token config in case none is specified to prevent errors PM-612 * Update README.md * Update README.md * cherry-picked 2ac702 * cherry-picked 0d317d * Bug PM-626: Fix loader position (#341) * Fix loader position * Fix failing test * Fix overlap, fix expandable show condition, fix return sign PM-606 (#344) * fix: display current env only when running first time, reduces spam during build, fix: marketlist test sometimes failed (#332) (#350) * PM-445: implemented gas station for gasPrices (#333) (#351) [BACKMERGE] PM-445: implemented gas station for gasPrices (#333) * PM-618: Display WETH for Dashboard/Header (#334) (#352) * [BACKMERGE] BUG pm-620: interaction without accepting tos (#353) * PM-620: interaction not allowed anymore without accepting ToS (#336) * Simplify show condition * PM-608 do not destroy form state on unmount (#347) * PM-617: copy /assets to dist/assets on build (#337) (#355) * Bug/PM-619: Fix Marketlist Stats (#338) (#356) * PM-619: fix display of marketlist stats * PM-619: fix another test * PM-619: disable env logging for tests * Bug/PM-467: Add Loading Spinners to fields that show gas estimations (#339) (#357) * PM-467: add loading spinner to gas cost display * PM-467: fix tests to allow undefined as gascost/price values * [BACKMERGE] /bug/fix profits and balance dashboard (#359) * PM-618: Display WETH for Dashboard/Header (#334) * Bug: Fix problems with collateralToken, allowing to enter contractName to use as collateralToken (#340) * PM-618: Display WETH for Dashboard/Header * Refactor collateralToken * Implement ToS Acceptance localstorage load/save * Update config for staging * reset local config, update tests, fix collateralToken for all sources * update all configs * Fix failing imports & pass tests * [BACKMERGE] Task: Disable Analytics, abstracted into config entries (#348) (#360) * Task: Disable Analytics, abstracted into config entries (#348) * implement loader pattern for analytics stuff, implemented ga as analytics loader * reset default config * more robust check for existing window.ga * add optional chaining * Tests fix * Tests fix * Task PM-629: Legal Updates, add Imprint (#358) (#361) [BACKMERGE] Task PM-629: Legal Updates, add Imprint (#358) * [BACKMERGE] Task PM-633 PM-634: Update packages, update TOS modal, update footer text (#363) * Update packages, update TOS modal, update footer text PM-633 PM-634 * Remove console.log PM-633 PM-634 * [BACKMERGE] Bug PM-625: Interface goes blank after selecting market and then logging in (#365) * Fix loader styles, fix undefined target network id reference PM-625 * Remove console.log pm-625 * pm-639: cherry pick to dev (#367) * [BACKMERGE] BUG: Fix marketStatus utils to use moment's utc correctly (#368) * Fix marketStatus utils to use moment's utc correctly * Use isSameOrBefore for detecting ending soon market * [BACKMERGE] Task PM-640: Update ToS and PP (#371) * Update ToS and PP PM-640 * Fix PP PM-640 * Remove duplicate declaration (#372) * Use abstraction from gnosis.js and not contract instance (#376) * Save montserrat font locally PM-647 (#377) * hotfix: Add Giacomo to whitelist for staging and dev * Task PM-607: Notification icon is too close to the title (#378) * Fix compilation: remove import of inexsting selector getCollateralToken PM-607 * Fix notifications styles PM-607 * Fix staging configuration PM-607 * Fix typo in tooltip PM-636 * Fix olympia configuration PM-627 (#382) * Fix modal close button PM-614 (#381) * TASK PM-616: Move contants to settings (#380) * Move constants to settings PM-616 * Remove unused state PM-616 * Hotfix: Game guide export * Hotfix: fix notification timeout constant name * Bug PM-630: Header/Dashboard shows 0 OLY balance (#383) * Configure olympia for testing PM-651 * Fix travis config PM-651 * Update build env script for olympia testing env PM-651 * Add missing bracket pm-651 * Add mini-css-extract-plugin PM-651 * Update bootstrap-loader settings PM-651 * Update webpack configuration PM-651 * Update whitelist PM-651 * Convert token balance to a string PM-630 * use tokenAmountString PM-630 * call .toString in api call PM-630 * Fix the condition for showing reward claim box PM-653 (#385) * HOTFIX: Update registration contract address * Remove TXs page link from header PM-657 (#389) * Task PM-660: Filter trades and shares by collateral token (#387) * Filter trades and shares PM-660 * Make function argument's name more common PM-660 * Update packages PM-660 * Fix header, fix buy shares validation PM-655 (#392) * Bug PM-658: The rank number and the badge icon are not display in the Dashboard (#391) * Fix display of badges PM-658 * Use decimalToText PM-658 * BUG PM-628: Selling the min amount of tokens (0.000000000000000001) makes a transaction error in some markets (#394) * Configure olympia for testing PM-651 * Fix travis config PM-651 * Update build env script for olympia testing env PM-651 * Add missing bracket pm-651 * Add mini-css-extract-plugin PM-651 * Update bootstrap-loader settings PM-651 * Update webpack configuration PM-651 * Update whitelist PM-651 * Set NODE_ENV in webpack.dev.config.js PM-628 * Add validation check for 0 earnings PM-628 * remove node_Env definition from defineplugin PM-628 * Fix webpack.dev.config.js codestlye PM-628 * Request tournament user data only if interface is configured as tournament PM-628 * Fix error message PM-628 * BUG PM-641: The user creates a new account and the interface does not ask to accept terms and conditions (#395) * Add ToS, PP and RDP PM-641 * Small markup fix PM-641 * Remove 'Powered by gnosis' from logo PM-665 (#396) * Add WETH balance to ETH balance PM-666 (#397) * Add markdown viewer to market's description PM-648 (#401) * Task PM-668: Remove "Show Only My Markets" from Olympia and Mainnet (#400) * Remove 'My markets' filter PM-668 * remove unused proptypes and imports PM-668 * Remove unused import PM-668 * Fix conflict PM-671 * Codestyle fixes PM-671 * fix failing build PM-671
- Loading branch information
