projects / akkoma / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Resolve merge conflicts
[akkoma] / lib / pleroma / web / mastodon_api /
2019-07-20 rinpatchResolve merge conflicts tree | commitdiff
2019-07-19 feldMerge branch 'feature/matstodon-statuses-by-name' into... tree | commitdiff
2019-07-19 Mark FelderMerge branch 'develop' into feature/matstodon-statuses... tree | commitdiff
2019-07-19 kaniiniMerge branch 'feature/richmedia-ttl' into 'develop' tree | commitdiff
2019-07-17 kaniiniMerge branch 'feature/instance-fetch-actor' into 'develop' tree | commitdiff
2019-07-17 kaniiniMerge branch 'feature/http-signatures-keyid' into ... tree | commitdiff
2019-07-17 kaniiniMerge branch 'password-reset-fix-for-non-test-env'... tree | commitdiff
2019-07-17 EugenijFix password reset for non-test env tree | commitdiff
2019-07-17 kaniiniMerge branch 'feature/mention-mrf' into 'develop' tree | commitdiff
2019-07-16 kaniiniMerge branch 'feature/1078-password-reset' into 'develop' tree | commitdiff
2019-07-16 Alexander Strizhakovmastoapi password reset tree | commitdiff
2019-07-16 kaniiniMerge branch '1094-relation-actions-rate-limiting'... tree | commitdiff
2019-07-16 Ivan Tashkinov[#1094] Rate-limited follow & unfollow actions. tree | commitdiff
2019-07-16 kaniiniMerge branch 'add-deactivated-to-account-view' into... tree | commitdiff
2019-07-16 EugenijAdd `pleroma.deactivated` to the Account entity (Mastod... tree | commitdiff
2019-07-16 kaniiniMerge branch 'add-blocked-by-to-relationship' into... tree | commitdiff
2019-07-16 EugenijAdd the `blocked_by` attribute to the relationship... tree | commitdiff
2019-07-16 rinpatchMerge branch 'bugfix/poll-id-as-string' into 'develop' tree | commitdiff
2019-07-16 lainStatus View: Poll ids are strings. tree | commitdiff
2019-07-15 Mark FelderMerge branch 'develop' into feature/matstodon-statuses... tree | commitdiff
2019-07-15 feldMerge branch 'match-file-name' into 'develop' tree | commitdiff
2019-07-15 kaniiniMerge branch 'tests/mastodon-common-api' into 'develop' tree | commitdiff
2019-07-15 Sergey SuprunenkoAdd more tests for MastodonAPIController and CommonAPI tree | commitdiff
2019-07-15 Sachin JoshiMerge branch 'develop' into match-file-name tree | commitdiff
2019-07-15 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2019-07-14 kaniiniMerge branch 'bugfix/llal-object-containment' into... tree | commitdiff
2019-07-14 kaniiniMerge branch 'feature/1072-muting-notifications' into... tree | commitdiff
2019-07-14 Alexander StrizhakovFeature/1072 muting notifications tree | commitdiff
2019-07-13 kaniiniMerge branch '1041-status-actions-rate-limit' into... tree | commitdiff
2019-07-13 Ivan Tashkinov[#1041] Minor refactoring. tree | commitdiff
2019-07-13 Ivan Tashkinov[#1041] Rate-limited status actions (per user and per... tree | commitdiff
2019-07-11 kaniiniMerge branch 'search-limit-offset-type' into 'develop' tree | commitdiff
2019-07-11 EugenijExtend Pleroma.Pagination to support offset-based pagin... tree | commitdiff
2019-07-11 kaniiniMerge branch 'fix/1019-refactor' into 'develop' tree | commitdiff
2019-07-11 Egor KislitsynMerge branch 'develop' into feature/addressable-lists tree | commitdiff
2019-07-10 HaelwennMerge branch 'features/mastoapi-emoji-categories' into... tree | commitdiff
2019-07-10 Haelwenn (lanodan... MastoAPI: Add categories to custom emojis tree | commitdiff
2019-07-10 kaniiniMerge branch 'feature/render-mentions-for-tags' into... tree | commitdiff
2019-07-10 Sergey SuprunenkoCreate mentions only for explicitly mentioned users 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 'tests/web/mastodon_api/search_controller... tree | commitdiff
2019-07-10 Maksimadd test for search_controller/ 100% coverage 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-09 kaniiniMerge branch 'remove-swift' into 'develop' tree | commitdiff
2019-07-09 kaniiniMerge branch 'features/sec-websocket-protocol-header... tree | commitdiff
2019-07-09 HaelwennMerge branch 'enable-ogp-by-default' into 'develop' tree | commitdiff
2019-07-09 HaelwennMerge branch 'test-speedup' into 'develop' tree | commitdiff
2019-07-09 Mark FelderMerge branch 'develop' into proxy-error tree | commitdiff
2019-07-09 rinpatchMerge branch '161-incoming-replies-depth-limit' into... tree | commitdiff
2019-07-08 HaelwennMerge branch 'fix/relationships-in-statuses' into ... tree | commitdiff
2019-07-08 rinpatchMastodon API: Fix embedded relationships not being... tree | commitdiff
2019-07-07 Haelwenn (lanodan... MastoAPI Streaming: Keep compatibility with access_token tree | commitdiff
2019-07-06 KokaKiwiMastoAPI streaming: Replace access_token with Sec-WebSo... tree | commitdiff
2019-07-06 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop... tree | commitdiff
2019-07-03 feldMerge branch 'fix/migration-alter-citext-field-with... tree | commitdiff
2019-07-03 rinpatchMerge branch 'handle-search-timeout' into 'develop' tree | commitdiff
2019-07-03 EugenijUse fallback values for search queries tree | commitdiff
2019-07-01 HaelwennMerge branch 'fix/docs-dry-run' into 'develop' tree | commitdiff
2019-07-01 HaelwennMerge branch 'ci-improvements' into 'develop' tree | commitdiff
2019-06-30 Ivan Tashkinov[#161] Merge remote-tracking branch 'remotes/upstream... tree | commitdiff
2019-06-30 rinpatchMerge branch 'filter-user-statuses-by-hashtag' into... tree | commitdiff
2019-06-30 EugenijAdd hashtag filter to user statuses (GET /api/v1/accoun... tree | commitdiff
2019-06-28 lainMerge branch 'release-docs' into 'develop' tree | commitdiff
2019-06-27 kaniiniMerge branch 'idempotency-plug' into 'develop' tree | commitdiff
2019-06-26 rinpatchMerge branch 'update-mastofe/glitch-soc-2019-06-26... tree | commitdiff
2019-06-26 Egor KislitsynPolish IdempotencyPlug tree | commitdiff
2019-06-26 Egor KislitsynRemove previous idempotency implementation from `post_s... tree | commitdiff
2019-06-26 kaniiniMerge branch 'refactoring/fix_render_view' into 'develop' tree | commitdiff
2019-06-26 Roman ChvanikovFix Controller.render/4 deprecation tree | commitdiff
2019-06-23 Sachin JoshiMerge branch 'develop' into 'remove-avatar-header' tree | commitdiff
2019-06-21 kaniiniMerge branch 'oauth_secure_redirect' into 'develop' tree | commitdiff
2019-06-20 rinpatchMerge branch 'feature/release-update-script' into ... tree | commitdiff
2019-06-19 rinpatchMerge branch 'begone-the-dot-hack' into 'develop' tree | commitdiff
2019-06-19 lainMerge branch 'fix/rich-media-hashtags-again' into ... tree | commitdiff
2019-06-19 lainMerge branch 'update-frontend-c4fcdc71' into 'develop' tree | commitdiff
2019-06-18 lainMerge branch 'deps/update-auto-linker' into 'develop' tree | commitdiff
2019-06-18 lainMerge branch 'fix/mastoapi-sanitize-display-name' into... tree | commitdiff
2019-06-18 rinpatchMastodon API: Sanitize display names tree | commitdiff
2019-06-18 rinpatchMastodon API: Remove the dot hack tree | commitdiff
2019-06-16 HaelwennMerge branch 'fix/sanitize-report-content' into 'develop' tree | commitdiff
2019-06-16 rinpatchMerge branch 'issues/570' into 'develop' tree | commitdiff
2019-06-16 Maksim[#570] add user:notification stream tree | commitdiff
2019-06-16 rinpatchMerge branch 'fix/991-version-generation' into 'develop' 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-15 rinpatchMerge branch 'feature/add-chat-token-to-masto-api'... tree | commitdiff
2019-06-15 lainMastodon API: Return the token needed for the chat. tree | commitdiff
2019-06-14 rinpatchMerge branch 'feature/add-background-image-to-mastoapi... tree | commitdiff
2019-06-14 lainMerge branch 'fix/hashtag-rich-media' into 'develop' tree | commitdiff
2019-06-14 lainMerge branch 'issues/948-account-search' into 'develop' tree | commitdiff
2019-06-14 Maksim[#948] /api/v1/account_search added optional parameters... tree | commitdiff
2019-06-14 lainMastodonAPI: Add a way to update the background image. tree | commitdiff
2019-06-13 lainAccountView: Add user background. tree | commitdiff
next
Fork of https://akkoma.dev/AkkomaGang/akkoma.git