Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge to master-2 #2110

Merged
merged 20 commits into from
Sep 12, 2020
Merged

merge to master-2 #2110

merged 20 commits into from
Sep 12, 2020

Commits on Sep 7, 2020

  1. 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
    roienatan authored and Oren Sokolowsky committed Sep 7, 2020
    Configuration menu
    Copy the full SHA
    48bcbed View commit details
    Browse the repository at this point in the history
  2. 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
    dkent600 authored and Oren Sokolowsky committed Sep 7, 2020
    Configuration menu
    Copy the full SHA
    97ec9ce View commit details
    Browse the repository at this point in the history
  3. Support DAOs sort by total holdings (#2085)

    * fething daos balances
    
    * Support for DAOs total holdings ; sorting by total holdings
    
    * Update translation.json
    
    Missing comma after resolving conflicts.
    roienatan authored and Oren Sokolowsky committed Sep 7, 2020
    Configuration menu
    Copy the full SHA
    cdf038a View commit details
    Browse the repository at this point in the history
  4. Minor adjustments due to changes in DAOs balances serivce that now re…

    …turns balances only for registered DAOs (#2089)
    roienatan authored and Oren Sokolowsky committed Sep 7, 2020
    Configuration menu
    Copy the full SHA
    fbd322a View commit details
    Browse the repository at this point in the history
  5. Updated chrome driver for tests (#2093)

    * 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.
    roienatan authored and Oren Sokolowsky committed Sep 7, 2020
    Configuration menu
    Copy the full SHA
    8428cec View commit details
    Browse the repository at this point in the history
  6. updated dependencies (#2096)

    roienatan authored and Oren Sokolowsky committed Sep 7, 2020
    Configuration menu
    Copy the full SHA
    2823dd5 View commit details
    Browse the repository at this point in the history
  7. automatically refresh voting status (#2102)

    roienatan authored and Oren Sokolowsky committed Sep 7, 2020
    Configuration menu
    Copy the full SHA
    973cd43 View commit details
    Browse the repository at this point in the history
  8. added default value and placeholder (#2091)

    * added default value and placeholder
    
    * removed default value
    
    * added dafualt value back
    
    * data field is now optional with default value
    
    * change text in placeholder
    roienatan authored and Oren Sokolowsky committed Sep 7, 2020
    Configuration menu
    Copy the full SHA
    eb3d39f View commit details
    Browse the repository at this point in the history
  9. Support for Join and FundingRequest proposals (read only) (#2099)

    roienatan authored and Oren Sokolowsky committed Sep 7, 2020
    Configuration menu
    Copy the full SHA
    a6cd6ab View commit details
    Browse the repository at this point in the history
  10. Update subgraph endpoints to v8_12 (#2108)

    * update subgraph enpoints to v8_12
    
    * also for mainnet
    roienatan authored and Oren Sokolowsky committed Sep 7, 2020
    Configuration menu
    Copy the full SHA
    0c823cc View commit details
    Browse the repository at this point in the history
  11. updated arc.js 54 (#2109)

    roienatan authored and Oren Sokolowsky committed Sep 7, 2020
    Configuration menu
    Copy the full SHA
    de690fa View commit details
    Browse the repository at this point in the history
  12. release dev-2 to master-2 (#2079)

    * 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>
    3 people authored and Oren Sokolowsky committed Sep 7, 2020
    Configuration menu
    Copy the full SHA
    98a3464 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2020

  1. Updated daocreator version (#2114)

    * updated daocreator version
    
    * updated package lock
    roienatan committed Sep 10, 2020
    Configuration menu
    Copy the full SHA
    fbcc3e5 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2020

  1. Configuration menu
    Copy the full SHA
    114ec90 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2020

  1. Fix bad ui when using autocomplete input in chrome (#2127)

    * fix bad ui when using autocomplete input in chrome
    
    * changes
    roienatan committed Sep 12, 2020
    Configuration menu
    Copy the full SHA
    3dae7f3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ec2c001 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8aa920b View commit details
    Browse the repository at this point in the history
  4. Eliminate fortawesome (#2129)

    * eliminate fortawesome
    
    * Update github.svg
    
    New line at EOF
    
    * missing fortawesome for dao creator
    
    * fix bad layout of an icon on Safari
    roienatan committed Sep 12, 2020
    Configuration menu
    Copy the full SHA
    a623a2f View commit details
    Browse the repository at this point in the history
  5. Create CODEOWNERS

    orenyodfat committed Sep 12, 2020
    Configuration menu
    Copy the full SHA
    2b0b818 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    a46bdff View commit details
    Browse the repository at this point in the history