Skip to content
This repository has been archived by the owner on Mar 21, 2024. It is now read-only.

ProxyFox v2.1 #20

Draft
wants to merge 149 commits into
base: master
Choose a base branch
from
Draft

ProxyFox v2.1 #20

wants to merge 149 commits into from

Commits on Oct 30, 2022

  1. Configuration menu
    Copy the full SHA
    3161a91 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2022

  1. Merge branch 'master' into dev/2.1

    # Conflicts:
    #	modules/bot/src/main/kotlin/dev/proxyfox/bot/BotUtil.kt
    Ampflower committed Nov 6, 2022
    Configuration menu
    Copy the full SHA
    9273c56 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2022

  1. Initial API stuff

    TibiNonEst committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    37b6909 View commit details
    Browse the repository at this point in the history
  2. Fix funni failure

    TibiNonEst committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    b956713 View commit details
    Browse the repository at this point in the history
  3. More API stuff

    TibiNonEst committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    66bd124 View commit details
    Browse the repository at this point in the history
  4. Messages et al.

    TibiNonEst committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    2c8d0e9 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a973e26 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2022

  1. Misc API stuff

    TibiNonEst committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    dca836f View commit details
    Browse the repository at this point in the history
  2. Initial API authentication

    TibiNonEst committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    0be4f9e View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2022

  1. Fix casing

    TibiNonEst committed Nov 11, 2022
    Configuration menu
    Copy the full SHA
    fffe373 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2022

  1. Configuration menu
    Copy the full SHA
    f2d2002 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2022

  1. Configuration menu
    Copy the full SHA
    5adaa39 View commit details
    Browse the repository at this point in the history
  2. Apply licenses

    Oliver-makes-code committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    36dbc57 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ad0f08d View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2022

  1. Misc fixes

    Oliver-makes-code committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    767ebe5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a7243f9 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5b6aa64 View commit details
    Browse the repository at this point in the history
  4. Fix build

    Oliver-makes-code committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    80befbe View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2022

  1. Fix fix build build

    Oliver-makes-code committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    4670604 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2022

  1. Configuration menu
    Copy the full SHA
    0fa816c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7f013a0 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2022

  1. aaaaaa

    TibiNonEst committed Nov 21, 2022
    Configuration menu
    Copy the full SHA
    1b2f51e View commit details
    Browse the repository at this point in the history
  2. totally fixed

    TibiNonEst committed Nov 21, 2022
    Configuration menu
    Copy the full SHA
    5b6e20f View commit details
    Browse the repository at this point in the history
  3. Add docker builds

    TibiNonEst committed Nov 21, 2022
    Configuration menu
    Copy the full SHA
    1e93802 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    7a8989c View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2022

  1. Bump proxyfox-command

    TibiNonEst committed Nov 22, 2022
    Configuration menu
    Copy the full SHA
    c737366 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4a6cbcf View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2022

  1. Pain

    TibiNonEst committed Dec 17, 2022
    Configuration menu
    Copy the full SHA
    b8f2e6e View commit details
    Browse the repository at this point in the history
  2. cursed

    TibiNonEst committed Dec 17, 2022
    Configuration menu
    Copy the full SHA
    a7b33dc View commit details
    Browse the repository at this point in the history
  3. Revert "cursed"

    This reverts commit a7b33dc.
    TibiNonEst committed Dec 17, 2022
    Configuration menu
    Copy the full SHA
    eb5f784 View commit details
    Browse the repository at this point in the history
  4. Revert "Pain"

    This reverts commit b8f2e6e.
    TibiNonEst committed Dec 17, 2022
    Configuration menu
    Copy the full SHA
    64ebfcb View commit details
    Browse the repository at this point in the history
  5. Revert "totally fixed"

    This reverts commit 5b6e20f.
    TibiNonEst committed Dec 17, 2022
    Configuration menu
    Copy the full SHA
    fe584ec View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2022

  1. Finish database refactor

    TibiNonEst committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    ccea77b View commit details
    Browse the repository at this point in the history

Commits on Dec 25, 2022

  1. Configuration menu
    Copy the full SHA
    b6036a7 View commit details
    Browse the repository at this point in the history
  2. Use Java 18

    Oliver-makes-code committed Dec 25, 2022
    Configuration menu
    Copy the full SHA
    2a1c444 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c8714b3 View commit details
    Browse the repository at this point in the history

