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.

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

[WIP] User Accounts #623

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

[WIP] User Accounts #623

wants to merge 22 commits into from

Commits on Jul 29, 2023

  1. Initial user data seperation

    Syer10 committed Jul 29, 2023
    Configuration menu
    Copy the full SHA
    1991a82 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2023

  1. Forgot to add new files

    Syer10 committed Jul 30, 2023
    Configuration menu
    Copy the full SHA
    30b4714 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c7ff5af View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2023

  1. Merge branch 'upstream-master' into user_accounts

    # Conflicts:
    #	server/build.gradle.kts
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ChapterMutation.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/MangaMutation.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/server/subscriptions/ApolloSubscriptionProtocolHandler.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/server/subscriptions/ApolloSubscriptionSessionState.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/manga/controller/UpdateController.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Chapter.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Library.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/update/Updater.kt
    Syer10 committed Aug 19, 2023
    Configuration menu
    Copy the full SHA
    466fb9b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f0b3187 View commit details
    Browse the repository at this point in the history
  3. Fix actions

    Syer10 committed Aug 19, 2023
    Configuration menu
    Copy the full SHA
    fef9ce9 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    729f91d View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    bf43902 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    b229edb View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2023

  1. Configuration menu
    Copy the full SHA
    684562c View commit details
    Browse the repository at this point in the history
  2. Implement registration

    Syer10 committed Aug 20, 2023
    Configuration menu
    Copy the full SHA
    283e537 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1ba3d70 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2023

  1. Cleanup

    Syer10 committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    b5b61e4 View commit details
    Browse the repository at this point in the history
  2. Probably fix updater

    Syer10 committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    82a9003 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2023

  1. Configuration menu
    Copy the full SHA
    0c5e86a View commit details
    Browse the repository at this point in the history
  2. Authenticate websockets

    Syer10 committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    3792513 View commit details
    Browse the repository at this point in the history
  3. Handle forbidden exceptions

    Syer10 committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    78c8321 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'upstream-master' into user_accounts

    # Conflicts:
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ChapterMutation.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ExtensionMutation.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/CategoryQuery.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ChapterQuery.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ExtensionQuery.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/MangaQuery.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/MetaQuery.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/SourceQuery.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/manga/controller/MangaController.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/chapter/ChapterForDownload.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/Downloader.kt
    Syer10 committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    f0634a4 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2023

  1. Minor cleanup

    Syer10 committed Sep 2, 2023
    Configuration menu
    Copy the full SHA
    39e4da2 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2023

  1. Merge branch 'upstream-master' into user_accounts

    # Conflicts:
    #	server/src/main/kotlin/suwayomi/tachidesk/global/controller/GlobalMetaController.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/global/controller/SettingsController.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/global/impl/GlobalMeta.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/CategoryDataLoader.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/ChapterDataLoader.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/MangaDataLoader.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/MetaDataLoader.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/BackupMutation.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/CategoryMutation.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ChapterMutation.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/DownloadMutation.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ExtensionMutation.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/MangaMutation.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/MetaMutation.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/SettingsMutation.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/SourceMutation.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/UpdateMutation.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/BackupQuery.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/CategoryQuery.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ChapterQuery.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ExtensionQuery.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/InfoQuery.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/MangaQuery.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/MetaQuery.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/SourceQuery.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/server/TachideskGraphQLContextFactory.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/server/TachideskGraphQLSchema.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/server/TachideskGraphQLServer.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/graphql/types/SettingsType.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/manga/controller/BackupController.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/manga/controller/CategoryController.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/manga/controller/DownloadController.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/manga/controller/ExtensionController.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/manga/controller/MangaController.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/manga/controller/SourceController.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/manga/controller/UpdateController.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Category.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/CategoryManga.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Chapter.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Library.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Manga.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/MangaList.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Search.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupImport.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/chapter/ChapterForDownload.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/DownloadManager.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/update/Updater.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/CategoryTable.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/ChapterTable.kt
    #	server/src/main/kotlin/suwayomi/tachidesk/server/JavalinSetup.kt
    #	server/src/test/kotlin/suwayomi/tachidesk/manga/impl/CategoryMangaTest.kt
    #	server/src/test/kotlin/suwayomi/tachidesk/manga/impl/MangaTest.kt
    #	server/src/test/kotlin/suwayomi/tachidesk/manga/impl/SearchTest.kt
    Syer10 committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    338d174 View commit details
    Browse the repository at this point in the history
  2. Data object

    Syer10 committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    85eba82 View commit details
    Browse the repository at this point in the history
  3. Fix build

    Syer10 committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    37cd93b View commit details
    Browse the repository at this point in the history