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.

Sign up for GitHub

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

Jump to bottom

Foc integration Proof of Concept #21

Closed
wants to merge 907 commits into from
Closed

Foc integration Proof of Concept #21

wants to merge 907 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Apr 15, 2020

  1. fixed linting errors

    @emieldesmidt
    emieldesmidt committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    18fc44f View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/dao' into cast-Toggle

    @emieldesmidt
    emieldesmidt committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    d9455e3 View commit details
    Browse the repository at this point in the history

  3. fixed merge

    @emieldesmidt
    emieldesmidt committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    afe3910 View commit details
    Browse the repository at this point in the history

  4. Fix transfer funds block type bugs, refactor, cleanup

    @PJvanderLaan
    PJvanderLaan committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    ae83f20 View commit details
    Browse the repository at this point in the history

  5. Fix linting issues and completed bitcoin transaction alert

    @PJvanderLaan
    PJvanderLaan committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    906d8cc View commit details
    Browse the repository at this point in the history

  6. Fix completed transaction check bug

    @PJvanderLaan
    PJvanderLaan committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    c75bec3 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #9 from emieldesmidt/cast-Toggle 

    Cast toggle
    @PraveshMoelchand
    PraveshMoelchand authored Apr 15, 2020
    Configuration menu
    Copy the full SHA
    2ec9cec View commit details
    Browse the repository at this point in the history

  8. Show tally when clicking on vote

    @PraveshMoelchand
    PraveshMoelchand committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    acd028f View commit details
    Browse the repository at this point in the history

  9. Update kotlin-ipv8 version

    @PraveshMoelchand
    PraveshMoelchand committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    3669cec View commit details
    Browse the repository at this point in the history

  10. Add comments and documentation

    @PraveshMoelchand
    PraveshMoelchand committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    2fe5cdc View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2020

  1. added timestamp to information dialog box

    @emieldesmidt
    emieldesmidt committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    ba41c27 View commit details
    Browse the repository at this point in the history

  2. improved styling of information

    @emieldesmidt
    emieldesmidt committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    b685097 View commit details
    Browse the repository at this point in the history

  3. generified myPeerHasCasted to castedByPeer, to allow checking if spec… 

    …ific user has casted a vote (and with what result)
    @emieldesmidt
    emieldesmidt committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    ad4e9ab View commit details
    Browse the repository at this point in the history

  4. Disable user to cast vote if previously casted

    @emieldesmidt
    emieldesmidt committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    e5130d4 View commit details
    Browse the repository at this point in the history

  5. Provide more clear information about previous cast

    @emieldesmidt
    emieldesmidt committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    363b57a View commit details
    Browse the repository at this point in the history

  6. set uncasted proposals to be bold

    @emieldesmidt
    emieldesmidt committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    fb35c7a View commit details
    Browse the repository at this point in the history

  7. undo boldfacing due to unexpected behaviour

    @emieldesmidt
    emieldesmidt committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    2cd51a0 View commit details
    Browse the repository at this point in the history

  8. Cleanup, split coincommunity in helpers, remove redundant methods and… 

    … constants
    @PJvanderLaan
    PJvanderLaan committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    41781e4 View commit details
    Browse the repository at this point in the history

  9. Fix join wallet UI scrolling bug

    @PJvanderLaan
    PJvanderLaan committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    e29ac51 View commit details
    Browse the repository at this point in the history

  10. Implemented Pravesh his suggestion

    @emieldesmidt
    emieldesmidt committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    4c34f1a View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' into ui_improvement 

    # Conflicts:
#	currencyii/src/main/res/navigation/nav_graph.xml
    @InvictusRMC
    InvictusRMC committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    f9d13b3 View commit details
    Browse the repository at this point in the history

  12. Reduce crawling timeout wallet discovery, broadcast signature requests

    @PJvanderLaan
    PJvanderLaan committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    0866261 View commit details
    Browse the repository at this point in the history

  13. Add tally to dialog instead of toast

    @PraveshMoelchand
    PraveshMoelchand committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    ee1f6bc View commit details
    Browse the repository at this point in the history

  14. Add fab to my wallet

    @InvictusRMC
    InvictusRMC committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    e08f022 View commit details
    Browse the repository at this point in the history

  15. Revert changes in CoinCommunity

    @InvictusRMC
    InvictusRMC committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    0f56be2 View commit details
    Browse the repository at this point in the history

  16. Add proposal mokup to myDaos

    @InvictusRMC
    InvictusRMC committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    4be745f View commit details
    Browse the repository at this point in the history

  17. Merge pull request #10 from emieldesmidt/add_vote_tally 

    Add vote tally
    @emieldesmidt
    emieldesmidt authored Apr 16, 2020
    Configuration menu
    Copy the full SHA
    9c09e09 View commit details
    Browse the repository at this point in the history

  18. Fix pipeline by temporarily removing tests

    @MKuijpers
    MKuijpers committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    a477be5 View commit details
    Browse the repository at this point in the history

  19. Merge remote-tracking branch 'origin/dao' into more-details 

    # Conflicts:
#	voting/src/main/java/nl/tudelft/trustchain/voting/VotingActivity.kt
    @PraveshMoelchand
    PraveshMoelchand committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    7909fe7 View commit details
    Browse the repository at this point in the history

  20. Fix formatting

    @PraveshMoelchand
    PraveshMoelchand committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    7ec9a78 View commit details
    Browse the repository at this point in the history

  21. Merge pull request #12 from emieldesmidt/more-details 

    More details
    @PraveshMoelchand
    PraveshMoelchand authored Apr 16, 2020
    Configuration menu
    Copy the full SHA
    e767863 View commit details
    Browse the repository at this point in the history

  22. Merge pull request #12 from InvictusRMC/fix-join-wallet 

    Create, join, transfer bug fixes
    @brian2509
    brian2509 authored Apr 16, 2020
    Configuration menu
    Copy the full SHA
    4dfd34d View commit details
    Browse the repository at this point in the history

  23. Consistent use of 'proposal'

    @PraveshMoelchand
    PraveshMoelchand committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    1480f8f View commit details
    Browse the repository at this point in the history

  24. Consistent use of 'proposal' (forgot a couple)

    @PraveshMoelchand
    PraveshMoelchand committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    7610afd View commit details
    Browse the repository at this point in the history

  25. Remove unused files

    @PraveshMoelchand
    PraveshMoelchand committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    35f4071 View commit details
    Browse the repository at this point in the history

  26. Apparently this file is used after all

    @PraveshMoelchand
    PraveshMoelchand committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    99ce22b View commit details
    Browse the repository at this point in the history

  27. Merge pull request #13 from emieldesmidt/fix_textual_errors 

    Fix textual errors
    @PraveshMoelchand
    PraveshMoelchand authored Apr 16, 2020
    Configuration menu
    Copy the full SHA
    1604f95 View commit details
    Browse the repository at this point in the history

  28. Add more tests

    @dymbe
    dymbe committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    1e34dc7 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2020

  1. style input box in the alert dialog

    @emieldesmidt
    emieldesmidt committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    42fd2a0 View commit details
    Browse the repository at this point in the history

  2. set margins to better align

    @emieldesmidt
    emieldesmidt committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    62b16c7 View commit details
    Browse the repository at this point in the history

  3. set margins to better align

    @emieldesmidt
    emieldesmidt committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    6243f4c View commit details
    Browse the repository at this point in the history

  4. more indicative hint

    @emieldesmidt
    emieldesmidt committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    76e6bd2 View commit details
    Browse the repository at this point in the history

  5. changed list to a cardview list

    @emieldesmidt
    emieldesmidt committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    a44e1e8 View commit details
    Browse the repository at this point in the history

  6. Improved layout

    @emieldesmidt
    emieldesmidt committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    61786b6 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #10 from emieldesmidt/dao 

    Initial voting GUI
    @MattSkala
    MattSkala authored Apr 17, 2020
    Configuration menu
    Copy the full SHA
    59c577d View commit details
    Browse the repository at this point in the history

  8. removed unused import

    @emieldesmidt
    emieldesmidt committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    115cae6 View commit details
    Browse the repository at this point in the history

  9. Improved layout of main screen

    @emieldesmidt
    emieldesmidt committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    f810ebc View commit details
    Browse the repository at this point in the history

  10. removed unused import.

    @emieldesmidt
    emieldesmidt committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    578a459 View commit details
    Browse the repository at this point in the history

  11. Stripped date to only include day and time

    @emieldesmidt
    emieldesmidt committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    41ba7dd View commit details
    Browse the repository at this point in the history

  12. Merge branch 'master' into ui_improvement 

    # Conflicts:
#	currencyii/src/main/java/nl/tudelft/trustchain/currencyii/ui/bitcoin/JoinNetworkFragment.kt
#	currencyii/src/main/java/nl/tudelft/trustchain/currencyii/ui/bitcoin/SharedWalletListAdapter.kt
#	currencyii/src/main/res/layout/fragment_join_network.xml
    @InvictusRMC
    InvictusRMC committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    28f9e4d View commit details
    Browse the repository at this point in the history

  13. Make list entries clickable

    @InvictusRMC
    InvictusRMC committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    b91e2ca View commit details
    Browse the repository at this point in the history

  14. Merge pull request #11 from InvictusRMC/ui_improvement 

    UI Improvements
    @MKuijpers
    MKuijpers authored Apr 17, 2020
    Configuration menu
    Copy the full SHA
    0a6820c View commit details
    Browse the repository at this point in the history

  15. Refresh DAO Login screen and add production/test-net toggle

    @brian2509
    brian2509 committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    e1551fe View commit details
    Browse the repository at this point in the history

  16. Update kotlin-ipv8 submodule

    @PraveshMoelchand
    PraveshMoelchand committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    b863370 View commit details
    Browse the repository at this point in the history

  17. Refresh the Home/Bitcoin screen and add copy to clipboard buttons

    @brian2509
    brian2509 committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    6951c99 View commit details
    Browse the repository at this point in the history

  18. Add white icons for menu bar items in Bitcoin/Home screen

    @brian2509
    brian2509 committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    884e698 View commit details
    Browse the repository at this point in the history

  19. Refresh the block-chain download/sync screen

    @brian2509
    brian2509 committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    b451e53 View commit details
    Browse the repository at this point in the history

  20. Refresh the import/create new wallet screen

    @brian2509
    brian2509 committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    3f3a55e View commit details
    Browse the repository at this point in the history

  21. Add stripped date to dialog

    @PraveshMoelchand
    PraveshMoelchand committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    fdfd652 View commit details
    Browse the repository at this point in the history

  22. Make getTally() private

    @PraveshMoelchand
    PraveshMoelchand committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    4d0bd84 View commit details
    Browse the repository at this point in the history

  23. Refresh MyDAO screen and move proposal information to another tab

    @brian2509
    brian2509 committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    26c5836 View commit details
    Browse the repository at this point in the history

  24. Change bottom bar item to proposal screen and change screen titles

    @brian2509
    brian2509 committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    75f7aa2 View commit details
    Browse the repository at this point in the history

  25. Remove unnecessary 'm' in var names

    @PraveshMoelchand
    PraveshMoelchand committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    36bacbd View commit details
    Browse the repository at this point in the history

  26. Suppress warning

    @PraveshMoelchand
    PraveshMoelchand committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    9b6064d View commit details
    Browse the repository at this point in the history

  27. Refactor 'myWallet' screen to a placeholder proposals screen

    @brian2509
    brian2509 committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    d3a21df View commit details
    Browse the repository at this point in the history

  28. Fixed failing input.

    @emieldesmidt
    emieldesmidt committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    4eb555d View commit details
    Browse the repository at this point in the history

  29. Merge pull request #14 from emieldesmidt/intuitive_list 

    Intuitive list
    @PraveshMoelchand
    PraveshMoelchand authored Apr 17, 2020
    Configuration menu
    Copy the full SHA
    48c266f View commit details
    Browse the repository at this point in the history

  30. Merge pull request #32 from dymbe/create-unit-tests 

    Create unit tests
    @dymbe
    dymbe authored Apr 17, 2020
    Configuration menu
    Copy the full SHA
    e93e51d View commit details
    Browse the repository at this point in the history

  31. threshold function

    @erwinvanthiel
    erwinvanthiel committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    609d248 View commit details
    Browse the repository at this point in the history

  32. remove peers argument from vote completing check function

    @erwinvanthiel
    erwinvanthiel committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    cfb872b View commit details
    Browse the repository at this point in the history

  33. made threshold argument optional

    @erwinvanthiel
    erwinvanthiel committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    1e49613 View commit details
    Browse the repository at this point in the history

  34. Suppress warning

    @PraveshMoelchand
    PraveshMoelchand committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    3d6dd3d View commit details
    Browse the repository at this point in the history

  35. Add button text

    @PraveshMoelchand
    PraveshMoelchand committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    f617507 View commit details
    Browse the repository at this point in the history

  36. initial setup for threshold vote completeness check. 

    Co-authored-by: KoningR <r.m.koning@student.tudelft.nl>
