projects / akkoma / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Fix merge conflicts with upstream
[akkoma] / test / pleroma / web / admin_api /
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-03 HaelwennMerge branch 'chore/rename-chat' into 'develop' tree | commitdiff
2021-06-02 feldMerge branch 'Snow-develop-patch-01683' 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 Mark FelderRename the non-federating Chat feature to Shout tree | commitdiff
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-06-01 feldMerge branch 'cycles-frontend-static' into 'develop' tree | commitdiff
2021-06-01 feldMerge branch 'cycles-base-url' into 'develop' 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-31 Alex GleasonDeprecate Pleroma.Web.base_url/0 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 Alex GleasonMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2021-04-16 rinpatchMerge branch 'features/ingestion-ecto-tag' into 'develop' tree | commitdiff
2021-04-16 rinpatchMerge branch 'feature/521-pinned-post-federation' into... tree | commitdiff
2021-04-16 rinpatchMerge branch 'fix/2593-reading-exported-config-file... tree | commitdiff
2021-04-15 feldMerge branch 'develop' into 'fix/notifsettings-breaking... tree | commitdiff
2021-04-14 feldMerge branch 'fix/adminapi-concurrent-limiter' into... tree | commitdiff
2021-04-14 Mark FelderRevert guards on string_to_elixir_types/1, remove unnec... tree | commitdiff
2021-04-13 Mark FelderInitial test validating the AdminAPI issue tree | commitdiff
2021-04-13 HaelwennMerge branch 'fix/instance-thumbnail-url' into 'develop' tree | commitdiff
2021-04-13 Mark FelderFix assignment / assertion tree | commitdiff
2021-04-13 Mark FelderValidate custom instance thumbnail set via AdminAPI... tree | commitdiff
2021-03-19 rinpatchMerge branch 'mediaproxy-decode' into 'develop' tree | commitdiff
2021-03-19 rinpatchMerge branch 'fix/remove_auto_nsfw' into 'develop' tree | commitdiff
2021-03-19 rinpatchMerge branch 'bugfix/bridgy-user-icon' into 'develop' tree | commitdiff
2021-03-16 HaelwennMerge branch 'update_open_api_spex' into 'develop' tree | commitdiff
2021-03-10 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2021-03-10 HaelwennMerge branch 'openapi/admin/user' into 'develop' tree | commitdiff
2021-03-02 lainMerge branch 'release/2.3.0' into 'stable' tree | commitdiff
2021-03-02 Egor KislitsynAdd OpenAPI spec for AdminAPI.UserController tree | commitdiff
2021-02-28 lainMerge branch 'features/reports-enhancements' into ... tree | commitdiff
2021-02-28 lainMerge branch 'feat/client_app_details' into 'develop' tree | commitdiff
2021-02-26 feldMerge branch 'ecto-rollback-in-test-env' into 'develop' tree | commitdiff
2021-02-24 HaelwennMerge branch 'docfix/chat-token' into 'develop' tree | commitdiff
2021-02-23 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2021-02-18 rinpatchMerge branch 'fix/chats-no-unread-in-openapi' into... tree | commitdiff
2021-02-17 HaelwennMerge branch 'feat/enforce-admin-scope-unconditionally... tree | commitdiff
2021-02-17 rinpatchRemove `:auth, :enforce_oauth_admin_scope_usage` tree | commitdiff
2021-02-12 rinpatchMerge branch 'bugfix/answer-outbox' into 'develop' tree | commitdiff
2021-02-11 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2021-02-09 rinpatchMerge branch 'features/ap_id-c2s-authentication' into... tree | commitdiff
2021-02-06 rinpatchMerge branch 'feat/allow_alt_text_search_config' into... tree | commitdiff
2021-02-04 Mark FelderMerge branch 'develop' into fix/reports-from-admins tree | commitdiff
2021-02-04 feldMerge branch 'fix/configdb-error' into 'develop' tree | commitdiff
2021-02-04 HaelwennMerge branch 'bugfix/notice-external-redirect' into... tree | commitdiff
2021-02-03 feldMerge branch 'develop' into 'fix/2412-filters' tree | commitdiff
2021-02-03 feldMerge branch 'fix/2449-scheduled-poll-bug' into 'develop' 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-28 Mark FelderImprove error message for ConfigDB tree | commitdiff
2021-01-27 lainMerge branch 'chore/tests-use-clear_config' into 'develop' tree | commitdiff
2021-01-27 Alexander Strizhakovadded total tree | commitdiff
2021-01-27 Alexander Strizhakovadded total 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 FelderMake setting user activation status explicit 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
next
Fork of https://akkoma.dev/AkkomaGang/akkoma.git