projects / akkoma / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Resolve merge conflicts
[akkoma] / lib / pleroma / web / admin_api /
2019-07-15 Mark FelderMerge branch 'develop' into feature/matstodon-statuses... tree | commitdiff
2019-07-15 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2019-07-11 kaniiniMerge branch 'admin-configure' into 'develop' tree | commitdiff
2019-07-11 Alexander Strizhakovadmin api configure changes tree | commitdiff
2019-07-11 Egor KislitsynMerge branch 'develop' into feature/addressable-lists tree | commitdiff
2019-07-10 kaniiniMerge branch 'localization' into 'develop' tree | commitdiff
2019-07-10 Egor KislitsynWrap error messages into gettext helpers tree | commitdiff
2019-07-10 kaniiniMerge branch 'release/listener' into 'develop' tree | commitdiff
2019-07-10 kaniiniMerge branch 'fix/license-attribution' into 'develop' tree | commitdiff
2019-07-10 feldAdd license/copyright to all project files tree | commitdiff
2019-07-09 Ivan Tashkinov[#878] Merge remote-tracking branch 'remotes/upstream... tree | commitdiff
2019-07-09 kaniiniMerge branch 'feature/allow-user-query-via-id' into... tree | commitdiff
2019-07-09 kaniiniMerge branch 'remove-avatar-header' into 'develop' tree | commitdiff
2019-07-09 Mark FelderMerge branch 'develop' into feature/allow-user-query... tree | commitdiff
2019-07-06 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop... tree | commitdiff
2019-07-05 Maxim FilippovAdmin API: Allow querying user by ID tree | commitdiff
2019-07-02 kaniiniMerge branch 'admin-report-view-user-fallback' into... tree | commitdiff
2019-07-02 EugenijAdd fallback value to the admin report view. tree | commitdiff
2019-06-29 kaniiniMerge branch 'feature/merge-mastodon-admin-views-for... tree | commitdiff
2019-06-28 lainMerge branch 'release-docs' into 'develop' tree | commitdiff
2019-06-28 Maxim FilippovMerge admin and mastodon user views for reports tree | commitdiff
2019-06-27 kaniiniMerge branch 'idempotency-plug' into 'develop' tree | commitdiff
2019-06-27 kaniiniMerge branch 'fix/admin-configure' into 'develop' tree | commitdiff
2019-06-27 Alexander Strizhakovdon't delete config settings on admin update tree | commitdiff
2019-06-26 rinpatchMerge branch 'update-mastofe/glitch-soc-2019-06-26... tree | commitdiff
2019-06-23 kaniiniMerge branch 'bind-to-localhost' into 'develop' tree | commitdiff
2019-06-23 kaniiniMerge branch 'rich_media_titles_two' into 'develop' tree | commitdiff
2019-06-23 kaniiniMerge branch 'admin-config' into 'develop' tree | commitdiff
2019-06-23 Alex Ssupport for config groups tree | commitdiff
2019-06-23 Sachin JoshiMerge branch 'develop' into 'remove-avatar-header' tree | commitdiff
2019-06-22 Alex Ssupport for tuples with more than 2 values tree | commitdiff
2019-06-22 Alex Sfix for int and modules tree | commitdiff
2019-06-17 rinpatchMerge branch 'removing-test-errors' into 'develop' tree | commitdiff
2019-06-16 HaelwennMerge branch 'fix/sanitize-report-content' into 'develop' tree | commitdiff
2019-06-16 rinpatchFix report content stopping to be nullable tree | commitdiff
2019-06-15 rinpatchCredo fixes tree | commitdiff
2019-06-15 rinpatchSanitize HTML in ReportView tree | commitdiff
2019-06-15 lainMerge branch 'bugfix/980-polls-double-vote' into 'develop' tree | commitdiff
2019-06-15 kaniiniMerge branch '963_oob_oauth_redirect_fix' into 'develop' tree | commitdiff
2019-06-14 rinpatchMerge branch 'feature/add-background-image-to-mastoapi... tree | commitdiff
2019-06-14 kaniiniMerge branch 'feature/905-dynamic-configuration-in... tree | commitdiff
2019-06-14 Alexander Strizhakovit is changed in compile time tree | commitdiff
2019-06-03 Mark FelderMerge branch 'develop' into update-oauth-template tree | commitdiff
2019-05-18 rinpatchResolve merge conflicts and remove IO.inspects tree | commitdiff
2019-05-17 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2019-05-17 lainMerge branch 'develop' of git.pleroma.social:pleroma... tree | commitdiff
2019-05-17 lainMerge branch 'develop' of git.pleroma.social:pleroma... tree | commitdiff
2019-05-16 kaniiniMerge branch 'feature/890-add-report-uri' into 'develop' tree | commitdiff
2019-05-16 feldMerge branch 'feature/admin-api-reports' into 'develop' tree | commitdiff
2019-05-16 Sergey SuprunenkoAdd Reports to Admin API tree | commitdiff
2019-05-15 lainMerge remote-tracking branch 'origin/develop' into... tree | commitdiff
2019-05-14 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2019-05-14 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2019-05-13 lambdaMerge branch 'feature/federator-behaviours' into 'develop' tree | commitdiff
2019-05-13 kaniiniMerge branch 'features/mastoapi/2.7.0-registration... tree | commitdiff
2019-05-13 Alexander Strizhakovdifferences_in_mastoapi_responses.md: fullname & bio... tree | commitdiff
2019-05-13 lambdaMerge branch 'mascot/pleroma-tan-shy' into 'develop' tree | commitdiff
2019-05-08 kaniiniMerge branch 'feature/761-add-users-filtration' into... tree | commitdiff
2019-05-08 Alexander StrizhakovMerge develop tree | commitdiff
2019-05-04 lainMerge remote-tracking branch 'origin/develop' into... tree | commitdiff
2019-05-01 Mark FelderMerge branch 'develop' into update-oauth-template tree | commitdiff
2019-05-01 lainMerge remote-tracking branch 'origin/develop' into... tree | commitdiff
2019-05-01 lambdaMerge branch 'features/download-mastofe-build' into... tree | commitdiff
2019-05-01 Alex SMerging with develop tree | commitdiff
2019-04-30 Sachin JoshiMerge branch 'develop' into bugfix/web-notification... tree | commitdiff
2019-04-25 Egor KislitsynMerge branch 'develop' into feature/disable-account tree | commitdiff
2019-04-23 kaniiniMerge branch 'security/fix-html-class-scrubbing' into... tree | commitdiff
2019-04-22 kaniiniMerge branch 'get-cached-everywhere' into 'develop' tree | commitdiff
2019-04-22 EgorUse `User.get_cached*` everywhere tree | commitdiff
2019-04-22 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2019-04-19 lambdaMerge branch '923_oauth_consumer_refactoring_ci' into... tree | commitdiff
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction tree | commitdiff
2019-04-13 Alex SMerge develop to 788-separate-email-addresses tree | commitdiff
2019-04-12 lambdaMerge branch 'bugfix/pleroma-email-naming' into 'develop' tree | commitdiff
2019-04-12 lambdaMerge branch 'features/mastoapi/2.6.0-min_id-pagination... tree | commitdiff
2019-04-12 lambdaMerge branch 'fix/732-password-align' into 'develop' tree | commitdiff
2019-04-12 lambdaMerge branch 'ssl_trusted_cert' into 'develop' tree | commitdiff
2019-04-11 kaniiniMerge branch 'fix/hackney_max_body_param' into 'develop' tree | commitdiff
2019-04-11 Egor Kislitsynmove user disable into deactivation tree | commitdiff
2019-04-11 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2019-04-10 Alex SMerge branch 'develop' into feature/788-separate-email... tree | commitdiff
2019-04-10 lambdaMerge branch 'feature/767-multiple-use-invite-token... tree | commitdiff
2019-04-10 SadposterMerge branch 'develop' into feature/user-status-subscri... tree | commitdiff
2019-04-10 Haelwenn (lanodan... s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/ tree | commitdiff
2019-04-10 Haelwenn (lanodan... s/Pleroma.Mailer/Pleroma.Emails.Mailer/ tree | commitdiff
2019-04-10 kaniiniMerge branch 'hotfix/fix_undefined_summary' into 'develop' tree | commitdiff
2019-04-10 kaniiniMerge branch 'notification-pleroma-settings' into ... tree | commitdiff
2019-04-08 lainMerge remote-tracking branch 'origin/develop' into... tree | commitdiff
2019-04-08 lainMerge branch 'features/mastoapi/2.6.0-conversations... tree | commitdiff
2019-04-08 Egor KislitsynMerge branch 'develop' into use-jobs-in-webpush tree | commitdiff
2019-04-08 Ivan Tashkinov[#923] Merge remote-tracking branch 'remotes/upstream... tree | commitdiff
2019-04-08 lambdaMerge branch 'develop' into 'improve_upgrade_user_from_... tree | commitdiff
2019-04-08 Alex Srenaming expire_at -> expires_at tree | commitdiff
2019-04-07 Alex Scredo fix tree | commitdiff
2019-04-07 Alex Sadded docs to docs/api/admin_api.md tree | commitdiff
2019-04-06 feldMerge branch 'feature/prometheus' into 'develop' tree | commitdiff
2019-04-06 Alex SMerge develop to 770-add-emoji-tags tree | commitdiff
2019-04-06 Alex Sadmin api endpoints for invites tree | commitdiff
2019-04-05 feldMerge branch 'feature/admin-api-follow' into 'develop' tree | commitdiff
2019-04-05 Mark FelderRedundant Repo.get_by usage was recently removed from... tree | commitdiff
next
Fork of https://akkoma.dev/AkkomaGang/akkoma.git