Fix conflict
[akkoma] / lib / pleroma / application.ex
2019-06-04 Roman ChvanikovFix conflict
2019-06-03 Mark FelderMerge branch 'develop' into feature/digest-email
2019-06-03 Mark FelderMerge branch 'develop' into update-oauth-template
2019-06-01 rinpatchResolve merge conflicts
2019-05-29 Roman ChvanikovMerge develop
2019-05-22 kaniiniMerge branch 'ssh-fixes' into 'develop'
2019-05-22 lambdaMerge branch 'issue/699' into 'develop'
2019-05-22 Maksim[#699] add worker to clean expired oauth tokens
2019-05-22 rinpatchMerge branch 'bugfix/account_view_source.note' into...
2019-05-22 kaniiniMerge branch 'mongooseim-support' into 'develop'
2019-05-21 kaniiniMerge branch 'trivial/increase-hackney-timeouts' into...
2019-05-21 kaniiniMerge branch 'fix/prometheus-ecto-error-when-not-config...
2019-05-20 Aaron TinioFix prometheus-ecto error when not configured
2019-05-11 Roman ChvanikovMerge develop
2019-05-08 Roman ChvanikovMerge develop
2019-05-04 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-01 Alex SMerging with develop
2019-04-30 Roman ChvanikovMerge develop
2019-04-20 Roman ChvanikovFix Credo warnings
2019-04-20 Roman ChvanikovMerge branch 'develop' of git.pleroma.social:pleroma...
2019-04-20 Roman ChvanikovDigest emails
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 lainMerge branch 'features/mastoapi/2.6.0-conversations...
2019-04-08 lambdaMerge branch 'use-jobs-in-webpush' into 'develop'
2019-04-08 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-08 lambdaMerge branch 'feature/770-add-emoji-tags' into 'develop'
2019-04-08 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-08 Egor KislitsynMerge branch 'develop' into use-jobs-in-webpush
2019-04-08 Ivan Tashkinov[#923] Merge remote-tracking branch 'remotes/upstream...
2019-04-08 lambdaMerge branch 'develop' into 'improve_upgrade_user_from_...
2019-04-08 lambdaMerge branch 'scheduled-activities' into 'develop'
2019-04-06 feldMerge branch 'fix/deactivated-user-error' into 'develop'
2019-04-06 eugenijmAdd scheduler for sending scheduled activities to the...
2019-04-06 feldMerge branch 'fix/failed-legacy-test' into 'develop'
2019-04-06 feldMerge branch 'feature/prometheus' into 'develop'
2019-04-05 Egor KislitsynUse PleromaJobQueue in Pleroma.Web.Push
2019-04-04 Mark FelderMerge branch 'develop' into feature/prometheus
2019-04-04 Mark FelderCode readability tweak
2019-04-04 Egor Kislitsyn[#1] fix telemetry
2019-04-04 hrefSet up telemetry and prometheus
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 'features/pleroma-tan' into 'develop'
2019-04-02 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-02 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-04-01 Ivan Tashkinov[#923] Merge remote-tracking branch 'remotes/upstream...
2019-03-29 lambdaMerge branch 'pleroma_job_queue' into 'develop'
2019-03-29 EgorReplace Pleroma.Jobs with `pleroma_job_queue`
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] write large numbers with underscore separation
2019-03-13 Haelwenn (lanodan... [Credo] Remove parentesis on argument-less functions
2019-02-19 Mark FelderMerge branch 'develop' into fix/twittercards
2019-02-19 Ivan Tashkinov[#468] Merged `upstream/develop`.
2019-02-19 lambdaMerge branch 'set-cache-on-user-tag-update' into 'develop'
2019-02-19 lambdaMerge branch 'fix/check-follower-collection-in-is_priva...
2019-02-19 lambdaMerge branch 'fix/ap_id-unique_constraint' into 'develop'
2019-02-18 kaniiniMerge branch 'feature/jobs' into 'develop'
2019-02-14 Wim VanderbauwhedeMerge remote-tracking branch 'upstream/develop' into...
2019-02-11 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma...
2019-02-06 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma...
2019-02-04 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma...
2019-02-04 rinpatchMerge branch 'fix/rich-media-relative-path' into 'develop'
2019-02-04 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma...
2019-02-01 hrefMerge branch 'streaming-api-url-fix' into 'develop'
2019-02-01 hrefMerge branch 'develop' into 'develop'
2019-02-01 Lunause Mix.Project.Config for some Application functions
2019-02-01 kaniiniMerge branch 'feature/split-hide-network' into 'develop'
2019-02-01 hrefMerge branch '534_federation_targets_reachability'...
2019-02-01 Lunause nodeinfo 2.1, add repository field
2019-01-31 HaelwennMerge branch 'docs/pleroma-api-invite-token' into ...
2019-01-31 kaniiniMerge branch 'spc-fix-3' into 'develop'
2019-01-31 HaelwennMerge branch 'features/glitch-soc-frontend' into 'develop'
2019-01-31 Egor Kislitsynfix merge
2019-01-31 Egor KislitsynMerge remote-tracking branch 'MAIN/develop' into featur...
2019-01-30 lambdaMerge branch 'multiple-hackney-pools' into 'develop'
2019-01-30 hrefFix 4aff4efa typos
2019-01-30 kaniiniMerge branch 'multiple-hackney-pools' into 'develop'
2019-01-30 hrefUse multiple hackney pools
2019-01-29 kaniiniMerge branch 'bugfix/fix-rejects' into 'develop'
2019-01-29 kaniiniMerge branch 'hj-happiness-improvement' into 'develop'
2019-01-28 Egor Kislitsynadd a job queue
2019-01-28 lainPut deprecation warnings undre Pleroma.Config.
2019-01-28 Ivan Tashkinov[#534] Merged `upstream/develop`.
2019-01-28 lainDon't run warnings in a task.
2019-01-28 lainAdd deprecation warning mechanism.
next