Merge branch 'stable' into release/2.0.0
[akkoma] / lib / pleroma / web / views /
2020-03-05 rinpatchMerge branch 'stable' into release/2.0.0
2020-03-04 feldMerge branch 'exclude-reblogs-from-admin-api-by-default...
2020-03-04 lainMerge branch 'fix/no-email-no-fail' into 'develop'
2020-03-03 HaelwennMerge branch 'chore/update-copyrights' into 'develop'
2020-03-03 Mark FelderUpdate Copyrights
2020-02-20 HaelwennMerge branch 'migration-fixes-20' into 'develop'
2020-02-20 HaelwennMerge branch 'single_emoji_reaction' into 'develop'
2020-02-20 lainMerge branch 'require-signature' into 'develop'
2020-02-20 lainMerge branch 'features/remote-follow-userpage-redirect...
2020-02-20 lainMerge branch 'docs_updating' into 'develop'
2020-02-20 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-02-20 lainMerge branch 'feature/new-registrations-digest' into...
2020-02-11 Egor KislitsynMerge branch 'develop' into feature/new-registrations...
2020-01-28 lainMerge branch 'translation/errors-french' into 'develop'
2020-01-22 Mark FelderMerge branch 'develop' into feature/new-registrations...
2020-01-22 Egor KislitsynMerge branch 'develop' into feature/new-registrations...
2020-01-22 Egor KislitsynAdd new users digest email
2019-11-08 lainMerge remote-tracking branch 'origin/develop' into...
2019-11-04 Maxim FilippovMerge branch 'develop' into feature/reports-groups...
2019-10-27 Maxim FilippovMerge branch 'develop' into feature/store-statuses...
2019-10-24 Egor KislitsynMerge remote-tracking branch 'upstream/develop' into...
2019-10-23 feldMerge branch '1304-user-info-deprecation' into 'develop'
2019-10-23 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-10-21 kaniiniMerge branch 'feature/push-subject-for-dm' into 'develop'
2019-10-21 Maksim PechnikovMerge branch 'develop' into feature/masto_api_markers
2019-10-21 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-10-21 Egor KislitsynMerge branch 'develop' into refactor/following-relation...
2019-10-20 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-10-19 HaelwennMerge branch 'feature/mastofe-pwa' into 'develop'
2019-10-19 KokaKiwiMastoFE: Add PWA manifest.
2019-10-19 rinpatchMerge branch 'mix-emoji-task-pack-json' into 'develop'
2019-10-16 Ivan Tashkinov[#1304] Moved all non-mutes / non-blocks fields from...
2019-10-10 lainMerge remote-tracking branch 'origin/develop' into...
2019-10-07 lainMerge branch 'misskey-compat' into 'reactions'
2019-10-06 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-10-06 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-10-06 HaelwennMerge branch 'fix-prameter-name-of-accounts-update...
2019-10-05 kaniiniMerge branch 'accept-embedded-announce-object' into...
2019-10-05 lainMerge remote-tracking branch 'origin/develop' into...
2019-10-04 kaniiniMerge branch 'bugfix/widen-streamer-blocks-for-1.1...
2019-10-04 Egor KislitsynRevert "Merge branch 'revert-4fabf83a' into 'develop'"
2019-10-04 lainMerge branch 'featrue/job-monitor' into 'develop'
2019-10-04 lainMerge branch 'bugfix/notification-nil-actor' into ...
2019-10-02 Ivan Tashkinov[#1234] Merge remote-tracking branch 'remotes/upstream...
2019-10-02 rinpatchMerge branch 'split-masto-api/masto_fe_and_custom_emoji...
2019-10-02 Egor KislitsynAdd MastoFEController
2019-09-30 kPheroxMerge remote-tracking branch 'upstream/develop' into...
2019-09-30 Ivan Tashkinov[#1260] Merge remote-tracking branch 'remotes/upstream...
2019-09-30 lainMerge remote-tracking branch 'origin/develop' into...
2019-09-30 kaniiniMerge branch 'features/apc2s-media-upload' into 'develop'
2019-09-29 kaniiniMerge branch 'feature/follow-requests-count' into ...
2019-09-28 Maksim PechnikovMerge branch 'develop' into tests/mastodon_api_controll...
2019-09-27 kaniiniMerge branch 'refactor/status-controller' into 'develop'
2019-09-27 Egor KislitsynExtract status actions from `MastodonAPIController...
2019-09-27 kaniiniMerge branch 'patch-2' into 'develop'
2019-09-27 kaniiniMerge branch 'update/docs-jp' into 'develop'
2019-09-25 Maksim PechnikovMerge branch 'develop' into issue/1218
2019-09-23 Maksim PechnikovMerge branch 'develop' into tests/mastodon_api_controll...
2019-09-19 Maksim PechnikovMerge branch 'develop' into test/activity_pub/transmogr...
2019-09-18 feldMerge branch 'restore-tests' into 'develop'
2019-09-17 Ivan Tashkinov[#1234] Merge remote-tracking branch 'remotes/upstream...
2019-09-17 Maksim PechnikovMerge branch 'develop' into issue/733
2019-09-17 rinpatchMerge branch 'support/tests' into 'develop'
2019-09-16 Roman ChvanikovMerge develop
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 rinpatchMerge branch 'fix/develop' into 'develop'
2019-09-16 Egor KislitsynRevert "Merge branch 'revert-4fabf83a' into 'develop'"
2019-09-16 kaniiniMerge branch 'revert-4fabf83a' into 'develop'
2019-09-16 kaniiniRevert "Merge branch 'streamer-refactoring' into 'develop'"
2019-09-16 kaniiniMerge branch 'streamer-refactoring' into 'develop'
2019-09-16 Steven FuchsStreamer refactoring
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-21 lainMerge branch 'rate-limit-ap-routes' into 'develop'
2019-08-20 lainMerge branch 'fix/admin-api-user-deletion' into 'develop'
2019-08-20 lainMerge branch 'digest-template' into 'develop'
2019-08-14 Egor KislitsynImprove digest email template
2019-08-14 lainMerge remote-tracking branch 'origin/develop' into...
2019-08-13 rinpatchMerge branch 'length-limit-bio' into 'develop'
2019-08-09 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-08-08 lainMerge branch 'feature/digest-email' into 'develop'
2019-08-02 Roman ChvanikovMerge branch 'develop' into feature/digest-email
2019-07-24 Roman ChvanikovMerge branch 'develop' into feature/digest-email
2019-07-20 Roman ChvanikovMerge branch 'develop' into feature/digest-email
2019-07-19 Roman ChvanikovMerge develop
2019-07-16 Roman ChvanikovMerge develop
2019-07-15 Mark FelderMerge branch 'develop' into feature/matstodon-statuses...
2019-07-14 Roman ChvanikovMerge branch 'develop' into feature/digest-email
2019-07-12 Roman Chvanikovmerge develop
2019-07-11 Egor KislitsynMerge branch 'develop' into feature/addressable-lists
2019-07-09 Roman ChvanikovMerge develop
2019-06-30 Roman ChvanikovMerge branch 'develop' into feature/digest-email
2019-06-28 Roman ChvanikovResolve conflicts
2019-06-23 Sachin JoshiMerge branch 'develop' into 'remove-avatar-header'
2019-06-11 lainMerge branch 'feature/rate-limiter' into 'develop'
2019-06-07 kaniiniMerge branch 'fix/replace-mix-env' into 'develop'
2019-06-06 Roman ChvanikovResolve conflicts
2019-06-06 rinpatchReplace Mix.env with Pleroma.Config.get(:env)
next