Co-authored-by: erwinvanthiel <e.l.vanthiel@student.tudelft.nl>
    @erwinvanthiel
    erwinvanthiel committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    23c1e29 View commit details
    Browse the repository at this point in the history

  37. Add colour to button

    @PraveshMoelchand
    PraveshMoelchand committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    3c0dd79 View commit details
    Browse the repository at this point in the history

  38. Merge pull request #16 from emieldesmidt/fix_layout 

    Fix layout
    @KoningR
    KoningR authored Apr 17, 2020
    Configuration menu
    Copy the full SHA
    8cc4b40 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2020

  1. Added toggle to switch between voting modes (not functional yet)

    @emieldesmidt
    emieldesmidt committed Apr 18, 2020
    Configuration menu
    Copy the full SHA
    b7c62c9 View commit details
    Browse the repository at this point in the history

  2. Link switch toggle

    @emieldesmidt
    emieldesmidt committed Apr 18, 2020
    Configuration menu
    Copy the full SHA
    b07d6fa View commit details
    Browse the repository at this point in the history

  3. Exported enum to dedicated class

    @emieldesmidt
    emieldesmidt committed Apr 18, 2020
    Configuration menu
    Copy the full SHA
    6ad2462 View commit details
    Browse the repository at this point in the history

  4. Build fail fix

    @emieldesmidt
    emieldesmidt committed Apr 18, 2020
    Configuration menu
    Copy the full SHA
    c1e47c8 View commit details
    Browse the repository at this point in the history

  5. Added some more margin

    @emieldesmidt
    emieldesmidt committed Apr 18, 2020
    Configuration menu
    Copy the full SHA
    624f88a View commit details
    Browse the repository at this point in the history

  6. implemented requested change by Pravesh

    @emieldesmidt
    emieldesmidt committed Apr 18, 2020
    Configuration menu
    Copy the full SHA
    f1c26fe View commit details
    Browse the repository at this point in the history

  7. Merge pull request #17 from emieldesmidt/voting-mode-toggle 

    Voting mode toggle
    @PraveshMoelchand
    PraveshMoelchand authored Apr 18, 2020
    Configuration menu
    Copy the full SHA
    8d52660 View commit details
    Browse the repository at this point in the history

  8. wrapped up voteCompleteness function, branch build but error is throw… 

    …n in with gettig public key from string
    @erwinvanthiel
    erwinvanthiel committed Apr 18, 2020
    Configuration menu
    Copy the full SHA
    350b351 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #13 from InvictusRMC/ui_refresh 

    Add new UI layout
    @InvictusRMC
    InvictusRMC authored Apr 18, 2020
    Configuration menu
    Copy the full SHA
    8164519 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2020

  1. Changed parsing time to use DateFormat as suggested by Matt

    @emieldesmidt
    emieldesmidt committed Apr 19, 2020
    Configuration menu
    Copy the full SHA
    ad4edea View commit details
    Browse the repository at this point in the history

  2. Merge pull request #11 from emieldesmidt/dao 

    Improved usability
    @MattSkala
    MattSkala authored Apr 19, 2020
    Configuration menu
    Copy the full SHA
    7e01f28 View commit details
    Browse the repository at this point in the history

  3. Improve error catching in UI, and improve consistency across UI

    @MKuijpers
    MKuijpers committed Apr 19, 2020
    Configuration menu
    Copy the full SHA
    cc483bd View commit details
    Browse the repository at this point in the history

  4. Merge branch 'build-apk' into dao

    @MattSkala
    MattSkala committed Apr 19, 2020
    Configuration menu
    Copy the full SHA
    7e6f9e5 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/master' into dao

    @MattSkala
    MattSkala committed Apr 19, 2020
    Configuration menu
    Copy the full SHA
    0193e1e View commit details
    Browse the repository at this point in the history

  6. Update GUI and fix AI to make profit instead of loss

    @martijnbosma
    martijnbosma committed Apr 19, 2020
    Configuration menu
    Copy the full SHA
    616409d View commit details
    Browse the repository at this point in the history

  7. Initial attempt at converting strings to public keys.

    KoningR authored and KoningR committed Apr 19, 2020
    Configuration menu
    Copy the full SHA
    f54a7b7 View commit details
    Browse the repository at this point in the history

  8. Initial README.md

    @PraveshMoelchand
    PraveshMoelchand committed Apr 19, 2020
    Configuration menu
    Copy the full SHA
    852414c View commit details
    Browse the repository at this point in the history

  9. Lint error fix

    @martijnbosma
    martijnbosma committed Apr 19, 2020
    Configuration menu
    Copy the full SHA
    86d0ce8 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #13 from dymbe/AI_profit 

    Ai profit
    @MattSkala
    MattSkala authored Apr 19, 2020
    Configuration menu
    Copy the full SHA
    f184f21 View commit details
    Browse the repository at this point in the history

  11. Add README.md for common

    @PraveshMoelchand
    PraveshMoelchand committed Apr 19, 2020
    Configuration menu
    Copy the full SHA
    e0cda4a View commit details
    Browse the repository at this point in the history

  12. Add img for README

    @PraveshMoelchand
    PraveshMoelchand committed Apr 19, 2020
    Configuration menu
    Copy the full SHA
    94817f2 View commit details
    Browse the repository at this point in the history

  13. Rename img to conform to convention

    @PraveshMoelchand
    PraveshMoelchand committed Apr 19, 2020
    Configuration menu
    Copy the full SHA
    a961050 View commit details
    Browse the repository at this point in the history

  14. Add img to voting/README.md

    @PraveshMoelchand
    PraveshMoelchand committed Apr 19, 2020
    Configuration menu
    Copy the full SHA
    baeaf14 View commit details
    Browse the repository at this point in the history

  15. Fix typos

    @PraveshMoelchand
    PraveshMoelchand committed Apr 19, 2020
    Configuration menu
    Copy the full SHA
    8f616f7 View commit details
    Browse the repository at this point in the history

  16. Added scroll bar for ease of use

    @tpapak01
    tpapak01 committed Apr 19, 2020
    Configuration menu
    Copy the full SHA
    89dfd5d View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2020

  1. Add UI and show all proposals from local database

    @PJvanderLaan
    PJvanderLaan committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    426573c View commit details
    Browse the repository at this point in the history

  2. Fix lint, added space

    @MKuijpers
    MKuijpers committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    39a7fc6 View commit details
    Browse the repository at this point in the history

  3. Show proposal type and add proposal crawling

    @PJvanderLaan
    PJvanderLaan committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    585f98e View commit details
    Browse the repository at this point in the history

  4. Add minimal tx amount as constant

    @MKuijpers
    MKuijpers committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    d059627 View commit details
    Browse the repository at this point in the history

  5. Remove catch in wallet manager, catch usages of the method

    @MKuijpers
    MKuijpers committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    f47db8d View commit details
    Browse the repository at this point in the history

  6. Merge pull request #14 from InvictusRMC/ui_stability 

    Improve error catching in UI, and improve consistency across UI
    @PJvanderLaan
    PJvanderLaan authored Apr 20, 2020
    Configuration menu
    Copy the full SHA
    93ef752 View commit details
    Browse the repository at this point in the history

  7. Add voting functionality onclick

    @PJvanderLaan
    PJvanderLaan committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    8c73ab5 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into explicit_proposals

    @PJvanderLaan
    PJvanderLaan committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    7f0654d View commit details
    Browse the repository at this point in the history

  9. Implement threshold voting by starting votes using entire public keys… 

    …, rather than hashes.

Co-authored-by: KoningR <R.M.Koning@student.tudelft.nl>
Co-authored-by: erwinvanthiel <E.L.vanthiel@student.tudelft.nl>"
    KoningR authored and KoningR committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    c890584 View commit details
    Browse the repository at this point in the history

  10. Remove automatic voting and improve crawl result UI updates

    @PJvanderLaan
    PJvanderLaan committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    7de65ab View commit details
    Browse the repository at this point in the history

  11. Adjust tests to new functionality and write new tests for votingCompl… 

    …eteness.
    @erwinvanthiel
    erwinvanthiel committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    f1b4397 View commit details
    Browse the repository at this point in the history

  12. Added scroll bar for ease of use

    @tpapak01
    tpapak01 committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    ea7f909 View commit details
    Browse the repository at this point in the history

  13. Fix proposal block types filtering bug

    @PJvanderLaan
    PJvanderLaan committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    5e4bbc6 View commit details
    Browse the repository at this point in the history

  14. Fix linting

    @PJvanderLaan
    PJvanderLaan committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    dc1b762 View commit details
    Browse the repository at this point in the history

  15. Torrents operations complete

    @tpapak01
    tpapak01 committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    32303ff View commit details
    Browse the repository at this point in the history

  16. Extra

    @tpapak01
    tpapak01 committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    4fff30f View commit details
    Browse the repository at this point in the history

  17. Extra2

    @tpapak01
    tpapak01 committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    7000337 View commit details
    Browse the repository at this point in the history

  18. Consistently add change addresses to transactions

    @MKuijpers
    MKuijpers committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    b71a850 View commit details
    Browse the repository at this point in the history

  19. Complete

    @tpapak01
    tpapak01 committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    01caa75 View commit details
    Browse the repository at this point in the history

  20. Fix linting

    @MKuijpers
    MKuijpers committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    60b05de View commit details
    Browse the repository at this point in the history

  21. Fixed minor issue

    @tpapak01
    tpapak01 committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    ff14430 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2020

  1. Reduce trustchain blocksize join voting

    @PJvanderLaan
    PJvanderLaan committed Apr 21, 2020
    Configuration menu
    Copy the full SHA
    7dda7da View commit details
    Browse the repository at this point in the history

  2. Reduce trustchain block size transfer funds voting

    @PJvanderLaan
    PJvanderLaan committed Apr 21, 2020
    Configuration menu
    Copy the full SHA
    184745b View commit details
    Browse the repository at this point in the history

  3. Fix build error

    @PJvanderLaan
    PJvanderLaan committed Apr 21, 2020
    Configuration menu
    Copy the full SHA
    1055de2 View commit details
    Browse the repository at this point in the history

  4. Add readme superapp and new images readme trader and payloadgenerator

    @tijmengit
    tijmengit committed Apr 21, 2020
    Configuration menu
    Copy the full SHA
    b06f94c View commit details
    Browse the repository at this point in the history

  5. Readme style fix

    @tijmengit
    tijmengit committed Apr 21, 2020
    Configuration menu
    Copy the full SHA
    a63f88a View commit details
    Browse the repository at this point in the history

  6. Fix transfer funds wallet hash bug

    @PJvanderLaan
    PJvanderLaan committed Apr 21, 2020
    Configuration menu
    Copy the full SHA
    c391112 View commit details
    Browse the repository at this point in the history

  7. Name refactor of vote completeness functions

    @erwinvanthiel
    erwinvanthiel committed Apr 21, 2020
    Configuration menu
    Copy the full SHA
    c4fcb49 View commit details
    Browse the repository at this point in the history

  8. Make threshold optional parameter instead of a nullable one

    @erwinvanthiel
    erwinvanthiel committed Apr 21, 2020
    Configuration menu
    Copy the full SHA
    dbc2ccd View commit details
    Browse the repository at this point in the history

  9. Update README.md

    @mvanmeerten
    mvanmeerten authored Apr 21, 2020
    Configuration menu
    Copy the full SHA
    78a753a View commit details
    Browse the repository at this point in the history

  10. Update readme.md

    @mvanmeerten
    mvanmeerten authored Apr 21, 2020
    Configuration menu
    Copy the full SHA
    e0707cd View commit details
    Browse the repository at this point in the history

  11. Update README.md

    @mvanmeerten
    mvanmeerten authored Apr 21, 2020
    Configuration menu
    Copy the full SHA
    1b2150c View commit details
    Browse the repository at this point in the history

  12. Update readme.md

    @mvanmeerten
    mvanmeerten authored Apr 21, 2020
    Configuration menu
    Copy the full SHA
    3feba23 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2020

  1. Merge branch 'dao' of https://github.com/emieldesmidt/trustchain-supe… 

    …rapp into threshold

