Merge branch 'develop' into 'develop'
[akkoma] / lib / pleroma / web / twitter_api / controllers / util_controller.ex
2018-12-16 HaelwennMerge branch 'develop' into 'develop'
2018-12-16 ealMerge branch 'fix/masto-put-settings' into 'develop'
2018-12-15 lambdaMerge branch 'fix/views-ignore-unhandled-activites...
2018-12-15 lambdaMerge branch 'tests-warning-as-errors' into 'develop'
2018-12-14 hrefMerge branch 'fix/issue_433' into 'develop'
2018-12-14 hrefMerge branch '114_email_invites' into 'develop'
2018-12-14 hrefMerge branch 'fix/issue_272' into 'develop'
2018-12-14 hrefMerge branch 'pleroma-feature/compat/push-subscriptions...
2018-12-14 hrefMerge branch 'feature/file-size-checking' into 'develop'
2018-12-14 hrefProperly disable Web Push if no VAPID key is set
2018-12-14 Ivan Tashkinov[#114] Readded `invites_enabled` config setting, update...
2018-12-14 Ivan Tashkinov[#114] Addressed MR comments. Removed functionality...
2018-12-13 Ivan Tashkinov[#114] Initial implementation of user email invitations.
2018-12-12 Ivan Tashkinov[#114] Routes and config for `confirm_email` and `email...
2018-12-10 scarlettMerge branch 'new-fe-options' into 'develop'
2018-12-10 scarlettAdd new frontend options to server-side config.
2018-12-10 lambdaMerge branch 'fix_empty_bio_crash' into 'develop'
2018-12-10 lambdaMerge branch 'fix/config-md-typos' into 'develop'
2018-12-10 lambdaMerge branch 'support/bugfix_272' 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-10 lambdaMerge branch 'develop' into 'fix/mix-task-uploads-modul...
2018-12-10 lambdaMerge branch 'parallel588/pleroma-support/compile_warni...
2018-12-09 Maksim Pechnikovfix compile warnings
2018-12-08 Rin ToshakaMake uploadlimit an object that stores upload limits...
2018-12-07 Rin ToshakaAdd uploadlimit to Twitter API config
2018-12-07 lambdaMerge branch '394_user_tags' into 'develop'
2018-12-06 Rin ToshakaMerge develop
2018-12-06 kaniiniMerge branch 'fix/mastodon-api-settings' into 'develop'
2018-12-06 kaniiniMerge branch 'correct-and-improve-http-options' into...
2018-12-06 kaniiniMerge branch 're-mrf' into 'develop'
2018-12-06 kaniiniMerge branch 'feature/compat/push-subscriptions' into...
2018-12-06 Egor KislitsynMerge branch 'develop' into feature/compat/push-subscri...
2018-12-06 Egor KislitsynMerge branch 'develop' into feature/compat/push-subscri...
2018-12-06 Egor KislitsynAdd web push support
2018-12-01 rinpatchAttempt to resolve merge conflict
2018-11-30 lainMerge remote-tracking branch 'origin' into validate...
2018-11-27 kaniiniMerge branch 'ogg-theora-detection' into 'develop'
2018-11-22 kaniiniMerge branch 'feature/admin-api' into 'develop'
2018-11-21 kaniiniMerge branch 'feature/improve-version' into 'develop'
2018-11-20 hrefImproved version string
2018-11-15 Hakaba HitoyoMerge remote-tracking branch 'official/develop' into...
2018-11-10 kaniiniMerge branch 'tests/prismo-url-map' into 'develop'
2018-11-08 lambdaMerge branch 'small-jsonld-refactor' into 'develop'
2018-11-07 kaniiniMerge branch 'feature/qvitter-notifications-dismiss...
2018-11-07 kaniiniMerge branch 'runtime-config' into 'develop'
2018-11-06 kaniiniMerge branch 'patch-2' into 'develop'
2018-11-06 hrefRuntime configuration
2018-11-06 kaniiniMerge branch 'runtime-router' into 'develop'
2018-11-06 kaniiniMerge branch 'use-the-same-example-domain-and-use-it...
2018-11-05 lambdaMerge branch 'runtime-emojis' into 'develop'
2018-11-05 hrefRuntime configured emojis
2018-10-23 kaniiniMerge branch 'bugfix/html-scrub-comments' into 'develop'
2018-10-23 kaniiniMerge branch 'new-frontend-options' into 'develop'
2018-10-21 scarlettNew frontend options
2018-10-18 kaniiniMerge branch 'bugfix/html-scrub-schemes' into 'develop'
2018-10-17 HaelwennMerge branch 'import-maybe-direct-follow' into 'develop'
2018-10-17 scarlettUse maybe_direct_follow for follow imports
2018-10-07 kaniiniMerge branch 'patch-2' into 'develop'
2018-10-05 kaniiniMerge branch 'revert-d31bbb1c' into 'develop'
2018-10-05 William Pitcocktwitterapi: frontend config: add formattingOptionsEnabled
2018-09-07 kaniiniMerge branch 'add-secure-and-samesite-cookie-flags...
2018-09-07 kaniiniMerge branch 'improve-server-config-examples' into...
2018-09-05 HaelwennMerge branch 'fix/sign-in-with-toot' into 'develop'
2018-09-03 kaniiniMerge branch 'feature/mastodon_api_2.4.x' into 'develop'
2018-09-03 kaniiniMerge branch 'nil-bio-emojis' into 'develop'
2018-09-02 kaniiniMerge branch 'hotfix_broken_likes' into 'develop'
2018-09-01 kaniiniMerge branch 'security/activitypub-spoofing' into ...
2018-09-01 HaelwennMerge branch 'feature/disable-config-management' into...
2018-09-01 William Pitcockrun `mix format`.
2018-09-01 William Pitcockconfig: add ability to disable Pleroma FE config manage...
2018-08-31 kaniiniMerge branch 'update/pleroma-fe-config-20180831' into...
2018-08-31 William Pitcockconfig: chase pleroma-fe updates from MR pleroma-fe...
2018-08-27 lambdaMerge branch 'bugfix/announce-timeline-flooding' into...
2018-08-26 kaniiniMerge branch 'feature/emoji-in-local-users' into 'develop'
2018-08-26 kaniiniMerge branch 'login-with-email' into 'develop'
2018-08-26 kaniiniMerge branch 'develop' into 'feature/relay'
2018-08-26 kaniiniMerge branch 'update-pleroma-frontend' into 'develop'
2018-08-26 kaniiniMerge branch 'improve-example-caddyfile' into 'develop'
2018-08-26 kaniiniMerge branch 'remove-unused-settings' into 'develop'
2018-08-26 hakabahitoyoremove unused settings from /api/statusnet/config
2018-08-24 kaniiniMerge branch 'bugfix/formatter-single-char-nicks' into...
2018-08-24 kaniiniMerge branch 'config/fe-collapse-subject' into 'develop'
2018-08-24 William Pitcockfe config: add collapse_message_with_subject fe option
2018-08-16 kaniiniMerge branch 'dev-lanodan-url-regex' into 'develop'
2018-08-16 kaniiniMerge branch 'mastofe/system-font' into 'develop'
2018-08-16 kaniiniMerge branch 'develop' into 'patch-2'
2018-08-16 kaniiniMerge branch 'fix/put-repeats-at-activitypub-outbox...
2018-08-16 kaniiniMerge branch 'fix/normalize-file-extension' into 'develop'
2018-08-15 lambdaMerge branch 'feature/suggestions-api-with-third-party...
2018-08-12 lambdaMerge branch 'feature/invites' into 'develop'
2018-08-12 lambdaMerge branch 'fix/remote-follow-errormessage' into...
2018-08-09 ealRemote follow: don't show confusing error if already...
2018-07-20 Tristan MahéMerge remote-tracking branch 'upstream/develop' into...
2018-07-19 Hakaba Hitoyomerge
2018-07-19 lambdaMerge branch 'tests/plume' into 'develop'
2018-07-19 lambdaMerge branch 'bugfix/activitystreams-notice-urls' into...
2018-07-19 lambdaMerge branch 'feature/fe-configuration' into 'develop'
2018-07-17 William PitcockTwitterAPI: present pleroma frontend config in API
2018-07-01 JortyFix auto-shortcode emoji
next