Merge branch 'refactor/subscription' into 'develop'
[akkoma] / lib / pleroma / web / controller_helper.ex
2019-09-27 kaniiniMerge branch 'refactor/subscription' into 'develop'
2019-09-27 kaniiniMerge branch 'patch-2' into 'develop'
2019-09-27 kaniiniMerge branch 'update/docs-jp' into 'develop'
2019-09-27 kaniiniMerge branch 'list-packs-docs' into 'develop'
2019-09-27 kaniiniMerge branch 'patch-1' into 'develop'
2019-09-27 kaniiniMerge branch 'refactor/timeline-controller' into 'develop'
2019-09-26 Egor KislitsynExtract timeline actions from `MastodonAPIController...
2019-09-26 Egor KislitsynAdd CommonAPI.ActivityDraft
2019-09-25 Maksim PechnikovMerge branch 'develop' into issue/1218
2019-09-19 Maksim PechnikovMerge branch 'develop' into test/activity_pub/transmogr...
2019-09-16 Maxim FilippovMerge branch 'develop' into feature/moderation-log...
2019-09-16 Maxim FilippovMerge branch 'develop' into feature/return-total-for...
2019-09-16 kaniiniMerge branch 'feature/delivery-tracking' into 'develop'
2019-09-16 Maksim PechnikovMerge branch 'develop' into issue/733
2019-09-15 Maksim PechnikovMerge branch 'develop' into support/tests
2019-09-14 rinpatchMerge branch 'config-changes' into 'develop'
2019-09-14 rinpatchMerge branch 'fix/truncate-remote-user-fields' into...
2019-09-14 Roman ChvanikovMerge branch 'develop' into refactor/subscription
2019-09-14 Ivan Tashkinov[#1149] Merge remote-tracking branch 'remotes/upstream...
2019-09-13 lainMerge branch 'capture-test-errors' into 'develop'
2019-09-13 lainMerge branch 'refactor/add_link_headers' into 'develop'
2019-09-06 Egor KislitsynRefactor `add_link_headers/7` -> `add_link_headers/3`
2019-08-24 lainMerge branch 'admin-create-users' into 'develop'
2019-08-24 lainMerge remote-tracking branch 'origin/develop' into...
2019-08-22 Ivan Tashkinov[#1149] Merge remote-tracking branch 'remotes/upstream...
2019-08-20 lainMerge branch 'fix/admin-api-user-deletion' into 'develop'
2019-08-20 lainMerge branch 'digest-template' into 'develop'
2019-08-20 lainMerge branch 'feature/custom-fields' into 'develop'
2019-08-19 lainMerge branch 'develop' into 'fix/reverse-proxy-body...
2019-08-19 lainMerge branch 'hotfix/user_unfollow' into 'develop'
2019-08-18 kaniiniMerge branch 'feature/hide-muted-threads-from-timeline...
2019-08-16 lainMerge branch 'pleroma-conversations' into 'develop'
2019-08-14 lainMerge remote-tracking branch 'origin/develop' into...
2019-08-08 lainMerge remote-tracking branch 'origin/develop' into...
2019-08-02 lainPleroma API: Add endpoint to get conversation statuses.
2019-07-15 Mark FelderMerge branch 'develop' into feature/matstodon-statuses...
2019-07-11 Egor KislitsynMerge branch 'develop' into feature/addressable-lists
2019-06-28 Roman ChvanikovResolve conflicts
2019-06-23 Sachin JoshiMerge branch 'develop' into 'remove-avatar-header'
2019-06-15 lainMerge branch 'bugfix/980-polls-double-vote' into 'develop'
2019-06-15 kaniiniMerge branch '963_oob_oauth_redirect_fix' into 'develop'
2019-06-14 rinpatchMerge branch 'feature/add-background-image-to-mastoapi...
2019-06-14 lainMerge branch 'fix/hashtag-rich-media' into 'develop'
2019-06-14 lainMerge branch 'issues/948-account-search' into 'develop'
2019-06-14 Maksim[#948] /api/v1/account_search added optional parameters...
2019-06-03 Mark FelderMerge branch 'develop' into update-oauth-template
2019-05-14 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-05-14 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-05-13 lambdaMerge branch 'mascot/pleroma-tan-shy' into 'develop'
2019-05-11 Roman ChvanikovMerge develop
2019-05-08 lambdaMerge branch 'refactor/oauth_scopes' into 'develop'
2019-05-08 MaksimRefactoring functions for dealing with oauth scopes.
2019-05-04 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-01 Alex SMerging with develop
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction
2019-04-12 lambdaMerge branch 'features/mastoapi/2.6.0-min_id-pagination...
2019-04-12 lambdaMerge branch 'fix/732-password-align' into 'develop'
2019-04-12 lambdaMerge branch 'ssl_trusted_cert' into 'develop'
2019-04-11 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-10 kaniiniMerge branch 'notification-pleroma-settings' into ...
2019-04-08 lainMerge remote-tracking branch 'origin/develop' into...
2019-04-02 lambdaMerge branch 'bugfix/wrong-date-format' into 'develop'
2019-04-02 lambdaMerge branch 'feature/fake-statuses' into 'develop'
2019-04-02 lainMerge remote-tracking branch 'origin/develop' into...
2019-04-02 lambdaMerge branch 'bugfix/share-mastodon' into 'develop'
2019-04-02 lambdaMerge branch 'remove-user-activities' into 'develop'
2019-04-02 lambdaMerge branch 'get_by_id' into 'develop'
2019-04-02 Alex SMerge develop into feature/770-add-emoji-tags
2019-04-02 lambdaMerge branch 'features/pleroma-tan' into 'develop'
2019-04-02 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-04-02 lambdaMerge branch 'features/mastoapi/2.6.0-force-login-optio...
2019-04-02 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-01 Ivan TashkinovFixed local MastoFE authentication / `force_login`...
2019-04-01 Ivan TashkinovAdded `force_login` authentication option (previously...
2019-03-15 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-03-14 rinpatchMerge develop to bump elixir version in the CI so I...
2019-03-14 rinpatchMerge branch 'hotfix/delete-activities' into 'develop'
2019-03-14 link0ffMerge remote-tracking branch 'upstream/develop' into...
2019-03-13 kaniiniMerge branch 'mastofe-content-types' into 'develop'
2019-03-13 lambdaMerge branch 'features/add-credo-to-ci' into 'develop'
2019-03-13 Haelwenn (lanodan... [Credo] fix Credo.Check.Readability.MaxLineLength
2019-03-04 Karen KonouMerge branch 'bugfix/delete-activity-audience' of git...
2019-02-22 kaniiniMerge branch 'fix/twittercards' into 'develop'
2019-02-20 lambdaMerge branch '468_oauth2_scopes' into 'develop'
2019-02-20 Ivan Tashkinov[#468] Merged `upstream/develop`.
2019-02-19 Ivan Tashkinov[#468] Merged `upstream/develop`.
2019-02-17 Ivan Tashkinov[#468] Merged `upstream/develop`, resolved conflicts.
2019-02-17 Ivan Tashkinov[#468] Refactored OAuth scopes' defaults & missing...
2019-02-15 Ivan Tashkinov[#468] Defined OAuth restrictions for all applicable...
2019-02-14 Ivan Tashkinov[#468] Refactored OAuth scopes parsing / defaults handling.
2019-01-28 Ivan Tashkinov[#534] Refactoring / tweaks per MR review.
2019-01-24 Ivan Tashkinov[#534] Updating external instances reachability on...
2019-01-13 rinpatchResolve merge conflict
2019-01-05 kaniiniMerge branch 'fix_486' into 'develop'
2019-01-03 rinpatchMerge branch 'captcha' into 'develop'
2019-01-01 lambdaMerge branch 'cleanup/admin-api-useless-if' into 'develop'
2019-01-01 lainMerge remote-tracking branch 'origin/develop' into...
2018-12-31 kaniiniMerge branch 'features/admin-api-user-views' into ...
2018-12-31 kaniiniMerge branch 'docs/admin-api' into 'develop'
2018-12-31 kaniiniMerge branch 'maintenance/copyright-2019' into 'develop'
next