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

Branch2 #9

Merged
merged 3 commits into from
Aug 3, 2021
Merged

Branch2 #9

merged 3 commits into from
Aug 3, 2021

Conversation

vidiabtc
Copy link
Contributor

@vidiabtc vidiabtc commented Aug 3, 2021

No description provided.

@Zk2u Zk2u merged commit 392353e into prod Aug 3, 2021
@Zk2u Zk2u deleted the branch2 branch August 3, 2021 17:03
Zk2u pushed a commit that referenced this pull request Sep 3, 2021
Squashed commit of the following:
66ec885 
commit e200935
Author: invidia <86919879+SyInvidia@users.noreply.github.com>
Date:   Mon Aug 30 19:36:42 2021 +0100

    activity feed revert mine changed to redeem

commit 0fc794e
Merge: b1f73f9 7d69b12
Author: ａｓｔｅｒｉａ <asteria@syvita.org>
Date:   Mon Aug 30 18:53:50 2021 +0100

    Merge pull request #14 from miamicoin/dependabot/npm_and_yarn/packages/miami-ui/next-11.1.0

    Bump next from 11.0.1 to 11.1.0 in /packages/miami-ui

commit 7d69b12
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Aug 30 17:45:03 2021 +0000

    Bump next from 11.0.1 to 11.1.0 in /packages/miami-ui

    Bumps [next](https://github.com/vercel/next.js) from 11.0.1 to 11.1.0.
    - [Release notes](https://github.com/vercel/next.js/releases)
    - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js)
    - [Commits](vercel/next.js@v11.0.1...v11.1.0)

    ---
    updated-dependencies:
    - dependency-name: next
      dependency-type: direct:production
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit b1f73f9
Author: asteria <asteria@syvita.org>
Date:   Mon Aug 30 18:44:13 2021 +0100

    version 4

commit 409a0b4
Author: asteria <asteria@syvita.org>
Date:   Fri Aug 20 19:31:24 2021 +0100

    Update about.js

commit 71dfb1c
Author: asteria <asteria@syvita.org>
Date:   Tue Aug 17 19:06:52 2021 +0100

    Update next.config.js

commit 61dbbb6
Author: asteria <asteria@syvita.org>
Date:   Tue Aug 17 18:48:48 2021 +0100

    Update sentry.properties

commit d68fe01
Author: asteria <asteria@syvita.org>
Date:   Tue Aug 17 18:41:16 2021 +0100

    Update sentry.properties

commit 56b8a61
Author: asteria <asteria@syvita.org>
Date:   Tue Aug 17 18:38:07 2021 +0100

    sentry works now

commit 6e6a7a5
Author: SyInvidia <paradinight@protonmail.com>
Date:   Tue Aug 17 18:26:33 2021 +0100

    Modify stx address

commit fa1cbc6
Author: SyInvidia <paradinight@protonmail.com>
Date:   Tue Aug 17 18:26:05 2021 +0100

    Allow user to check redeemable blocks within a range

commit f2216ff
Author: invidia <86919879+SyInvidia@users.noreply.github.com>
Date:   Sun Aug 15 02:37:52 2021 +0100

    Retry can-claim-mining on fail

commit 94d26f1
Author: SyInvidia <paradinight@protonmail.com>
Date:   Sun Aug 8 22:34:31 2021 +0100

    Fixing Dashboard CSS

commit 70bffd1
Author: SyInvidia <paradinight@protonmail.com>
Date:   Sat Aug 7 23:37:37 2021 +0100

    Activity feed alternative to post conditions

commit 1110059
Author: SyInvidia <paradinight@protonmail.com>
Date:   Sat Aug 7 23:08:43 2021 +0100

    fix

commit 3b45d8b
Author: SyInvidia <paradinight@protonmail.com>
Date:   Sat Aug 7 23:05:44 2021 +0100

    fix

commit 4c5a7f9
Author: SyInvidia <paradinight@protonmail.com>
Date:   Sat Aug 7 19:33:18 2021 +0100

    Changed Agreement to List

commit 38835ad
Author: SyInvidia <paradinight@protonmail.com>
Date:   Fri Aug 6 17:17:09 2021 +0100

    Fixed stack-tokens amount

commit 5165c19
Author: SyInvidia <paradinight@protonmail.com>
Date:   Fri Aug 6 17:11:23 2021 +0100

    Show Mining Amount in activity feed

commit aa0cfbe
Author: SyInvidia <paradinight@protonmail.com>
Date:   Fri Aug 6 16:57:48 2021 +0100

    Updated redeem text 2

commit 39f4ac9
Author: SyInvidia <paradinight@protonmail.com>
Date:   Fri Aug 6 16:20:33 2021 +0100

    Added percentage to redeem loading bar

commit 4998107
Author: SyInvidia <paradinight@protonmail.com>
Date:   Fri Aug 6 15:51:01 2021 +0100

    update div margin

commit b7d43a5
Author: SyInvidia <paradinight@protonmail.com>
Date:   Fri Aug 6 15:18:57 2021 +0100

    Making Redeem appaer better on activity feed

commit f4e8b92
Author: SyInvidia <paradinight@protonmail.com>
Date:   Fri Aug 6 15:13:34 2021 +0100

    Updated Redeem

commit 73e8a20
Author: SyInvidia <paradinight@protonmail.com>
Date:   Fri Aug 6 03:21:07 2021 +0100

    removing transaction screen from redeem

commit eccc37d
Author: SyInvidia <paradinight@protonmail.com>
Date:   Fri Aug 6 03:17:50 2021 +0100

    Update amount to have switch

commit a91b508
Author: SyInvidia <paradinight@protonmail.com>
Date:   Fri Aug 6 02:41:21 2021 +0100

    cloudfalre GET MOBING

commit 9c23708
Author: SyInvidia <paradinight@protonmail.com>
Date:   Fri Aug 6 02:27:53 2021 +0100

    last push

commit ce4a5b0
Author: SyInvidia <paradinight@protonmail.com>
Date:   Fri Aug 6 02:17:21 2021 +0100

    2

commit cab55f8
Author: SyInvidia <paradinight@protonmail.com>
Date:   Fri Aug 6 02:16:09 2021 +0100

    again

commit 6f2fb68
Author: SyInvidia <paradinight@protonmail.com>
Date:   Fri Aug 6 02:02:45 2021 +0100

    fix

commit f80eff9
Author: SyInvidia <paradinight@protonmail.com>
Date:   Fri Aug 6 01:49:53 2021 +0100

    1 to i

commit 6095c3e
Author: SyInvidia <paradinight@protonmail.com>
Date:   Fri Aug 6 01:14:06 2021 +0100

    limit

commit 85faab0
Author: SyInvidia <paradinight@protonmail.com>
Date:   Thu Aug 5 23:37:56 2021 +0100

    another one

commit f2fc919
Author: SyInvidia <paradinight@protonmail.com>
Date:   Thu Aug 5 23:24:16 2021 +0100

    Fix shutdown

commit 4b58bc2
Author: SyInvidia <paradinight@protonmail.com>
Date:   Thu Aug 5 18:41:09 2021 +0100

    Update Redeem.js

commit c9da249
Author: SyInvidia <paradinight@protonmail.com>
Date:   Thu Aug 5 18:08:15 2021 +0100

    FIX

commit ed29cd0
Author: asteria <asteria@syvita.org>
Date:   Thu Aug 5 17:26:49 2021 +0100

    redeem func

commit 6497c22
Author: asteria <asteria@syvita.org>
Date:   Thu Aug 5 13:15:08 2021 +0100

    boom

commit 81e76b7
Author: SyInvidia <paradinight@protonmail.com>
Date:   Wed Aug 4 21:02:54 2021 +0100

    enabling buttons

commit dba3eac
Author: asteria <asteria@syvita.org>
Date:   Wed Aug 4 20:35:06 2021 +0100

    LESS GOOO

commit fab8d22
Merge: 7bf2ae1 ad2edbb
Author: SyInvidia <paradinight@protonmail.com>
Date:   Tue Aug 3 19:55:38 2021 +0100

    Merge branch 'prod' of https://github.com/miamicoin/ui into prod

commit ad2edbb
Author: asteria <asteria@syvita.org>
Date:   Tue Aug 3 18:19:55 2021 +0000

    fix sentry

commit 7bf2ae1
Author: SyInvidia <paradinight@protonmail.com>
Date:   Tue Aug 3 18:25:27 2021 +0100

    Update index.js

commit ba1a06a
Author: SyInvidia <paradinight@protonmail.com>
Date:   Tue Aug 3 18:24:23 2021 +0100

    Update constants.js

commit 4a2302a
Author: SyInvidia <paradinight@protonmail.com>
Date:   Tue Aug 3 18:20:31 2021 +0100

    Update Register.js

commit 0ca3fbe
Author: SyInvidia <paradinight@protonmail.com>
Date:   Tue Aug 3 18:19:25 2021 +0100

    Update Register.js

commit 0abdbfc
Author: SyInvidia <paradinight@protonmail.com>
Date:   Tue Aug 3 18:13:09 2021 +0100

    FINAL COMMIT

commit 392353e
Merge: 117d41a 86c9434
Author: ᴀ ꜱ ᴛ ᴇ ʀ ɪ ᴀ <asteria@syvita.org>
Date:   Tue Aug 3 18:03:42 2021 +0100

    Merge pull request #9 from miamicoin/branch2

    Branch2

commit 86c9434
Merge: 6cffd1f 117d41a
Author: SyInvidia <paradinight@protonmail.com>
Date:   Tue Aug 3 18:02:35 2021 +0100

    Merge branch 'prod' of https://github.com/miamicoin/ui into prod

commit 6cffd1f
Author: SyInvidia <paradinight@protonmail.com>
Date:   Tue Aug 3 18:02:22 2021 +0100

    FINAL COMMIT

commit 117d41a
Merge: 1b5c917 3e4ac06
Author: ᴀ ꜱ ᴛ ᴇ ʀ ɪ ᴀ <asteria@syvita.org>
Date:   Tue Aug 3 17:47:05 2021 +0100

    Merge pull request #8 from miamicoin/only-allow-register

    Only register allowed

commit 3e4ac06
Author: SyInvidia <paradinight@protonmail.com>
Date:   Tue Aug 3 16:05:21 2021 +0100

    Only register allowed

commit abbd3f5
Author: SyInvidia <paradinight@protonmail.com>
Date:   Tue Aug 3 15:30:20 2021 +0100

    Only register allowed

commit 1b5c917
Merge: df29e1f e6e4190
Author: ᴀ ꜱ ᴛ ᴇ ʀ ɪ ᴀ <asteria@syvita.org>
Date:   Tue Aug 3 13:36:45 2021 +0100

    Merge pull request #4 from miamicoin/log-tran-ids

    Log tran ids

commit e6e4190
Author: SyInvidia <paradinight@protonmail.com>
Date:   Tue Aug 3 12:08:21 2021 +0100

    Testing if we can log tran ids now
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@vidiabtc @Zk2u