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

Merging IPFS into master #835

Merged
merged 67 commits into from
May 25, 2024
Merged

Merging IPFS into master #835

merged 67 commits into from
May 25, 2024

Commits on Dec 7, 2023

  1. user page initial commit, font changed, tabs & cards updated

    @fabiolalombardim
    fabiolalombardim committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    52e7770 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2023

  1. Merge branch 'develop' into user-page

    @fabiolalombardim
    fabiolalombardim committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    d661c18 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2024

  1. upgrades on user page

    @fabiolalombardim
    fabiolalombardim committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    c15cacd View commit details
    Browse the repository at this point in the history

  2. merge staging

    @fabiolalombardim
    fabiolalombardim committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    a7136aa View commit details
    Browse the repository at this point in the history

  3. Merge branch 'staging' into user-page

    @fabiolalombardim
    fabiolalombardim committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    61570aa View commit details
    Browse the repository at this point in the history

  4. Merge branch 'staging' into user-page

    @fabiolalombardim
    fabiolalombardim committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    1e8646a View commit details
    Browse the repository at this point in the history

  5. user movements component

    @fabiolalombardim
    fabiolalombardim committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    56434b8 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2024

  1. user page - voting and proposals list item updated

    @fabiolalombardim
    fabiolalombardim committed Jan 6, 2024
    Configuration menu
    Copy the full SHA
    735146f View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2024

  1. user transactions finished - pagination & responsiveness

    @fabiolalombardim
    fabiolalombardim committed Jan 7, 2024
    Configuration menu
    Copy the full SHA
    b0edc65 View commit details
    Browse the repository at this point in the history

  2. clean up

    @fabiolalombardim
    fabiolalombardim committed Jan 7, 2024
    Configuration menu
    Copy the full SHA
    028d94f View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2024

  1. votes component logic fixed

    @fabiolalombardim
    fabiolalombardim committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    70e00e0 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2024

  1. tabs updated and pagination added to all tabs

    @fabiolalombardim
    fabiolalombardim committed Jan 13, 2024
    Configuration menu
    Copy the full SHA
    a90726c View commit details
    Browse the repository at this point in the history

  2. merge develop chances and fix user tab when no items showed

    @fabiolalombardim
    fabiolalombardim committed Jan 13, 2024
    Configuration menu
    Copy the full SHA
    0760da0 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2024

  1. multiple ui fixes

    @fabiolalombardim
    fabiolalombardim committed Jan 14, 2024
    Configuration menu
    Copy the full SHA
    ea5bced View commit details
    Browse the repository at this point in the history

  2. clean up

    @fabiolalombardim
    fabiolalombardim committed Jan 14, 2024
    Configuration menu
    Copy the full SHA
    c8fb478 View commit details
    Browse the repository at this point in the history

  3. fix padding

    @fabiolalombardim
    fabiolalombardim committed Jan 14, 2024
    Configuration menu
    Copy the full SHA
    4c510a9 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2024

  1. fix quorum values on summary

    @fabiolalombardim
    fabiolalombardim committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    a40a88f View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2024

  1. fix card paddings

    @fabiolalombardim
    fabiolalombardim committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    82cda9f View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2024

  1. initial commit

    @fabiolalombardim
    fabiolalombardim committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    d933e66 View commit details
    Browse the repository at this point in the history

  2. responsive header & readable date for history component

    @fabiolalombardim
    fabiolalombardim committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    2fea703 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2024

  1. last UI changes

    @fabiolalombardim
    fabiolalombardim committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    534f448 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2024

  1. nft transfer component

    @fabiolalombardim
    fabiolalombardim committed Feb 11, 2024
    Configuration menu
    Copy the full SHA
    f87f740 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2024

  1. removed thershold label since not needed

    @fabiolalombardim
    fabiolalombardim committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    e4809c1 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2024

  1. merge develop

    @fabiolalombardim
    fabiolalombardim committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    e327c09 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2024

  1. merge develop

    @fabiolalombardim
    fabiolalombardim committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    a193668 View commit details
    Browse the repository at this point in the history

  2. validation for downloading votes & label for when no votes on dialog

    @fabiolalombardim
    fabiolalombardim committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    80424fc View commit details
    Browse the repository at this point in the history

  3. layout

    @fabiolalombardim
    fabiolalombardim committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    396b2db View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2024

  1. selected filters logic

    @fabiolalombardim
    fabiolalombardim committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    1f1cd07 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2024

  1. Merge branch 'master' into develop

    @fabiolalombardim
    fabiolalombardim committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    ae45ec1 View commit details
    Browse the repository at this point in the history

  2. update branch with master and develop and added try catch

    @fabiolalombardim
    fabiolalombardim committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    20fe80f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into filtering-proposals

    @fabiolalombardim
    fabiolalombardim committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    c28579c View commit details
    Browse the repository at this point in the history

  4. remove switch from dialogs, new modal for actions & new modal reorgan… 

    …ization
    @fabiolalombardim
    fabiolalombardim committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    c428010 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. proposal dialog

    @fabiolalombardim
    fabiolalombardim committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    52d7f3d View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2024

  1. Merge branch 'develop' of https://github.com/dOrgTech/homebase-app in… 

    …to develop
    @fabiolalombardim
    fabiolalombardim committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    f95a7b4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into proposal-details

    @fabiolalombardim
    fabiolalombardim committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    2914dc9 View commit details
    Browse the repository at this point in the history

  3. add constant

    @fabiolalombardim
    fabiolalombardim committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    8325be2 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into multiple-fixes

    @fabiolalombardim
    fabiolalombardim committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    b19fa59 View commit details
    Browse the repository at this point in the history

  5. actions modal ready

    @fabiolalombardim
    fabiolalombardim committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    46a05da View commit details
    Browse the repository at this point in the history

  6. clean up & css fix user tab

    @fabiolalombardim
    fabiolalombardim committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    3a87dd2 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. Merge branch 'master' into develop

    @fabiolalombardim
    fabiolalombardim committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    7071843 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2024

  1. Merge pull request #772 from dOrgTech/proposal-details 

     Proposal details UI upgrade
    @fabiolalombardim
    fabiolalombardim authored Mar 29, 2024
    Configuration menu
    Copy the full SHA
    850eaca View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/dOrgTech/homebase-app in… 

    …to develop
    @fabiolalombardim
    fabiolalombardim committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    9823bdc View commit details
    Browse the repository at this point in the history

  3. merge develop & fix dependencies

    @fabiolalombardim
    fabiolalombardim committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    b5d50c3 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #798 from dOrgTech/multiple-fixes 

    Multiple fixes
    @fabiolalombardim
    fabiolalombardim authored Mar 29, 2024
    Configuration menu
    Copy the full SHA
    c768447 View commit details
    Browse the repository at this point in the history

  5. fix small css

    @fabiolalombardim
    fabiolalombardim committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    5d0f26a View commit details
    Browse the repository at this point in the history

  6. top members component brought back

    @fabiolalombardim
    fabiolalombardim committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    eec31ea View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2024

  1. user tab - activity section new layout

    @fabiolalombardim
    fabiolalombardim committed Mar 30, 2024
    Configuration menu
    Copy the full SHA
    02de3a8 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2024

  1. Merge pull request #814 from dOrgTech/card-padding 

    Fix card padding
    @fabiolalombardim
    fabiolalombardim authored Apr 6, 2024
    Configuration menu
    Copy the full SHA
    7cdbb4b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #815 from dOrgTech/top-members 

    top members component brought back
    @fabiolalombardim
    fabiolalombardim authored Apr 6, 2024
    Configuration menu
    Copy the full SHA
    5db0bfe View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into user-activity

    @fabiolalombardim
    fabiolalombardim committed Apr 6, 2024
    Configuration menu
    Copy the full SHA
    93c1f30 View commit details
    Browse the repository at this point in the history

  4. activity logic

    @fabiolalombardim
    fabiolalombardim committed Apr 6, 2024
    Configuration menu
    Copy the full SHA
    b5d5a75 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into filtering-proposals

    @fabiolalombardim
    fabiolalombardim committed Apr 6, 2024
    Configuration menu
    Copy the full SHA
    897fcf8 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'filtering-proposals' into user-activity

    @fabiolalombardim
    fabiolalombardim committed Apr 6, 2024
    Configuration menu
    Copy the full SHA
    d018deb View commit details
    Browse the repository at this point in the history

  7. filter dialog layout & logic working

    @fabiolalombardim
    fabiolalombardim committed Apr 6, 2024
    Configuration menu
    Copy the full SHA
    082540e View commit details
    Browse the repository at this point in the history

  8. logic

    @fabiolalombardim
    fabiolalombardim committed Apr 6, 2024
    Configuration menu
    Copy the full SHA
    b88c202 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2024

  1. filters for proposals & votes

    @fabiolalombardim
    fabiolalombardim committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    9500699 View commit details
    Browse the repository at this point in the history

  2. logic improved

    @fabiolalombardim
    fabiolalombardim committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    68f610e View commit details
    Browse the repository at this point in the history

  3. proposal tab filter dialog

    @fabiolalombardim
    fabiolalombardim committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    839ab70 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2024

  1. Merge branch 'master' into develop

    @fabiolalombardim
    fabiolalombardim committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    9237c89 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2024

  1. Ipfs lite (#813) 

    * csv votes download

* fix node version

* updated dependencies
    @fabiolalombardim
    fabiolalombardim authored Apr 23, 2024
    Configuration menu
    Copy the full SHA
    4aae9e0 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2024

  1. Merge branch 'develop' of https://github.com/dOrgTech/homebase-app in… 

    …to develop
    @fabiolalombardim
    fabiolalombardim committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    2303b54 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into user-activity

    @fabiolalombardim
    fabiolalombardim committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    9aba95b View commit details
    Browse the repository at this point in the history

Commits on May 13, 2024

  1. fix initial filtering

    @fabiolalombardim
    fabiolalombardim committed May 13, 2024
    Configuration menu
    Copy the full SHA
    4285c9e View commit details
    Browse the repository at this point in the history

  2. implemented new design

    @fabiolalombardim
    fabiolalombardim committed May 13, 2024
    Configuration menu
    Copy the full SHA
    10f5195 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2024

  1. Merge pull request #841 from dOrgTech/cards-update 

    Cards update
    @fabiolalombardim
    fabiolalombardim authored May 19, 2024
    Configuration menu
    Copy the full SHA
    c4a6a9d View commit details
    Browse the repository at this point in the history

  2. merge develop

    @fabiolalombardim
    fabiolalombardim committed May 19, 2024
    Configuration menu
    Copy the full SHA
    3794822 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #825 from dOrgTech/user-activity 

    Proposals & User tab - activity section new layout + filtering
    @fabiolalombardim
    fabiolalombardim authored May 19, 2024
    Configuration menu
    Copy the full SHA
    c459fc1 View commit details
    Browse the repository at this point in the history