Merge remote-tracking branch 'upstream/develop' into registration-workflow
[akkoma] / .gitignore
2020-11-15 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-11-04 lainMerge branch 'ejabberd-pleroma-auth' into 'develop'
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-10-29 HaelwennMerge branch 'issue/2069' into 'develop'
2020-10-26 HaelwennMerge branch 'docs/ap_c2s' into 'develop'
2020-10-20 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-10-19 Egor KislitsynMerge branch 'develop' into mutes-blocks-pagination
2020-10-19 HaelwennMerge branch '2239-mute-fixes' into 'develop'
2020-10-17 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-10-17 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-10-15 Mark FelderMerge branch 'develop' into refactor/discoverable_user_...
2020-10-15 feldMerge branch 'issue/2009' into 'develop'
2020-10-15 Maksim Pechnikovadded generated `pleroma.env`
2020-10-08 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-09-10 Mark FelderMerge branch 'develop' into feature/gen-magic
2020-08-28 lainMerge branch 'release/2.1.0' into 'stable'
2020-08-25 lainMerge branch 'stable' of git.pleroma.social:pleroma...
2020-08-25 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-08-12 feldMerge branch 'docs_improve_static_dir_documentation...
2020-08-12 feldMerge branch 'feature/update-welcome-setting-in-descrip...
2020-08-11 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-08-11 lainMerge branch '204-fix' into 'develop'
2020-08-11 lainMerge branch 'fix/activity-expirations-again' of git...
2020-08-10 feldMerge branch 'admin-active-filter' into 'develop'
2020-08-10 Mark FelderMerge branch 'develop' into fix/activity-expirations...
2020-08-10 lainMerge branch 'revert-a6d3bb5f' into 'develop'
2020-08-10 lainRevert "Merge branch 'issue/1023' into 'develop'"
2020-08-07 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-08-05 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-08-05 Roman ChvanikovMerge branch 'develop' into command-available-check
2020-07-31 Haelwenn (lanodan... Merge remote-tracking branch 'pleroma/develop' into...
2020-07-30 HaelwennMerge branch '1993-confirm-users-on-registration' into...
2020-07-30 Maksim PechnikovMerge branch 'develop' into issue/1933-update-dependency
2020-07-29 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-07-29 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-07-29 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-07-29 lainMerge branch 'issue/1023' into 'develop'
2020-07-27 lainMerge branch 'develop' into 'cleanup/masto_fe-default_s...
2020-07-23 lainMerge branch 'issue/1878' into 'develop'
2020-07-22 Maksim PechnikovMerge branch 'develop' into issue/1023
2020-07-19 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-07-16 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-07-16 Maksim PechnikovMerge branch 'develop' into issue/1023
2020-07-14 feldMerge branch 'feature/1922-media-proxy-whitelist' into...
2020-07-14 Maksim Pechnikovadded generated `pleroma.env`
2020-07-13 Mark FelderMerge branch 'develop' into refactor/notification_settings
2020-07-13 feldMerge branch 'features/profile-fields-emojo' into ...
2020-07-13 feldMerge branch 'fix/mediaproxy-cache-settings-types'...
2020-07-13 HaelwennMerge branch '1937-renaming' into 'develop'
2020-07-11 lainMerge branch 'feature/upload-filter-exiftool' into...
2020-07-10 Mark FelderSupport Exiftool for stripping EXIF data
2020-05-18 lainMerge branch 'docs/storing-remote-media' into 'develop'
2020-05-14 lainMerge branch 'features/openrc-console' into 'develop'
2020-03-19 lainMerge branch 'remake-remodel' into develop
2020-03-13 rinpatchMerge branch 'feature/mastofe-admin-scope' into 'develop'
2020-03-13 rinpatchMerge branch 'docs/direct_conversation_id' into 'develop'
2020-03-13 rinpatchMerge branch 'static-accept-missing' into 'develop'
2020-03-11 feldMerge branch 'relay-list-change' into 'develop'
2020-03-09 lainMerge branch 'patch-1' into 'develop'
2020-03-08 Maksim PechnikovMerge branch 'develop' into issue/1276
2020-03-08 rinpatchMerge branch 'release/2.0.0' into 'stable'
2020-03-07 rinpatchMerge branch 'restart-fix-for-mix-tasks' into 'develop'
2020-03-05 rinpatchMerge branch 'stable' into release/2.0.0
2020-03-05 rinpatchMerge branch 'stable' into release/2.0.0
2020-03-04 lainMerge branch 'fix/no-email-no-fail' into 'develop'
2020-03-03 Alexander StrizhakovMerge branch 'develop' into gun
2020-03-02 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-03-02 lainMerge branch 'prepared-statements-settings' into 'develop'
2020-03-02 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-03-02 Egor KislitsynMerge branch 'develop' into fix/signup-without-email
2020-03-02 HaelwennMerge branch 'feature/1482-activity_pub_transactions...
2020-03-01 Alexander StrizhakovActivityPub actions & side-effects in transaction
2020-01-28 lainMerge branch 'translation/errors-french' into 'develop'
2019-10-10 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-09-30 kPheroxMerge remote-tracking branch 'upstream/develop' into...
2019-09-30 lainMerge remote-tracking branch 'origin/develop' into...
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-09-16 kaniiniMerge branch 'feature/delivery-tracking' into 'develop'
2019-09-16 Maksim PechnikovMerge branch 'develop' into issue/733
next