Commits on Jan 1, 2023

  1. Update Gradle to 7.6

    Ampflower committed Jan 1, 2023
    Configuration menu
    Copy the full SHA
    b706da3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    dbb9726 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2023

  1. Add far better logging of exceptions.

    May make it worse for looking at the stacktrace on mobile tho.
    Ampflower committed Jan 2, 2023
    Configuration menu
    Copy the full SHA
    201642a View commit details
    Browse the repository at this point in the history
  2. Merge branch 'dev/2.0' into dev/2.1

    # Conflicts:
    #	modules/bot/src/main/kotlin/dev/proxyfox/bot/string/node/StringListNode.kt
    Ampflower committed Jan 2, 2023
    Configuration menu
    Copy the full SHA
    4754fe5 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2023

  1. Configuration menu
    Copy the full SHA
    181e27c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4d0142b View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2023

  1. Configuration menu
    Copy the full SHA
    49f7cdc View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2023

  1. Most tests are fixed

    TibiNonEst committed Jan 7, 2023
    Configuration menu
    Copy the full SHA
    759fb18 View commit details
    Browse the repository at this point in the history
  2. Fix case sensitivity in PluralKitImporter

    The test expected casing to be sensitive, but the logic expected
    the casing to be insensitive, which only showed through because
    InMemoryDatabase properly implemented case (in)sensitivity.
    Ampflower committed Jan 7, 2023
    Configuration menu
    Copy the full SHA
    331d44c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    25b2682 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f60f555 View commit details
    Browse the repository at this point in the history
  5. Fix logic errors & mem leaks in InMemoryDatabase

    Now correctly drops systems and will try case-sensitive search
    before case-insensitive search, as it'd probably make more sense to
    exactly match before falling back to insensitive searches.
    Ampflower committed Jan 7, 2023
    Configuration menu
    Copy the full SHA
    5a5fba7 View commit details
    Browse the repository at this point in the history
  6. Harden ImporterTest to logic errors and its own assertions

    Now more thoroughly tests system data returned from the importer
    to check that the ID and user information is correct, being the
    only fully functioning system creation test.
    Ampflower committed Jan 7, 2023
    Configuration menu
    Copy the full SHA
    7d34dff View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2023

  1. Add PolyIgnorePrimitive

    Note: It still creates the object.. because it's too late to intercept
    the object creation to ignore it. Complain to Jetbrains.
    Ampflower committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    4432d1a View commit details
    Browse the repository at this point in the history
  2. Fix Instant parsing

    All current tests should now be functional.
    Ampflower committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    70cae0a View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'origin/dev/2.1' into api-help-me

    # Conflicts:
    #	gradle/libs.versions.toml
    #	modules/bot/build.gradle.kts
    #	modules/bot/src/main/kotlin/dev/proxyfox/bot/BotUtil.kt
    #	modules/bot/src/main/kotlin/dev/proxyfox/bot/MessageHandler.kt
    #	modules/bot/src/main/kotlin/dev/proxyfox/bot/command/MemberCommands.kt
    #	modules/bot/src/main/kotlin/dev/proxyfox/bot/command/SwitchCommands.kt
    #	modules/bot/src/main/kotlin/dev/proxyfox/bot/command/SystemCommands.kt
    #	modules/database/src/main/kotlin/dev/proxyfox/database/JsonDatabase.kt
    #	modules/database/src/main/kotlin/dev/proxyfox/database/MongoDatabase.kt
    #	settings.gradle.kts
    Ampflower committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    b1e08f8 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8cef09d View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    12bed62 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    f606126 View commit details
    Browse the repository at this point in the history
  7. Merge remote-tracking branch 'origin/dev/2.1' into api-help-me

    # Conflicts:
    #	modules/database/src/main/kotlin/dev/proxyfox/database/etc/exporter/Exporter.kt
    #	modules/database/src/test/kotlin/dev/proxyfox/importer/ImporterTest.kt
    Ampflower committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    ea16b6c View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    27954db View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    02abe43 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    987d547 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    5472cce View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    c4bad7e View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    947f6e3 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2023

  1. Configuration menu
    Copy the full SHA
    f6bdc62 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fe36748 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    60d5b18 View commit details
    Browse the repository at this point in the history
  4. Convert ConversionMain.kt to Kotlin Serialization

    I honestly forgot this existed.
    Ampflower committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    1c5d45b View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    71dc8e1 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2023

  1. Configuration menu
    Copy the full SHA
    f5922c2 View commit details
    Browse the repository at this point in the history
  2. Clarify comment.

    Ampflower committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    c2d5da4 View commit details
    Browse the repository at this point in the history
  3. Correct typo in gradle.yml

    Ampflower committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    7b9f902 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e148879 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    9ac901d View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    d4563e6 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2023

  1. Configuration menu
    Copy the full SHA
    0721c9a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    20bab0c View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2023

  1. Configuration menu
    Copy the full SHA
    0031549 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3b95c4a View commit details
    Browse the repository at this point in the history
  3. h

    Oliver-makes-code committed Jan 16, 2023
    Configuration menu
    Copy the full SHA
    484f4d4 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    756f545 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    4056930 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    6504d30 View commit details
    Browse the repository at this point in the history
  7. a

    Oliver-makes-code committed Jan 16, 2023
    Configuration menu
    Copy the full SHA
    4218348 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    a090b2f View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    7051da8 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2023

  1. Configuration menu
    Copy the full SHA
    3f763a4 View commit details
    Browse the repository at this point in the history
  2. Work on groups

    Oliver-makes-code committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    bffdda4 View commit details
    Browse the repository at this point in the history
  3. Apply licenses

    Oliver-makes-code committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    9c4e4ea View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    33cd92e View commit details
    Browse the repository at this point in the history
  5. Apply licenses

    TibiNonEst committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    fa5f19f View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2023

  1. Configuration menu
    Copy the full SHA
    a85bead View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2023

  1. Merge tag 'dev/2.0-old' into HEAD

    Reference tag for 2.0.8
    
    # -----BEGIN PGP SIGNATURE-----
    #
    # iQIzBAABCAAdFiEEtW0eys0hDREc4qe0h1YqmhDKsi8FAmPUmqwACgkQh1YqmhDK
    # si8tYg//V6MEKAfjOU5Hq2Grh2Q+6tOtgs9g9At1xtclE8i8Xz2CqM91tkDFBddV
    # 0cmt+FHafO6MLKYmvT4vhp9xkcVz3e0CiEvZc8HTtU7yMN/4woA3sWl55ALKs/Cl
    # e9pYrp3AMnlzXo07SnUQMgXHEZe4wef1gTAndt9QKy4s0hBEcTEowoty1l5076AJ
    # 8NsVPAzIjar5qanh2VbGU5o11TaOBXbmbYQG4FD6KPk07RNzXe3WTe4Z9gGzFEkp
    # v7rk/O/xjJfjZeY3pI/WgS73qHT+tu3XPHnfP3+s4YkqOX7eYpobmFvUkem4kLTB
    # SDgrAlwa9uvK2OIwv32CJRQ65PA7DKGT3s6uQvToQD9pY9fzvGt76SmUBTBFTCmo
    # MxFmi3Rk1fyq8YMCi4amLuAHEb0hztOaUzd0Fu65emdGnDKvd3mHSP02rZQ91xuo
    # c4S193gMWQz3Q4BtHeiACF3nX1s6r9sPj6MO7laXfySopY3Iqb3Jx+AT38k+VE09
    # GWettA2HFK+uMyE5jnxurDKiljJNLt5NLdlHp9NEtcNlO3l68dc/WAdUjQnL+3wl
    # aMxPeI3ZW3nYQN57GaP2EJt/AIAcMLzhmcOM0yulmdT6ji7etomMg+9hMr8z4J+y
    # KFL4p2HCxCMk16xasQgNcGRqhrANhDg4juB7lWedFTSt95ncUZQ=
    # =9ldh
    # -----END PGP SIGNATURE-----
    # gpg: Signature made Fri 27 Jan 2023 09:46:52 PM CST
    # gpg:                using RSA key B56D1ECACD210D111CE2A7B487562A9A10CAB22F
    # gpg: Good signature from "Ampflower <[email protected]>" [ultimate]
    
    # Conflicts:
    #	.github/workflows/gradle.yml
    #	modules/bot/src/main/kotlin/dev/proxyfox/bot/BotUtil.kt
    #	modules/database/src/main/kotlin/dev/proxyfox/database/etc/exporter/Exporter.kt
    #	modules/database/src/main/kotlin/dev/proxyfox/database/etc/types/PkTypes.kt
    #	settings.gradle.kts
    Ampflower committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    b5810bc View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/master' into HEAD

    # Conflicts:
    #	.github/workflows/gradle.yml
    #	modules/bot/src/main/kotlin/dev/proxyfox/bot/BotUtil.kt
    #	modules/database/src/main/kotlin/dev/proxyfox/database/etc/exporter/Exporter.kt
    #	modules/database/src/main/kotlin/dev/proxyfox/database/etc/types/PkTypes.kt
    #	settings.gradle.kts
    Ampflower committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    79c9a45 View commit details
    Browse the repository at this point in the history
  3. Fix merge conflicts n stuff

    Oliver-makes-code authored and Ampflower committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    0451b2a View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2023

  1. Migrate to MarKt

    Oliver-makes-code committed Feb 11, 2023
    Configuration menu
    Copy the full SHA
    94464c8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    41ae203 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f969636 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b85ab99 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2023

  1. Configuration menu
    Copy the full SHA
    4181464 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8c61753 View commit details
    Browse the repository at this point in the history
  3. Bump MarKt version

    Oliver-makes-code committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    ef57ef9 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6b6a44c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    7322784 View commit details
    Browse the repository at this point in the history
  6. Add Kord.onlyIf

    Oliver-makes-code committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    a4f1789 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    b0beff2 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    b21947c View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    2aff215 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    c6e9046 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2023

  1. Configuration menu
    Copy the full SHA
    7bfe052 View commit details
    Browse the repository at this point in the history
  2. fix build

    Oliver-makes-code committed Feb 18, 2023
    Configuration menu
    Copy the full SHA
    710c564 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2023

  1. Merge branch 'master' into dev/2.1

    # Conflicts:
    #	modules/bot/src/main/kotlin/dev/proxyfox/bot/MessageHandler.kt
    #	modules/bot/src/main/kotlin/dev/proxyfox/bot/command/MemberCommands.kt
    #	modules/bot/src/main/kotlin/dev/proxyfox/bot/command/MiscCommands.kt
    #	modules/bot/src/main/kotlin/dev/proxyfox/bot/command/SystemCommands.kt
    #	modules/bot/src/main/kotlin/dev/proxyfox/bot/webhook/ProxyContext.kt
    #	modules/database/src/main/kotlin/dev/proxyfox/database/JsonDatabase.kt
    Ampflower committed Feb 25, 2023
    Configuration menu
    Copy the full SHA
    ef3655f View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/dev/2.1' into dev/2.1

    # Conflicts:
    #	modules/bot/src/main/kotlin/dev/proxyfox/bot/command/MemberCommands.kt
    #	modules/bot/src/main/kotlin/dev/proxyfox/bot/command/SystemCommands.kt
    Ampflower committed Feb 25, 2023
    Configuration menu
    Copy the full SHA
    4fe3d79 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2aee338 View commit details
    Browse the repository at this point in the history
  4. Misc fixes

    Oliver-makes-code committed Feb 25, 2023
    Configuration menu
    Copy the full SHA
    fbaa830 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    672f812 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    5769517 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    88ad2b4 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    0952085 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2023

  1. Update gitignore

    Oliver-makes-code committed Feb 26, 2023
    Configuration menu
    Copy the full SHA
    c59a629 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9a2cb00 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2023

  1. Configuration menu
    Copy the full SHA
    95fd406 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ac2c662 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    cd462c5 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    7fac04b View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    fc42f61 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    8f3ad69 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2023

  1. Merge branch 'master' into dev/2.1

    # Conflicts:
    #	modules/bot/src/main/kotlin/dev/proxyfox/bot/webhook/ProxyContext.kt
    Oliver-makes-code committed May 1, 2023
    Configuration menu
    Copy the full SHA
    507e810 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c902672 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a4ec815 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    17434af View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b613d4c View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    a860cd7 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    a50c73c View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    cab2c3b View commit details
    Browse the repository at this point in the history

