Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
[akkoma] / lib / pleroma / web / controller_helper.ex
2019-05-14 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-05-13 lambdaMerge branch 'mascot/pleroma-tan-shy' into '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'
2018-12-31 William Pitcockupdate copyright years to 2019
2018-12-28 kaniiniMerge branch 'systemd-drop-sysadmin-privilege' into...
2018-12-27 kaniiniMerge branch 'feature/create-tombstone-instead-of-delet...
2018-12-25 lambdaMerge branch 'legal-boilerplate' into 'develop'
2018-12-23 William Pitcockadd license boilerplate to pleroma core
2018-12-18 lambdaMerge branch 'feature/new-user-routes' into 'develop'
2018-12-14 hrefMerge branch 'feature/file-size-checking' into 'develop'
2018-12-10 lambdaMerge branch 'fix/config-md-typos' into 'develop'
2018-12-10 lambdaMerge branch 'fix/theora-detection-read-bytes' into...
2018-12-10 lambdaMerge branch 'anonymize-filter-text' into 'develop'
2018-12-08 lambdaMerge branch 'fix/add-upload.ex' into 'develop'
2018-12-08 lambdaMerge branch 'fix/typo-relay-ex' into 'develop'
2018-12-07 lambdaMerge branch 'fix/gopher-respect-ip' into 'develop'
2018-12-07 lambdaMerge branch 'media-proxy-follow-redirect' into 'develop'
2018-12-07 lambdaMerge branch '394_user_tags' into 'develop'
2018-12-06 Ivan Tashkinov[#394] Added `users.tags` and admin routes to tag and...