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

Keygen staging merge #13

Open
wants to merge 65 commits into
base: staging
Choose a base branch
from
Open

Keygen staging merge #13

wants to merge 65 commits into from

Commits on May 12, 2023

  1. checkpoint before navmenu refactor

    @sanity
    sanity committed May 12, 2023
    Configuration menu
    Copy the full SHA
    710ba7e View commit details
    Browse the repository at this point in the history

Commits on May 13, 2023

  1. more direct approach now works with pages only specified once

    @sanity
    sanity committed May 13, 2023
    Configuration menu
    Copy the full SHA
    a5651c1 View commit details
    Browse the repository at this point in the history

  2. navitem removed, return to keygen branch

    @sanity
    sanity committed May 13, 2023
    Configuration menu
    Copy the full SHA
    44a3967 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2023

  1. lots of work but not done yet

    @sanity
    sanity committed May 17, 2023
    Configuration menu
    Copy the full SHA
    3c30730 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'production' into keygen

    @sanity
    sanity committed May 17, 2023
    Configuration menu
    Copy the full SHA
    4a9e7af View commit details
    Browse the repository at this point in the history

Commits on May 18, 2023

  1. WIP, will probably hit pause and let Derek finish next week

    @sanity
    sanity committed May 18, 2023
    Configuration menu
    Copy the full SHA
    08cf855 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. Upgrade Kweb version

    @Derek52
    Derek52 committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    9a98eed View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2023

  1. Start on skeleton of contributing and signing a keypair.

    @Derek52
    Derek52 committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    3bf5a84 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2023

  1. add Forge JS library

    @Derek52
    Derek52 committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    7aa4600 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2023

  1. Switch to forge.all to include extra utilities

    @Derek52
    Derek52 committed Sep 3, 2023
    Configuration menu
    Copy the full SHA
    03f2882 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2023

  1. Get hashPublicKey and blind() working in JS

    @Derek52
    Derek52 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    2fa3dbf View commit details
    Browse the repository at this point in the history

  2. Get hashPublicKey and blind() working in JS

    @Derek52
    Derek52 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    6b4bbaa View commit details
    Browse the repository at this point in the history

  3. clean hashPublicKey() and blind() functions

    @Derek52
    Derek52 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    3ec521c View commit details
    Browse the repository at this point in the history

  4. write unblind()

    @Derek52
    Derek52 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    2822eaf View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2023

  1. Clean up hashPublicKey(), blind(), and unblind()

    @Derek52
    Derek52 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    8177e9a View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2023

  1. Clean up claimIdPage

    @Derek52
    Derek52 committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    d10fc3c View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2023

  1. Properly import Stripe

    @Derek52
    Derek52 committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    5899122 View commit details
    Browse the repository at this point in the history

  2. Simplify Stripe form.

    @Derek52
    Derek52 committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    661ec45 View commit details
    Browse the repository at this point in the history

  3. Simplify Stripe JS form.

    @Derek52
    Derek52 committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    1ebdbea View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2023

  1. Fix todo regarding the client side keypair.

    @Derek52
    Derek52 committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    b7101e6 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2023

  1. touchup claimId page

    @Derek52
    Derek52 committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    4bd3a29 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2023

  1. Complete the functionality of crypto.kt

    @Derek52
    Derek52 committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    22a9a99 View commit details
    Browse the repository at this point in the history

  2. Cleanup checkout.js

    @Derek52
    Derek52 committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    d7e8b45 View commit details
    Browse the repository at this point in the history

  3. Simplify ClaimID page.

    @Derek52
    Derek52 committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    7a1964a View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/staging' into keygen-staging-merge 

    # Conflicts:
#	build.gradle.kts
#	src/main/kotlin/org/freenet/website/main.kt
#	src/main/kotlin/org/freenet/website/navigationBar.kt
#	src/main/kotlin/org/freenet/website/pages/home/homePage.kt
    @Derek52
    Derek52 committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    efa91bd View commit details
    Browse the repository at this point in the history

  5. Import latestNews

    @Derek52
    Derek52 committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    036c604 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2023

  1. Correct dependencies on staging-merge

    @Derek52
    Derek52 committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    f1a3292 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/staging' into keygen-staging-merge 

    # Conflicts:
