summaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2019-04-14Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵Roman Chvanikov
feature/digest-email
2019-04-13Add User.Info.email_notificationsRoman Chvanikov
2019-04-12Revert "simplify mentions escape"Egor
This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.
2019-04-12Merge branch 'bugfix/pleroma-email-naming' into 'develop'lambda
Make the filename and module name of Pleroma.Emails.* orthogonal See merge request pleroma/pleroma!1029
2019-04-12Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop'lambda
Features: mastoapi-2.6.0 `min_id` pagination Closes #351 See merge request pleroma/pleroma!976
2019-04-12Merge branch 'fix/732-password-align' into 'develop'lambda
password reset page labels align See merge request pleroma/pleroma!986
2019-04-12adding destroy multiple for mastofeAlexander Strizhakov
2019-04-12in_reply_to_id - nullAlexander Strizhakov
2019-04-11Merge branch 'fix/hackney_max_body_param' into 'develop'kaniini
Add `with_body: true` to requests relying on `max_body: val` Closes #778 See merge request pleroma/pleroma!1049
2019-04-12Add `with_body: true` to requests relying on `max_body: val`Roman Chvanikov
2019-04-10Merge branch 'feature/767-multiple-use-invite-token' into 'develop'lambda
Feature/767 multiple use invite token See merge request pleroma/pleroma!1032
2019-04-10Merge branch 'develop' into feature/user-status-subscriptionsSadposter
2019-04-10Merge branch 'fix/emoji-api-nonsense' into 'develop'lambda
Change response format of /api/pleroma/emoji so it makes sense See merge request pleroma/pleroma!1038
2019-04-10s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/Haelwenn (lanodan) Monnier
2019-04-10s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/Haelwenn (lanodan) Monnier
2019-04-10s/Pleroma.Mailer/Pleroma.Emails.Mailer/Haelwenn (lanodan) Monnier
2019-04-10Merge branch 'hotfix/fix_undefined_summary' into 'develop'kaniini
transmogrifier.ex: Add fix_summary/1 See merge request pleroma/pleroma!1039
2019-04-10Merge branch 'notification-pleroma-settings' into 'develop'kaniini
Notification controls Closes #738 See merge request pleroma/pleroma!988
2019-04-10transmogrifier.ex: Add fix_summary/1Haelwenn (lanodan) Monnier
MRF.KeywordPolicy assumes that summary is present in a activity, and this would probably simplify code elsewhere too anyway.
2019-04-09Change response format of /api/pleroma/emoji to the one that actually makes ↵rinpatch
sense
2019-04-09Merge branch 'mastoapi/plaintext-statuses' into 'develop'rinpatch
Provide plaintext representations of content/cw in MastoAPI Closes #787 See merge request pleroma/pleroma!1035
2019-04-09Merge branch 'bugfix/follower_count' into 'develop'lambda
update the follower count when a follower is blocked See merge request pleroma/pleroma!1033
2019-04-09update the follower count when a follower is blockedSachin Joshi
2019-04-08Used cached user resources in subscriptionsSadposter
2019-04-08removing not needed invite updateAlex S
2019-04-08fix for elixir 1.7.4Alex S
2019-04-08Use Pleroma.Config instead of Application.get_envSadposter
2019-04-08Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpushEgor Kislitsyn
2019-04-08Sever subscription in case of blockSadposter
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-08adding language tagAlexander Strizhakov
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-08Merge branch 'scheduled-activities' into 'develop'lambda
Scheduled activities See merge request pleroma/pleroma!989
2019-04-08renaming expire_at -> expires_atAlex S
keyword style change
2019-04-07Add check on activity visibility in sub notificationSadposter
2019-04-07credo fixAlex S
2019-04-07added docs to docs/api/admin_api.mdAlex S
code style and little renamings
2019-04-07[#923] Removed <br> elements from auth forms, adjusted docs, minor auth ↵Ivan Tashkinov
settings refactoring.
2019-04-06Merge branch 'fix/deactivated-user-error' into 'develop'feld
Return 403 for deactivated user on token request Closes #785 See merge request pleroma/pleroma!1031
2019-04-06Add scheduler for sending scheduled activities to the queueeugenijm
2019-04-06Added limits and media attachments for scheduled activities.eugenijm
2019-04-06Handle `scheduled_at` on status creation.eugenijm
2019-04-06Add scheduled activitieseugenijm
2019-04-06Return 403 on oauth token exchange for a deactivated usereugenijm
2019-04-06little channgesAlex S
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-25 16:48:38 +0000