Commits on May 2, 2023

  1. Configuration menu
    Copy the full SHA
    21ab55f View commit details
    Browse the repository at this point in the history
  2. Bumb logback

    Oliver-makes-code committed May 2, 2023
    Configuration menu
    Copy the full SHA
    910ea42 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    489af71 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    3d38b3f View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2023

  1. Configuration menu
    Copy the full SHA
    a4d6c43 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8a40ce5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9ce6a59 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a83022f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    e2986fc View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. Update dependencies

    Ampflower committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    b324dac View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0b07b1b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b13ab66 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2023

  1. Merge remote-tracking branch 'origin/master' into dev/2.1

    # Conflicts:
    #	gradle.properties
    #	modules/bot/src/main/kotlin/dev/proxyfox/bot/BotUtil.kt
    #	modules/database/src/main/kotlin/dev/proxyfox/database/etc/importer/PluralKitImporter.kt
    #	modules/database/src/main/kotlin/dev/proxyfox/database/etc/types/PkTypes.kt
    #	modules/database/src/main/kotlin/dev/proxyfox/database/records/member/MemberProxyTagRecord.kt
    Ampflower committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    56ebb7a View commit details
    Browse the repository at this point in the history
  2. :3

    Oliver-makes-code committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    8dbd287 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2023

  1. Configuration menu
    Copy the full SHA
    22b67fe View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2023

  1. Configuration menu
    Copy the full SHA
    1334a56 View commit details
    Browse the repository at this point in the history