aboutsummaryrefslogtreecommitdiff
path: root/config
AgeCommit message (Collapse)Author
2019-04-19Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵Roman Chvanikov
feature/digest-email
2019-04-19Add Notification.for_user_since/2Roman Chvanikov
2019-04-19typo fixAlexander Strizhakov
docs for RelMe provider
2019-04-17Resolve conflictsRoman Chvanikov
2019-04-16Merge branch 'feature/788-separate-email-addresses' into 'develop'kaniini
Feature/788 separate email addresses Closes #788 See merge request pleroma/pleroma!1040
2019-04-16add extra_cookie_attrs option to configHakurei Reimu
Allow instance admins to set their own SameSite cookie policy from the config. Default value in the config is `Lax`.
2019-04-15Config.exs: Add big warning so that nobody ever edits it.lain
2019-04-13Merge develop to 788-separate-email-addressesAlex S
Merge conflicts: test/web/twitter_api/twitter_api_test.exs test/web/twitter_api/twitter_api_controller_test.exs test/web/admin_api/admin_api_controller_test.exs
2019-04-11Merge remote-tracking branch 'pleroma/develop' into feature/disable-accountEgor Kislitsyn
2019-04-10adding notify_email setting for trigger emailsAlex S
2019-04-10s/Pleroma.Mailer/Pleroma.Emails.Mailer/Haelwenn (lanodan) Monnier
2019-04-08Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpushEgor Kislitsyn
2019-04-08Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'lambda
Improve Transmogrifier.upgrade_user_from_ap_id/2 See merge request pleroma/pleroma!1019
2019-04-08Merge branch 'twitter_oauth' into 'develop'lambda
OAuth consumer (sign in / sign up with external provider) See merge request pleroma/pleroma!923
2019-04-08Merge branch 'feature/770-add-emoji-tags' into 'develop'lambda
Feature/770 add emoji tags See merge request pleroma/pleroma!998
2019-04-08Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpushEgor Kislitsyn
2019-04-08Merge branch 'develop' into use-jobs-in-webpushEgor Kislitsyn
2019-04-08[#923] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
twitter_oauth # Conflicts: # docs/config.md # test/support/factory.ex
2019-04-08Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'lambda
# Conflicts: # config/config.exs # docs/config.md
2019-04-06Add scheduler for sending scheduled activities to the queueeugenijm
2019-04-06Added limits and media attachments for scheduled activities.eugenijm
2019-04-06Merge develop to 770-add-emoji-tagsAlex S
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
2019-04-05Use PleromaJobQueue in Pleroma.Web.PushEgor Kislitsyn
2019-04-05[#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme.Ivan Tashkinov
2019-04-04[#923] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
twitter_oauth # Conflicts: # mix.exs
2019-04-04Merge branch 'develop' into feature/prometheusMark Felder
2019-04-04Add ability to ship logs to a Slack channelfeld
2019-04-04Clean merge crumbsMark Felder
2019-04-04Serve metrics at `/api/pleroma/app_metrics`href
2019-04-04[#1] fix telemetryEgor Kislitsyn
2019-04-04Set up telemetry and prometheushref
2019-04-04Improve Transmogrifier.upgrade_user_from_ap_id/2Egor Kislitsyn
2019-04-02Merge develop into feature/770-add-emoji-tagsAlex S
2019-04-02[#923] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
twitter_oauth # Conflicts: # mix.exs
2019-04-02little changes and typosAlex S
2019-04-02refactoring of emoji tags config to use groupsAlex S
2019-04-01Adding tag to emoji ets tableAlex S
changes in apis
2019-04-01[#923] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
twitter_oauth # Conflicts: # mix.exs
2019-03-31Add default mail adapter settings to configMark Felder
2019-03-31BBS: Tests and formatting.lain
2019-03-29Replace Pleroma.Jobs with `pleroma_job_queue`Egor
2019-03-27Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauthIvan Tashkinov
2019-03-27[#923] OAuth consumer improvements, fixes, refactoring.Ivan Tashkinov
2019-03-22Merge branch 'safe-mentions' into 'develop'kaniini
Add safe dm mode option. See merge request pleroma/pleroma!958
2019-03-20Add safe dm mode option.lain
2019-03-20[#923] Typo fix.Ivan Tashkinov
2019-03-20[#923] Support for multiple OAuth consumer strategies.Ivan Tashkinov
2019-03-20Ecto 3.0.5 migrationrinpatch
kms
2019-03-18[#923] Support for multiple (external) registrations per user via Registration.Ivan Tashkinov
2019-03-18[#923] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
twitter_oauth # Conflicts: # config/config.exs # lib/pleroma/web/auth/pleroma_authenticator.ex
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 23:12:14 +0000