#	src/main/kotlin/org/freenet/website/main.kt
    @Derek52
    Derek52 committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    148e9df View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2023

  1. Correct dependencies on staging-merge

    @Derek52
    Derek52 committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    c6be766 View commit details
    Browse the repository at this point in the history

  2. touchup comments

    @Derek52
    Derek52 committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    2277b70 View commit details
    Browse the repository at this point in the history

  3. Put in successful payment page

    @Derek52
    Derek52 committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    36b1f0d View commit details
    Browse the repository at this point in the history

  4. ignore run configuration file with api keys

    @Derek52
    Derek52 committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    c7a220e View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2023

  1. Add TODO's with crypto bit length

    @Derek52
    Derek52 committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    ec4f19e View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2023

  1. Add Claim ID Page to routing and Navbar

    @Derek52
    Derek52 committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    72c46df View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2023

  1. Merge remote-tracking branch 'origin/staging' into keygen-staging-merge 

    # Conflicts:
#	src/main/kotlin/org/freenet/website/navigationBar.kt
    @Derek52
    Derek52 committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    75c6996 View commit details
    Browse the repository at this point in the history

  2. Fix NavBar

    @Derek52
    Derek52 committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    88986ab View commit details
    Browse the repository at this point in the history

  3. Fix NavBar

    @Derek52
    Derek52 committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    d6437c2 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'keygen' into keygen-staging-merge 

    # Conflicts:
#	src/main/kotlin/org/freenet/website/pages/renderPage.kt
    @Derek52
    Derek52 committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    94dd61b View commit details
    Browse the repository at this point in the history

  5. fix RenderPage error after merge

    @Derek52
    Derek52 committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    9368f91 View commit details
    Browse the repository at this point in the history

  6. Add skeleton structure of successful payment page

    @Derek52
    Derek52 committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    53bffca View commit details
    Browse the repository at this point in the history

  7. Re-add stripe route plugin

    @Derek52
    Derek52 committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    843e2db View commit details
    Browse the repository at this point in the history

  8. Move renderCheckout logic to Kvar

    @Derek52
    Derek52 committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    37e0532 View commit details
    Browse the repository at this point in the history

  9. Add QR Code todo

    @Derek52
    Derek52 committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    a60660a View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. Merge branch 'keygen' into keygen-staging-merge 

    # Conflicts:
#	src/main/kotlin/org/freenet/website/pages/claimId/claimIdPage.kt
#	src/main/kotlin/org/freenet/website/pages/renderPage.kt
    @Derek52
    Derek52 committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    4bcae49 View commit details
    Browse the repository at this point in the history

  2. Fix renderpage during merge

    @Derek52
    Derek52 committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    b9b236a View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2023

  1. Touchup Stripe integration

    @Derek52
    Derek52 committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    2317d17 View commit details
    Browse the repository at this point in the history

  2. Include Jquery

    @Derek52
    Derek52 committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    4d96a94 View commit details
    Browse the repository at this point in the history

  3. Upgrade Stripe dependency

    @Derek52
    Derek52 committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    a4cbb16 View commit details
    Browse the repository at this point in the history

  4. Fix Stripe modal

    @Derek52
    Derek52 committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    81d9a6e View commit details
    Browse the repository at this point in the history

  5. Removed trailing slash

    @Derek52
    Derek52 committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    39e3c34 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2023

  1. Add support for setting tier levels

    @Derek52
    Derek52 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    d435392 View commit details
    Browse the repository at this point in the history

  2. Add imports

    @Derek52
    Derek52 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    6e019df View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2023

  1. Consolidate button code.

    @Derek52
    Derek52 committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    9f3c4a8 View commit details
    Browse the repository at this point in the history

  2. Move buttons from columns to button-grup.

    @Derek52
    Derek52 committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    4717621 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2023

  1. Load QR Code JS file.

    @Derek52
    Derek52 committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    417e13f View commit details
    Browse the repository at this point in the history

  2. Load RSA key from environment variable instead of generate one.

    @Derek52
    Derek52 committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    578d946 View commit details
    Browse the repository at this point in the history

  3. Setup dummy QR code.

    @Derek52
    Derek52 committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    5bb5030 View commit details
    Browse the repository at this point in the history

  4. Clean up

    @Derek52
    Derek52 committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    fe74754 View commit details
    Browse the repository at this point in the history

  5. Add comment

    @Derek52
    Derek52 committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    9bab63f View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2023

  1. Delete unneeded pages

    @Derek52
    Derek52 committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    a4ac7ed View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2024

  1. store sample RSA key in json.

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

Commits on Feb 4, 2024

  1. Remove unused payment pages.

    @Derek52
    Derek52 committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    f7c7d57 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2024

  1. Add tool to create master ECC keypair and contributor RSA key signers.

    @Derek52
    Derek52 committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    6074dda View commit details
    Browse the repository at this point in the history

  2. Touchup key generator

    @Derek52
    Derek52 committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    ce490c1 View commit details
    Browse the repository at this point in the history

  3. Touchup and annotate claimIdPage and JS

    @Derek52
    Derek52 committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    009e315 View commit details
    Browse the repository at this point in the history