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

Merge Develop to Master #663

Merged
merged 34 commits into from
Sep 20, 2023
Merged

Merge Develop to Master #663

merged 34 commits into from
Sep 20, 2023

Commits on Jun 6, 2023

  1. ui upgrades added

    @fabiolalombardim
    fabiolalombardim committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    54ed51f View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2023

  1. Add delegated token deployment 

    Signed-off-by: Manank Patni <manank321@gmail.com>
    @Man-Jain
    Man-Jain committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    387d4a7 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2023

  1. Merge branch 'develop' into token-deployment-ui-upgrades

    @Man-Jain
    Man-Jain authored Jun 28, 2023
    Configuration menu
    Copy the full SHA
    1dee64f View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2023

  1. Merge branch 'develop' of github.com:dOrgTech/homebase-app into develop

    @Man-Jain
    Man-Jain committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    bc1663e View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2023

  1. Voting delegation UI for Token (#608) 

    * initial commit- banner added

* modal & options added

* Add interaction with contracts

Signed-off-by: Manank Patni <manank321@gmail.com>

---------

Signed-off-by: Manank Patni <manank321@gmail.com>
Co-authored-by: Manank Patni <manank321@gmail.com>
    @fabiolalombardim @Man-Jain
    fabiolalombardim and Man-Jain authored Jul 22, 2023
    Configuration menu
    Copy the full SHA
    23dcc47 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of github.com:dOrgTech/homebase-app into develop

    @Man-Jain
    Man-Jain committed Jul 22, 2023
    Configuration menu
    Copy the full SHA
    9d47a12 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:dOrgTech/homebase-app into develop

    @Man-Jain
    Man-Jain committed Jul 22, 2023
    Configuration menu
    Copy the full SHA
    a165d47 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2023

  1. Fix cycle issue for off-chain proposals 

    Signed-off-by: Manank Patni <manank321@gmail.com>
    @Man-Jain
    Man-Jain committed Jul 23, 2023
    Configuration menu
    Copy the full SHA
    7901f15 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:dOrgTech/homebase-app into develop

    @Man-Jain
    Man-Jain committed Jul 23, 2023
    Configuration menu
    Copy the full SHA
    5ff5106 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2023

  1. separate PRs - token deployment UI updated

    @fabiolalombardim
    fabiolalombardim committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    1d5396e View commit details
    Browse the repository at this point in the history

  2. merged develop changes

    @fabiolalombardim
    fabiolalombardim committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    ca858fd View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2023

  1. Merge pull request #627 from dOrgTech/token-deployment-ui 

    Token deployment UI
    @magentaceiba
    magentaceiba authored Jul 30, 2023
    Configuration menu
    Copy the full SHA
    05590ef View commit details
    Browse the repository at this point in the history

  2. delegation options & status updates

    @fabiolalombardim
    fabiolalombardim committed Jul 30, 2023
    Configuration menu
    Copy the full SHA
    33225a6 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2023

  1. Merge branch 'develop' of github.com:dOrgTech/homebase-app into develop

    @Man-Jain
    Man-Jain committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    1e3a849 View commit details
    Browse the repository at this point in the history

  2. Delegation options & status updates (#628) 

    * new options & refetch

* Fix Voting Weight Logic

Signed-off-by: Manank Patni <manank321@gmail.com>

---------

Signed-off-by: Manank Patni <manank321@gmail.com>
Co-authored-by: Manank Patni <manank321@gmail.com>
    @fabiolalombardim @Man-Jain
    fabiolalombardim and Man-Jain authored Aug 9, 2023
    Configuration menu
    Copy the full SHA
    b365e15 View commit details
    Browse the repository at this point in the history

  3. user who has delegate cant vote (#630)

    @fabiolalombardim
    fabiolalombardim authored Aug 9, 2023
    Configuration menu
    Copy the full SHA
    6487e26 View commit details
    Browse the repository at this point in the history

  4. modal closed after proposal success (#631)

    @fabiolalombardim
    fabiolalombardim authored Aug 9, 2023
    Configuration menu
    Copy the full SHA
    9445a99 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2023

  1. connection with backend new endpoints

    @fabiolalombardim
    fabiolalombardim committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    b5ebfdc View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2023

  1. fix to remove non zero balance

    @fabiolalombardim
    fabiolalombardim committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    c594845 View commit details
    Browse the repository at this point in the history

  2. disabled new proposal button if community requires token ownership

    @fabiolalombardim
    fabiolalombardim committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    3626e98 View commit details
    Browse the repository at this point in the history

  3. added validation for link (#637)

    @fabiolalombardim
    fabiolalombardim authored Aug 26, 2023
    Configuration menu
    Copy the full SHA
    36d8918 View commit details
    Browse the repository at this point in the history

  4. Delegation modal & Status Update (#641)

    @fabiolalombardim
    fabiolalombardim authored Aug 26, 2023
    Configuration menu
    Copy the full SHA
    b14d3ec View commit details
    Browse the repository at this point in the history

  5. Connection with backend new endpoints (#643) 

    * connection with backend new endpoints

* fix to remove non zero balance

* added condition to allowPublicAccess view on explorer
    @fabiolalombardim
    fabiolalombardim authored Aug 26, 2023
    Configuration menu
    Copy the full SHA
    5a9515b View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2023

  1. merge resolved

    @fabiolalombardim
    fabiolalombardim committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    90913be View commit details
    Browse the repository at this point in the history

  2. Merge pull request #645 from dOrgTech/token-ownership 

    Condition to own tokens for making proposals in Lite
    @fabiolalombardim
    fabiolalombardim authored Aug 29, 2023
    Configuration menu
    Copy the full SHA
    e2fe956 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2023

  1. minor clean & disable new poll when user doesnt have tokens

    @fabiolalombardim
    fabiolalombardim committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    f45cd32 View commit details
    Browse the repository at this point in the history

  2. set poll duration label

    @fabiolalombardim
    fabiolalombardim committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    660f703 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2023

  1. Change logic for delegation voting power and add validation for user … 

    …balance (#654)

* Change logic for delegation voting power and add validation for user balance

Signed-off-by: Manank Patni <manank321@gmail.com>

* Change voting power voting logic

Signed-off-by: Manank Patni <manank321@gmail.com>

---------

Signed-off-by: Manank Patni <manank321@gmail.com>
    @Man-Jain
    Man-Jain authored Sep 15, 2023
    Configuration menu
    Copy the full SHA
    754801b View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2023

  1. Delegation and Error Handling (#662) 

    * Change logic for delegation voting power and add validation for user balance

Signed-off-by: Manank Patni <manank321@gmail.com>

* Change voting power voting logic

Signed-off-by: Manank Patni <manank321@gmail.com>

* Rename vote weight hook and add check for delegation supported

Signed-off-by: Manank Patni <manank321@gmail.com>

---------

Signed-off-by: Manank Patni <manank321@gmail.com>
    @Man-Jain
    Man-Jain authored Sep 19, 2023
    Configuration menu
    Copy the full SHA
    d4ce63b View commit details
    Browse the repository at this point in the history

  2. Fix refresh for delegation status and voting power (#664) 

    Signed-off-by: Manank Patni <manank321@gmail.com>
    @Man-Jain
    Man-Jain authored Sep 19, 2023
    Configuration menu
    Copy the full SHA
    b4ea7fd View commit details
    Browse the repository at this point in the history

  3. Change voting weight logic for proposal detail page (#665) 

    * Fix refresh for delegation status and voting power

Signed-off-by: Manank Patni <manank321@gmail.com>

* Change voting power for voting section

Signed-off-by: Manank Patni <manank321@gmail.com>

* Remove get poll choices

Signed-off-by: Manank Patni <manank321@gmail.com>

---------

Signed-off-by: Manank Patni <manank321@gmail.com>
    @Man-Jain
    Man-Jain authored Sep 19, 2023
    Configuration menu
    Copy the full SHA
    79af428 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2023

  1. Fix modal close error in lite dao and proposal fetching (#666) 

    * Fix refresh for delegation status and voting power

Signed-off-by: Manank Patni <manank321@gmail.com>

* Change voting power for voting section

Signed-off-by: Manank Patni <manank321@gmail.com>

* Remove get poll choices

Signed-off-by: Manank Patni <manank321@gmail.com>

* Fix modal close error in lite dao and proposal fetching

Signed-off-by: Manank Patni <manank321@gmail.com>

---------

Signed-off-by: Manank Patni <manank321@gmail.com>
    @Man-Jain
    Man-Jain authored Sep 20, 2023
    Configuration menu
    Copy the full SHA
    bbf66b2 View commit details
    Browse the repository at this point in the history

  2. Fix active proposal count (#667) 

    Signed-off-by: Manank Patni <manank321@gmail.com>
    @Man-Jain
    Man-Jain authored Sep 20, 2023
    Configuration menu
    Copy the full SHA
    7b852b7 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #634 from dOrgTech/staging 

    Merge Staging to Develop
    @Man-Jain
    Man-Jain authored Sep 20, 2023
    Configuration menu
    Copy the full SHA
    af626f6 View commit details
    Browse the repository at this point in the history