� Conflicts:
�	voting/src/main/java/nl/tudelft/trustchain/voting/VotingActivity.kt
    KoningR authored and KoningR committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    066692c View commit details
    Browse the repository at this point in the history

  2. Add input guarding functionality to threshold and yes/no voting. 

    Co-authored-by: KoningR <R.M.Koning@student.tudelft.nl>
Co-authored-by: erwinvanthiel <E.L.vanthiel@student.tudelft.nl>"
    KoningR authored and KoningR committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    81e4d29 View commit details
    Browse the repository at this point in the history

  3. Update tests according to new functionality

    @erwinvanthiel
    erwinvanthiel committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    620e61e View commit details
    Browse the repository at this point in the history

  4. Test invalid block type input

    @erwinvanthiel
    erwinvanthiel committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    daeae89 View commit details
    Browse the repository at this point in the history

  5. Build fail fix

    @emieldesmidt
    emieldesmidt committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    1b87118 View commit details
    Browse the repository at this point in the history

  6. fixed wrong toggle text (my mistake)

    @emieldesmidt
    emieldesmidt committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    742c6c5 View commit details
    Browse the repository at this point in the history

  7. Merge branches 'AI_profit' and 'master' of github.com:dymbe/trustchai… 

    …n-superapp into AI_profit
    @martijnbosma
    martijnbosma committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    b5ae7eb View commit details
    Browse the repository at this point in the history

  8. Final deliverable for the 23rd

    @tpapak01
    tpapak01 committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    7ada1aa View commit details
    Browse the repository at this point in the history

  9. Deleted old apk

    @tpapak01
    tpapak01 committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    25094c0 View commit details
    Browse the repository at this point in the history

  10. Uploaded new apk

    @tpapak01
    tpapak01 committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    8deef9e View commit details
    Browse the repository at this point in the history

  11. Fixed minor bug

    @tpapak01
    tpapak01 committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    58c17b3 View commit details
    Browse the repository at this point in the history

  12. Update Trader UI to include loading view

    @martijnbosma
    martijnbosma committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    52a833d View commit details
    Browse the repository at this point in the history

  13. Merge pull request #33 from dymbe/AI_profit 

    Seems good, solid changes on the payloads
    @tijmengit
    tijmengit authored Apr 22, 2020
    Configuration menu
    Copy the full SHA
    f47da3a View commit details
    Browse the repository at this point in the history

  14. Add tests for TraderFragment

    @mvanmeerten
    mvanmeerten committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    5d3f060 View commit details
    Browse the repository at this point in the history

  15. Merge branch 'trader-fragment-testing' of github.com:dymbe/trustchain… 

    …-superapp
    @tijmengit
    tijmengit committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    fac03c8 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #34 from dymbe/trader-fragment-testing 

    Looks good, new tests are solid
    @tijmengit
    tijmengit authored Apr 22, 2020
    Configuration menu
    Copy the full SHA
    223c228 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'master' of github.com:dymbe/trustchain-superapp

    @tijmengit
    tijmengit committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    a914f71 View commit details
    Browse the repository at this point in the history

  18. Changed button name

    @tpapak01
    tpapak01 committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    0518543 View commit details
    Browse the repository at this point in the history

  19. New gif and trader png

    @tijmengit
    tijmengit committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    fd018ce View commit details
    Browse the repository at this point in the history

  20. Small bug fix

    @tijmengit
    tijmengit committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    ab7cef9 View commit details
    Browse the repository at this point in the history

  21. Merge pull request #15 from InvictusRMC/change_addresses 

    Consistently add change addresses to transactions
    @brian2509
    brian2509 authored Apr 22, 2020
    Configuration menu
    Copy the full SHA
    d2a5ef2 View commit details
    Browse the repository at this point in the history

  22. Remove unused variable to fix linting

    @brian2509
    brian2509 committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    79390f6 View commit details
    Browse the repository at this point in the history

  23. Merge pull request #16 from InvictusRMC/explicit_proposals 

    Explicit proposals
    @brian2509
    brian2509 authored Apr 22, 2020
    Configuration menu
    Copy the full SHA
    7c62bb8 View commit details
    Browse the repository at this point in the history

  24. Show vote completeness in dialog

    @erwinvanthiel
    erwinvanthiel committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    4e8768b View commit details
    Browse the repository at this point in the history

  25. Implement Emiel's suggestions

    @PraveshMoelchand
    PraveshMoelchand committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    34534ca View commit details
    Browse the repository at this point in the history

  26. Update kotlin-ipv8

    @PraveshMoelchand
    PraveshMoelchand committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    8c444f8 View commit details
    Browse the repository at this point in the history

  27. Implement Emiel's suggestion

    @PraveshMoelchand
    PraveshMoelchand committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    b39f807 View commit details
    Browse the repository at this point in the history

  28. Fix test error caused by kotlin-ipv8 update

    @PraveshMoelchand
    PraveshMoelchand committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    dc19fcf View commit details
    Browse the repository at this point in the history

  29. Revert changes

    @PraveshMoelchand
    PraveshMoelchand committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    d3ab567 View commit details
    Browse the repository at this point in the history

  30. Revert "Update kotlin-ipv8" 

    This reverts commit 8c444f8
    @PraveshMoelchand
    PraveshMoelchand committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    001b77e View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2020

  1. Small bug fix

    @tijmengit
    tijmengit committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    717ccc6 View commit details
    Browse the repository at this point in the history

  2. Lint fix

    @martijnbosma
    martijnbosma committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    1f40520 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #16 from dymbe/master 

    Last improvements for Currency I group
    @MattSkala
    MattSkala authored Apr 23, 2020
    Configuration menu
    Copy the full SHA
    fb065bb View commit details
    Browse the repository at this point in the history

  4. Build fail fix #2

    @emieldesmidt
    emieldesmidt committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    ec4d22a View commit details
    Browse the repository at this point in the history

  5. made toast indicating voting status more descriptive.

    @emieldesmidt
    emieldesmidt committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    a06ee06 View commit details
    Browse the repository at this point in the history

  6. refactored method name to be more descriptive.

    @emieldesmidt
    emieldesmidt committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    b504957 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #18 from emieldesmidt/doc 

    Add initial doc to dao branch
    @emieldesmidt
    emieldesmidt authored Apr 23, 2020
    Configuration menu
    Copy the full SHA
    a240f6a View commit details
    Browse the repository at this point in the history

  8. Try catch to prevent app crashing real bad.

    @emieldesmidt
    emieldesmidt committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    b4e1357 View commit details
    Browse the repository at this point in the history

  9. Minor refactoring (suggested by jetbrains magic)

    @emieldesmidt
    emieldesmidt committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    3d94749 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #19 from emieldesmidt/threshold 

    Threshold
    @PraveshMoelchand
    PraveshMoelchand authored Apr 23, 2020
    Configuration menu
    Copy the full SHA
    a4b54db View commit details
    Browse the repository at this point in the history

  11. Merge branch 'dao' 

    # Conflicts:
