Merge branch 'develop' into support/update_oban
[akkoma] / .gitignore
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 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 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
2019-09-15 Ivan Tashkinov[#1234] Merge remote-tracking branch 'remotes/upstream...
2019-09-15 Maksim PechnikovMerge branch 'develop' into support/tests
2019-09-15 Ivan Tashkinov[#1149] Merge remote-tracking branch 'remotes/upstream...
2019-09-14 rinpatchMerge branch 'cherry-pick-9c64a257' into 'maint/1.1'
2019-09-14 rinpatchMerge branch 'config-changes' into 'develop'
2019-09-14 rinpatchMerge branch 'config-changes' into 'develop'
2019-09-13 Alex Sdon't track generated_config.md
2019-06-03 Mark FelderMerge branch 'develop' into update-oauth-template
2019-05-15 lainMerge remote-tracking branch 'origin/develop' into...
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 kaniiniMerge branch 'fix/ostatus-activity-representer-depends...
2019-05-11 Roman ChvanikovMerge develop
2019-05-09 HaelwennMerge branch 'improve/gitignore' into 'develop'
2019-05-09 Mark FelderPrevent committing code coverage results to the repo
2019-05-08 Roman ChvanikovMerge develop
2019-05-07 kaniiniMerge branch 'docs/MRF-modules' into 'develop'
2019-05-07 lambdaMerge branch 'conversations_three' into 'develop'
2019-05-07 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-05-06 lambdaMerge branch 'feature/bbs' into 'develop'
2019-05-04 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-01 Mark FelderMerge branch 'develop' into update-oauth-template
2019-05-01 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-01 lambdaMerge branch 'features/download-mastofe-build' into...
2019-05-01 Alex SMerging with develop
2019-04-30 Sachin JoshiMerge branch 'develop' into bugfix/web-notification...
2019-04-30 Roman ChvanikovMerge develop
2019-04-29 rinpatchMerge branch 'fix/add-default-scope-mastoapi' into...
2019-04-28 kaniiniMerge branch 'fix/uploads-folder-issues' into 'develop'
2019-04-28 xsefix issues with the uploads directory
2019-04-20 Roman ChvanikovMerge branch 'develop' of git.pleroma.social:pleroma...
2019-04-20 Roman ChvanikovDo not track coverage files
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 lambdaMerge branch 'feature/767-multiple-use-invite-token...
2019-04-10 SadposterMerge branch 'develop' into feature/user-status-subscri...
2019-04-10 kaniiniMerge branch 'hotfix/fix_undefined_summary' into 'develop'
2019-04-10 kaniiniMerge branch 'notification-pleroma-settings' into ...
2019-04-09 lambdaMerge branch 'bugfix/follower_count' into 'develop'
2019-04-08 lainMerge remote-tracking branch 'origin/develop' into...
2019-04-08 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-08 lambdaMerge branch 'improve_upgrade_user_from_ap_id' into...
2019-04-08 lambdaMerge branch 'twitter_oauth' into 'develop'
2019-04-08 lambdaMerge branch 'feature/770-add-emoji-tags' into 'develop'
2019-04-06 Alex SMerge develop to 770-add-emoji-tags
2019-04-02 Alex SMerging develop into feature/770-add-emoji-tags
2019-04-02 Alex SMerge develop into feature/770-add-emoji-tags
2019-04-01 Alex Sadd docs folder to gitignore
2019-03-31 lainBBS: Add documentation.
2019-02-14 Wim VanderbauwhedeMerge remote-tracking branch 'upstream/develop' into...
2019-02-08 Karen KonouMerge branch 'develop' into feature/thread-muting
2019-02-08 rinpatchMerge branch 'develop' into feature/keyword-policy
2019-02-06 rinpatchMerge branch 'fix/activitypub-user-view-badmap' into...
next