projects / akkoma / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Fix merge conflicts with upstream
[akkoma] / test / pleroma / web / o_auth /
2021-06-04 Sean KingFix merge conflicts with upstream tree | commitdiff
2021-06-04 HaelwennMerge branch 'tests/openapi-everywhere' into 'develop' tree | commitdiff
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-06-01 HaelwennMerge branch 'features/validators-note' into 'develop' tree | commitdiff
2021-05-31 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-05-30 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-05-28 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-05-28 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-05-28 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-05-19 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-05-19 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-05-16 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-05-16 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-05-14 Alex GleasonMerge remote-tracking branch 'upstream/attachment-meta... tree | commitdiff
2021-05-13 Alex GleasonMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2021-05-03 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-04-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2021-04-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2021-04-29 feldMerge branch 'oauth-token-id' into 'develop' tree | commitdiff
2021-04-29 Alex GleasonMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2021-04-29 Alex GleasonMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2021-03-24 Alex GleasonReturn token's primary key with POST /oauth/token tree | commitdiff
2021-03-02 lainMerge branch 'release/2.3.0' into 'stable' tree | commitdiff
2021-02-26 feldMerge branch 'ecto-rollback-in-test-env' into 'develop' tree | commitdiff
2021-02-12 rinpatchMerge branch 'bugfix/answer-outbox' into 'develop' tree | commitdiff
2021-02-03 feldMerge branch 'develop' into 'fix/2412-filters' tree | commitdiff
2021-02-03 feldMerge branch 'feature/2438-users-posts-total-count... tree | commitdiff
2021-02-03 rinpatchMerge branch 'feat/openapi-spec-export' into 'develop' tree | commitdiff
2021-02-02 feldMerge branch 'develop' into 'fix/2411-mutes-api' tree | commitdiff
2021-01-31 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2021-01-27 lainMerge branch 'chore/tests-use-clear_config' into 'develop' tree | commitdiff
2021-01-26 feldMerge branch 'service-worker-allowed-header' into ... tree | commitdiff
2021-01-26 Mark FelderConvert tests to all use clear_config instead of Plerom... tree | commitdiff
2021-01-26 lainMerge branch 'develop' into '2435-list-multiple-users' tree | commitdiff
2021-01-26 HaelwennMerge branch 'fix/missing-own_votes' into 'develop' tree | commitdiff
2021-01-25 Mark FelderMerge branch 'develop' into docs/apache-config tree | commitdiff
2021-01-25 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2021-01-25 feldMerge branch 'refactor/deactivated_user_field' into... tree | commitdiff
2021-01-25 Mark FelderMerge branch 'develop' into refactor/deactivated_user_field tree | commitdiff
2021-01-21 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2021-01-20 feldMerge branch 'copyright-fun' into 'develop' tree | commitdiff
2021-01-20 feldMerge branch 'deprecate-public_endpoint' into 'develop' tree | commitdiff
2021-01-20 feldMerge branch 'update/oban' into 'develop' tree | commitdiff
2021-01-19 rinpatchMerge branch 'stable' into mergeback/2.2.2 tree | commitdiff
2021-01-18 feldMerge branch 'fix/reblog-api' into 'develop' tree | commitdiff
2021-01-18 Mark FelderMerge branch 'develop' into refactor/deactivated_user_field tree | commitdiff
2021-01-18 feldMerge branch 'refactor/approval_pending_user_field... tree | commitdiff
2021-01-18 Mark FelderMerge branch 'develop' into refactor/approval_pending_u... tree | commitdiff
2021-01-18 feldMerge branch 'refactor/confirmation_pending_user_field... tree | commitdiff
2021-01-15 Mark FelderRemove toggle_confirmation; require explicit state... tree | commitdiff
2021-01-15 Mark FelderChange user.confirmation_pending field to user.is_confirmed tree | commitdiff
2021-01-15 Mark FelderChange user.deactivated field to user.is_active tree | commitdiff
2021-01-15 Mark FelderChange user.approval_pending field to user.is_approved tree | commitdiff
2021-01-15 HaelwennMerge branch 'optimize-command_available' into 'develop' tree | commitdiff
2021-01-14 rinpatchMerge branch 'pleroma-password' into 'develop' tree | commitdiff
2021-01-14 Lain SoykafPbkdf2: Use it everywhere. tree | commitdiff
2021-01-13 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2021-01-13 Lain SoykafLinting tree | commitdiff
2021-01-13 lainPassword: Replace Pbkdf2 with Password. tree | commitdiff
2021-01-13 HaelwennMerge branch 'chores/bump-copyright' into 'develop' tree | commitdiff
2021-01-13 Haelwenn (lanodan... Bump Copyright to 2021 tree | commitdiff
2021-01-05 feldMerge branch 'fix/mediaproxy-config-descriptions' into... tree | commitdiff
2020-12-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2020-12-28 HaelwennMerge branch 'features/hashtag-column' into 'develop' tree | commitdiff
2020-12-26 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2020-12-26 lainMerge branch 'cachex-test' into 'develop' tree | commitdiff
2020-12-23 lainMerge branch 'stable' into mergeback/2.2.1 tree | commitdiff
2020-12-21 lainTests: Make as many tests as possible async. tree | commitdiff
2020-12-20 rinpatchMerge branch 'bugfix/mastofe-install-script' into ... tree | commitdiff
2020-12-17 Alex GleasonMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2020-12-15 lainMerge branch 'support/2255_posix_errors' into 'develop' tree | commitdiff
2020-12-09 feldMerge branch 'oauth-entities-expiration-tweaks' into... tree | commitdiff
2020-12-09 Ivan TashkinovTweaks to OAuth entities expiration: changed default... tree | commitdiff
2020-12-09 lainMerge branch 'auth-improvements' into 'develop' tree | commitdiff
2020-12-07 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2020-12-06 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2020-12-04 feldMerge branch 'issue/2256' into 'develop' tree | commitdiff
2020-11-30 Ivan Tashkinov[#3112] Allowed revoking same-user token from any apps... tree | commitdiff
2020-11-28 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2020-11-28 Ivan TashkinovOAuth form user remembering feature. Local MastoFE... tree | commitdiff
2020-11-25 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2020-11-25 Ivan TashkinovSession token setting on token exchange. Auth-related... tree | commitdiff
2020-11-25 rinpatchMerge branch 'fix/2323-release-configuration-provider... tree | commitdiff
2020-11-25 rinpatchMerge branch 'features/ruby-elements' into 'develop' tree | commitdiff
2020-11-24 HaelwennMerge branch 'chore/jason-in-tests' into 'develop' tree | commitdiff
2020-11-23 Mark FelderUse Jason instead of Poison in tests tree | commitdiff
2020-11-21 feldMerge branch 'libmagic' into 'develop' tree | commitdiff
2020-11-15 Alex GleasonMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2020-11-12 rinpatchMerge branch 'release/2.2.0' into 'stable' tree | commitdiff
2020-11-04 lainMerge branch 'default-mrf' into 'develop' tree | commitdiff
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma... tree | commitdiff
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma... tree | commitdiff
next
Fork of https://akkoma.dev/AkkomaGang/akkoma.git