#	.gitignore
#	FOC/src/main/AndroidManifest.xml
#	FOC/src/main/java/nl/tudelft/trustchain/FOC/MainActivityFOC.kt
#	FOC/src/main/res/layout/content_main_activity_foc.xml
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/nl/tudelft/trustchain/app/AppDefinition.kt
#	common/src/main/java/nl/tudelft/trustchain/common/DemoCommunity.kt
#	settings.gradle
    @tpapak01
    tpapak01 committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    95c6b18 View commit details
    Browse the repository at this point in the history

  12. Merge remote-tracking branch 'upstream/dao' into merge-upstream

    @MKuijpers
    MKuijpers committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    dbebd33 View commit details
    Browse the repository at this point in the history

  13. Necessary for push request

    @tpapak01
    tpapak01 committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    69806ad View commit details
    Browse the repository at this point in the history

  14. Merge pull request #15 from tpapak01/master 

    Completed FOC app
    @MattSkala
    MattSkala authored Apr 23, 2020
    Configuration menu
    Copy the full SHA
    6646549 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #17 from InvictusRMC/merge-upstream 

    Merge upstream
    @PJvanderLaan
    PJvanderLaan authored Apr 23, 2020
    Configuration menu
    Copy the full SHA
    fadf45d View commit details
    Browse the repository at this point in the history

  16. Force GitHub Actions build

    @MKuijpers
    MKuijpers committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    c001b72 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2020

  1. Add initial VotingCommunity extending from TrustchainCommunity.

    KoningR authored and KoningR committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    800ba14 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dao' of https://github.com/emieldesmidt/trustchain-supe… 

    …rapp into votingcommunity
    KoningR authored and KoningR committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    16af82d View commit details
    Browse the repository at this point in the history

  3. Fix gradle build failure due to imports and whitespace.

    KoningR authored and KoningR committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    fd9db43 View commit details
    Browse the repository at this point in the history

  4. Add progressbar to voting GUI.

    KoningR authored and KoningR committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    b8cc42a View commit details
    Browse the repository at this point in the history

  5. Merge branch 'votingcommunity' of https://github.com/emieldesmidt/tru… 

    …stchain-superapp into voting-complete-gui
    KoningR authored and KoningR committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    68144da View commit details
    Browse the repository at this point in the history

  6. Add color to progressbar.

    KoningR authored and KoningR committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    6d3c6a3 View commit details
    Browse the repository at this point in the history

  7. Add tests for votingPercentage check

    @erwinvanthiel
    erwinvanthiel committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    ba70393 View commit details
    Browse the repository at this point in the history

  8. Fix Gradle build error blank lines.

    KoningR authored and KoningR committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    38007ac View commit details
    Browse the repository at this point in the history

  9. Merge pull request #32 from emieldesmidt/votingcommunity 

    Votingcommunity
    @PraveshMoelchand
    PraveshMoelchand authored Apr 24, 2020
    Configuration menu
    Copy the full SHA
    f381aaf View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2020

  1. Merge branch 'dao' of https://github.com/Tribler/trustchain-superapp … 

    …into dao-rebase
    @emieldesmidt
    emieldesmidt committed Apr 25, 2020
    Configuration menu
    Copy the full SHA
    5e44270 View commit details
    Browse the repository at this point in the history

  2. removed cryptoprovider from test suite

    @emieldesmidt
    emieldesmidt committed Apr 25, 2020
    Configuration menu
    Copy the full SHA
    dc68a7a View commit details
    Browse the repository at this point in the history

  3. Merge pull request #17 from InvictusRMC/master 

    Currency DAO: Proposal screen, UI, bug fixes, cleanup
    @MattSkala
    MattSkala authored Apr 25, 2020
    Configuration menu
    Copy the full SHA
    c48a59a View commit details
    Browse the repository at this point in the history

  4. Catch votingcomplete threshold not made case

    @erwinvanthiel
    erwinvanthiel committed Apr 25, 2020
    Configuration menu
    Copy the full SHA
    1445bef View commit details
    Browse the repository at this point in the history

  5. Merge pull request #33 from emieldesmidt/voting-complete-gui 

    Voting complete gui
    @PraveshMoelchand
    PraveshMoelchand authored Apr 25, 2020
    Configuration menu
    Copy the full SHA
    1e9a719 View commit details
    Browse the repository at this point in the history

  6. Update kotlin-ipv8 to same version as in dao

    @PraveshMoelchand
    PraveshMoelchand committed Apr 25, 2020
    Configuration menu
    Copy the full SHA
    49cf48c View commit details
    Browse the repository at this point in the history

  7. Revert "removed cryptoprovider from test suite" 

    This reverts commit dc68a7a
    @PraveshMoelchand
    PraveshMoelchand committed Apr 25, 2020
    Configuration menu
    Copy the full SHA
    9a74ab6 View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'upstream/dao' into dao-rebase

    @PraveshMoelchand
    PraveshMoelchand committed Apr 25, 2020
    Configuration menu
    Copy the full SHA
    d68e042 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'emieldesmidt/dao' into dao-rebase

    @PraveshMoelchand
    PraveshMoelchand committed Apr 25, 2020
    Configuration menu
    Copy the full SHA
    b3167b6 View commit details
    Browse the repository at this point in the history

  10. Update kotlin-ipv8 again. Previous merge messed things up

    @PraveshMoelchand
    PraveshMoelchand committed Apr 25, 2020
    Configuration menu
    Copy the full SHA
    6a148cc View commit details
    Browse the repository at this point in the history

  11. Merge pull request #36 from emieldesmidt/dao-rebase 

    Dao rebase
    @PraveshMoelchand
    PraveshMoelchand authored Apr 25, 2020
    Configuration menu
    Copy the full SHA
    6dd5c83 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2020

  1. Update kotlin-ipv8 to Tribler/kotlin-ipv8@178acbb

    @PraveshMoelchand
    PraveshMoelchand committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    7b3e400 View commit details
    Browse the repository at this point in the history

  2. Remove unnecessary assignment

    @PraveshMoelchand
    PraveshMoelchand committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    6ac39bd View commit details
    Browse the repository at this point in the history

  3. Update Kotlin version

    @PraveshMoelchand
    PraveshMoelchand committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    3634638 View commit details
    Browse the repository at this point in the history

  4. Update Gradle version

    @PraveshMoelchand
    PraveshMoelchand committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    222e1ba View commit details
    Browse the repository at this point in the history

  5. Change deprecated @UseExperimental to @OptIn (new Kotlin version)

    @PraveshMoelchand
    PraveshMoelchand committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    94e5d29 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #20 from PraveshMoelchand/update-kotlin-ipv8 

    Update kotlin ipv8
    @MattSkala
    MattSkala authored Apr 26, 2020
    Configuration menu
    Copy the full SHA
    d900f08 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'dao' of https://github.com/Tribler/trustchain-superapp … 

    …into dao-update
    @emieldesmidt
    emieldesmidt committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    0709a6f View commit details
    Browse the repository at this point in the history

  8. Merge pull request #37 from emieldesmidt/dao-update 

    Dao update
    @PraveshMoelchand
    PraveshMoelchand authored Apr 26, 2020
    Configuration menu
    Copy the full SHA
    734c4ea View commit details
    Browse the repository at this point in the history

  9. Add new indicator

    @emieldesmidt
    emieldesmidt committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    9b30319 View commit details
    Browse the repository at this point in the history

  10. Build fail fix + new indicator positioning

    @emieldesmidt
    emieldesmidt committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    48715ba View commit details
    Browse the repository at this point in the history

  11. limit input to 50 chars

    @emieldesmidt
    emieldesmidt committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    9f39916 View commit details
    Browse the repository at this point in the history

  12. changed getter to has check as return object is not used anyways

    @emieldesmidt
    emieldesmidt committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    3f45887 View commit details
    Browse the repository at this point in the history

  13. make getter use the previously made hasField checker

    @emieldesmidt
    emieldesmidt committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    e732f93 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2020

  1. typo fix as spotted by prav

    @emieldesmidt
    emieldesmidt committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    3b6e678 View commit details
    Browse the repository at this point in the history

  2. Fixed duplicate code block

    @emieldesmidt
    emieldesmidt committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    ab206a6 View commit details
    Browse the repository at this point in the history

  3. Implement Android Studio suggestions

    @PraveshMoelchand
    PraveshMoelchand committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    7cd23a8 View commit details
    Browse the repository at this point in the history

  4. Fix NEW tag being pushed off screen by setting max width

    @emieldesmidt
    emieldesmidt committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    368e621 View commit details
    Browse the repository at this point in the history

  5. Only display agree button when dealing with a threshold vote

    @emieldesmidt
    emieldesmidt committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    17f5534 View commit details
    Browse the repository at this point in the history

  6. Display current standing dependent on the voting mode.

    @emieldesmidt
    emieldesmidt committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    0ca1218 View commit details
    Browse the repository at this point in the history

  7. build fail fix, sorry :P

    @emieldesmidt
    emieldesmidt committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    bc29871 View commit details
    Browse the repository at this point in the history

  8. removed unnecessary suppressor

    @emieldesmidt
    emieldesmidt committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    cbddeed View commit details
    Browse the repository at this point in the history

  9. FOC checkbox

    @emieldesmidt
    emieldesmidt committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    607dc2d View commit details
    Browse the repository at this point in the history

  10. endpoint for the FOC app that returns successful filepath proposals

    @emieldesmidt
    emieldesmidt committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    9769661 View commit details
    Browse the repository at this point in the history

  11. Allow for foc_voting_block proposal blocks

    @emieldesmidt
    emieldesmidt committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    e07d952 View commit details
    Browse the repository at this point in the history

  12. check against FOCVotingBlock as well as normal votingblock

    @emieldesmidt
    emieldesmidt committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    0d02068 View commit details
    Browse the repository at this point in the history

  13. Test to check expected behaviour

    @emieldesmidt
    emieldesmidt committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    d7728bf View commit details
    Browse the repository at this point in the history

  14. bind checkbox, enforce threshold mode

    @emieldesmidt
    emieldesmidt committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    6ae5d1b View commit details
    Browse the repository at this point in the history

  15. Use layout weights to ensure automatic scaling

    @PraveshMoelchand
    PraveshMoelchand committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    d7212fe View commit details
    Browse the repository at this point in the history

  16. Redo scaling

    @PraveshMoelchand
    PraveshMoelchand committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    4928302 View commit details
    Browse the repository at this point in the history

  17. Add VOTED and COMPLETED indicators

    @PraveshMoelchand
    PraveshMoelchand committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    bf5c39e View commit details
    Browse the repository at this point in the history

  18. Refactor indicator name

    @PraveshMoelchand
    PraveshMoelchand committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    04a3ba8 View commit details
    Browse the repository at this point in the history

  19. Implement Android Studio suggestion

    @PraveshMoelchand
    PraveshMoelchand committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    5d49888 View commit details
    Browse the repository at this point in the history

  20. Fix lint error

    @PraveshMoelchand
    PraveshMoelchand committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    e3c3853 View commit details
    Browse the repository at this point in the history

  21. Merge pull request #39 from emieldesmidt/input-limit 

    limit input to 50 chars
    @PraveshMoelchand
    PraveshMoelchand authored Apr 27, 2020
    Configuration menu
    Copy the full SHA
    1cbd533 View commit details
    Browse the repository at this point in the history

  22. Merge pull request #40 from emieldesmidt/no-key-fix 

    No key fix
    @PraveshMoelchand
    PraveshMoelchand authored Apr 27, 2020
    Configuration menu
    Copy the full SHA
    0fd2325 View commit details
    Browse the repository at this point in the history

  23. Merge branch 'dao' into new-indicator 

    # Conflicts:
#	voting/src/main/java/nl/tudelft/trustchain/voting/BlockListAdapter.kt
    @PraveshMoelchand
    PraveshMoelchand committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    2f420da View commit details
    Browse the repository at this point in the history

  24. Fix error (https://github.com/emieldesmidt/trustchain-superapp/pull/4… 

    …1#issuecomment-620283302)
    @PraveshMoelchand
    PraveshMoelchand committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    bde4e12 View commit details
    Browse the repository at this point in the history

  25. Merge branch 'new-indicator' into threshold-casting 

    # Conflicts:
#	common/src/main/java/nl/tudelft/trustchain/common/util/VotingHelper.kt
    @PraveshMoelchand
    PraveshMoelchand committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    09b3c20 View commit details
    Browse the repository at this point in the history

  26. Fix lint errors

    @PraveshMoelchand
    PraveshMoelchand committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    b5272a6 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2020

  1. Quick and dirty selector within the FOC app

    @emieldesmidt
    emieldesmidt committed Apr 28, 2020
    Configuration menu
    Copy the full SHA
    e8ee50d View commit details
    Browse the repository at this point in the history

  2. Message when no files eligible for upload

    @emieldesmidt
    emieldesmidt committed Apr 28, 2020
    Configuration menu
    Copy the full SHA
    7bbea4f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'threshold-casting' into FOC-Integration 

    # Conflicts:
#	common/src/main/java/nl/tudelft/trustchain/common/util/VotingHelper.kt
    @emieldesmidt
    emieldesmidt committed Apr 28, 2020
    Configuration menu
    Copy the full SHA
    2b20486 View commit details
    Browse the repository at this point in the history

  4. fixed errors after merge

    @emieldesmidt
    emieldesmidt committed Apr 28, 2020
    Configuration menu
    Copy the full SHA
    63f57a2 View commit details
    Browse the repository at this point in the history

  5. Created separate field instead of different block type

    @emieldesmidt
    emieldesmidt committed Apr 28, 2020
    Configuration menu
    Copy the full SHA
    ae29d35 View commit details
    Browse the repository at this point in the history

  6. formatting for easier debugging

    @emieldesmidt
    emieldesmidt committed Apr 28, 2020
    Configuration menu
    Copy the full SHA
    a81f838 View commit details
    Browse the repository at this point in the history

  7. fixed typos

    @emieldesmidt
    emieldesmidt committed Apr 28, 2020
    Configuration menu
    Copy the full SHA
    4831c61 View commit details
    Browse the repository at this point in the history

  8. added todo

    @emieldesmidt
    emieldesmidt committed Apr 28, 2020
    Configuration menu
    Copy the full SHA
    97c78a9 View commit details
    Browse the repository at this point in the history

  9. use votingcommunity

    @emieldesmidt
    emieldesmidt committed Apr 28, 2020
    Configuration menu
    Copy the full SHA
    bd3e09b View commit details
    Browse the repository at this point in the history

  10. disable switch when using FOC mode

    @emieldesmidt
    emieldesmidt committed Apr 28, 2020
    Configuration menu
    Copy the full SHA
    476cc8c View commit details
    Browse the repository at this point in the history

  11. Add Voting module to FOC.

    KoningR authored and KoningR committed Apr 28, 2020
    Configuration menu
    Copy the full SHA
    2ceceab View commit details
    Browse the repository at this point in the history