Skip to content

Merge Develop to Master#541

Merged
Man-Jain merged 21 commits intomasterfrom
develop
Apr 21, 2023
Merged

Merge Develop to Master#541
Man-Jain merged 21 commits intomasterfrom
develop

Conversation

@Man-Jain
Copy link
Copy Markdown
Collaborator

No description provided.

Man-Jain and others added 18 commits February 6, 2023 23:49
Signed-off-by: Manank Patni <manank321@gmail.com>
Signed-off-by: Manank Patni <manank321@gmail.com>
* Squashed commit of the following:

commit b4bb2cc
Author: fabiolalombardim <lombardifabiola@hotmail.com>
Date:   Wed Dec 21 12:16:17 2022 +0100

    internal link to Lite

* title block updated & buttons removed

* table filter

* clean up

* dao info tables

* updated missing field

* removed material ui styles

* clean up

* removed view code button

* responsive tables

* requested changes

* delete console.log

* execute text updated

* formulas added
Signed-off-by: Manank Patni <manank321@gmail.com>
* Squashed commit of the following:

commit b4bb2cc
Author: fabiolalombardim <lombardifabiola@hotmail.com>
Date:   Wed Dec 21 12:16:17 2022 +0100

    internal link to Lite

* added tooltip for token id

* fixed conditional votting settings depending on network

* estimated blocks

* update initialization of values

* useBlocks

* useBlocks updated

* values updated
Add FA1.2 banner for Humanitarian DAO and remove banner one time limit
Signed-off-by: Manank Patni <manank321@gmail.com>
Signed-off-by: Manank Patni <manank321@gmail.com>
* tabs added & tokens and nfts completed

* history table upgraded
Signed-off-by: Manank Patni <manank321@gmail.com>
Signed-off-by: Manank Patni <manank321@gmail.com>
* Merge Develop to Master (#500)

* Add FA1.2 support and remove banner (#489)

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

* Fix README.md

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

* Explorer tabs upgrade and add config page (#485)

* Squashed commit of the following:

commit b4bb2cc
Author: fabiolalombardim <lombardifabiola@hotmail.com>
Date:   Wed Dec 21 12:16:17 2022 +0100

    internal link to Lite

* title block updated & buttons removed

* table filter

* clean up

* dao info tables

* updated missing field

* removed material ui styles

* clean up

* removed view code button

* responsive tables

* requested changes

* delete console.log

* execute text updated

* formulas added

* Add banner for Humanitarian DAO and remove banner one time limit

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

* DAO Creator updates and improvements (#495)

* Squashed commit of the following:

commit b4bb2cc
Author: fabiolalombardim <lombardifabiola@hotmail.com>
Date:   Wed Dec 21 12:16:17 2022 +0100

    internal link to Lite

* added tooltip for token id

* fixed conditional votting settings depending on network

* estimated blocks

* update initialization of values

* useBlocks

* useBlocks updated

* values updated

---------

Signed-off-by: Manank Patni <manank321@gmail.com>
Co-authored-by: fabiolalombardim <37227394+fabiolalombardim@users.noreply.github.com>
Co-authored-by: Fernando Torres <80982814+thenerdcat@users.noreply.github.com>

* Revert "Merge Develop to Master (#500)" (#517)

This reverts commit c04c7d8.

* Upgrade beacon version (#531)

* Upgrade beacon version

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

* Upgrade beacon version

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

* Remove connect on originate and save beacon wallet instance

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

---------

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

* Fix validations

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

* Add decimal validation to block number

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

---------

Signed-off-by: Manank Patni <manank321@gmail.com>
Co-authored-by: fabiolalombardim <37227394+fabiolalombardim@users.noreply.github.com>
Co-authored-by: Fernando Torres <80982814+thenerdcat@users.noreply.github.com>
Signed-off-by: Manank Patni <manank321@gmail.com>
@netlify
Copy link
Copy Markdown

netlify bot commented Apr 19, 2023

Deploy Preview for tezos-homebase ready!

Name Link
🔨 Latest commit 37a91f6
🔍 Latest deploy log https://app.netlify.com/sites/tezos-homebase/deploys/6442c0cb53695200074221f9
😎 Deploy Preview https://deploy-preview-541--tezos-homebase.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

* Add craco and browserify

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

* Remove react-app-rewired

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

* Change admin to deployer account in case of testnet

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

---------

Signed-off-by: Manank Patni <manank321@gmail.com>
Signed-off-by: Manank Patni <manank321@gmail.com>
@Man-Jain Man-Jain merged commit ff47ca3 into master Apr 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants