Skip to content

The Merge#536

Merged
Man-Jain merged 33 commits intodevelopfrom
lite-merge
May 24, 2023
Merged

The Merge#536
Man-Jain merged 33 commits intodevelopfrom
lite-merge

Conversation

@Man-Jain
Copy link
Copy Markdown
Collaborator

@Man-Jain Man-Jain commented Apr 5, 2023

No description provided.

@netlify
Copy link
Copy Markdown

netlify bot commented Apr 5, 2023

Deploy Preview for tezos-homebase ready!

Name Link
🔨 Latest commit 363414c
🔍 Latest deploy log https://app.netlify.com/sites/tezos-homebase/deploys/646d5d595744e70008899c22
😎 Deploy Preview https://deploy-preview-536--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.

@EightRice
Copy link
Copy Markdown
Collaborator

image
please remove this

Man-Jain added 10 commits April 22, 2023 02:40
Signed-off-by: Manank Patni <manank321@gmail.com>
Signed-off-by: Manank Patni <manank321@gmail.com>
Signed-off-by: Manank Patni <manank321@gmail.com>
Signed-off-by: Manank Patni <manank321@gmail.com>
Signed-off-by: Manank Patni <manank321@gmail.com>
fabiolalombardim and others added 8 commits May 23, 2023 23:33
* initial commit

* validation added

* delete console.log

* filters working again

* removed unsed import
Signed-off-by: Manank Patni <manank321@gmail.com>
Signed-off-by: Manank Patni <manank321@gmail.com>
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 added 2 commits May 24, 2023 05:49
Signed-off-by: Manank Patni <manank321@gmail.com>
Signed-off-by: Manank Patni <manank321@gmail.com>
@Man-Jain Man-Jain merged commit 5af41e9 into develop May 24, 2023
@Man-Jain Man-Jain deleted the lite-merge branch May 24, 2023 00:46
EightRice added a commit that referenced this pull request May 24, 2023
* fix navigation on small devices

* Proposals UI update (#556)

* initial commit

* new banner finished

* updated filter ui

* remove config tab

* Revert "Proposals UI update (#556)" (#575)

This reverts commit 96cfaae.

Co-authored-by: Manank Patni <manank321@gmail.com>

* The Merge (#536)

* token deployment flow

* clean & validations added

* new design implemented

* initial merge - lite creator added

* Fetch lite homebase apps

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

* Remove unused data params from types and Token class

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

* imports upgrade

* lite explorer components merged & formatted

* lite explorer connected & working

* merge with develop, banner removed & fixed paddings

* Update App.tsx

* Update App.tsx

* Symbol optional

* Fix lite env variables

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

* REfarctor lite queries

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

* Create Lite DAO with Full DAO

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

* Add deployment of lite dao

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

* Fix lint

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

* external link required & clean up (#573)

* filter search fixed for mainnet (#572)

* Fix voting system (#545)

* initial commit

* validation added

* delete console.log

* filters working again

* removed unsed import

* Add proposal form and proposal list to Full DAO (#553)

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

* Fix propsal creation not working for Lite only DAO

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

* Fix lite proposal modal

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

* Fix redirection and user polls posted

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

* Remove console.log

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

* Lite merge fixes

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

* Fix error message and revert unstake all pending

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

---------

Signed-off-by: Manank Patni <manank321@gmail.com>
Co-authored-by: fabiolalombardim <lombardifabiola@hotmail.com>
Co-authored-by: fabiolalombardim <37227394+fabiolalombardim@users.noreply.github.com>

---------

Signed-off-by: Manank Patni <manank321@gmail.com>
Co-authored-by: fabiolalombardim <lombardifabiola@hotmail.com>
Co-authored-by: fabiolalombardim <37227394+fabiolalombardim@users.noreply.github.com>
Co-authored-by: Andrei Taranu <astmobronsita@gmail.com>
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.

3 participants