Age | Commit message (Collapse) | Author | |
---|---|---|---|
2019-04-10 | Merge branch 'develop' into feature/788-separate-email-addresses | Alex S | |
2019-04-10 | adding notify_email setting for trigger emails | Alex S | |
2019-04-10 | Merge branch 'feature/767-multiple-use-invite-token' into 'develop' | lambda | |
Feature/767 multiple use invite token See merge request pleroma/pleroma!1032 | |||
2019-04-10 | Merge branch 'feature/user-status-subscriptions' into 'develop' | lambda | |
Add ability to subscribe to users See merge request pleroma/pleroma!1024 | |||
2019-04-10 | Merge branch 'develop' into feature/user-status-subscriptions | Sadposter | |
2019-04-10 | Merge 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-10 | Merge branch 'hotfix/fix_undefined_summary' into 'develop' | kaniini | |
transmogrifier.ex: Add fix_summary/1 See merge request pleroma/pleroma!1039 | |||
2019-04-10 | Merge branch 'notification-pleroma-settings' into 'develop' | kaniini | |
Notification controls Closes #738 See merge request pleroma/pleroma!988 | |||
2019-04-10 | transmogrifier.ex: Add fix_summary/1 | Haelwenn (lanodan) Monnier | |
MRF.KeywordPolicy assumes that summary is present in a activity, and this would probably simplify code elsewhere too anyway. | |||
2019-04-09 | Change response format of /api/pleroma/emoji to the one that actually makes ↵ | rinpatch | |
sense | |||
2019-04-09 | Merge 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-09 | Merge branch 'bugfix/follower_count' into 'develop' | lambda | |
update the follower count when a follower is blocked See merge request pleroma/pleroma!1033 | |||
2019-04-09 | update the follower count when a follower is blocked | Sachin Joshi | |
2019-04-08 | Used cached user resources in subscriptions | Sadposter | |
2019-04-08 | removing not needed invite update | Alex S | |
2019-04-08 | fix for elixir 1.7.4 | Alex S | |
2019-04-08 | Use Pleroma.Config instead of Application.get_env | Sadposter | |
2019-04-08 | Merge branch 'use-jobs-in-webpush' into 'develop' | lambda | |
Use PleromaJobQueue in Pleroma.Web.Push See merge request pleroma/pleroma!1023 | |||
2019-04-08 | Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush | Egor Kislitsyn | |
2019-04-08 | Sever subscription in case of block | Sadposter | |
2019-04-08 | Merge 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-08 | Merge branch 'twitter_oauth' into 'develop' | lambda | |
OAuth consumer (sign in / sign up with external provider) See merge request pleroma/pleroma!923 | |||
2019-04-08 | Merge branch 'feature/697-language-tag-metadata' into 'develop' | lambda | |
adding language tag See merge request pleroma/pleroma!1034 | |||
2019-04-08 | adding language tag | Alexander Strizhakov | |
2019-04-08 | test for valid_invite? | Alex S | |
2019-04-08 | Merge branch 'feature/770-add-emoji-tags' into 'develop' | lambda | |
Feature/770 add emoji tags See merge request pleroma/pleroma!998 | |||
2019-04-08 | Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush | Egor Kislitsyn | |
2019-04-08 | AdminApiControllerTest unused variables fix. | Ivan Tashkinov | |
2019-04-08 | Merge branch 'develop' into use-jobs-in-webpush | Egor 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-08 | Merge branch 'develop' into 'improve_upgrade_user_from_ap_id' | lambda | |
# Conflicts: # config/config.exs # docs/config.md | |||
2019-04-08 | Merge branch 'scheduled-activities' into 'develop' | lambda | |
Scheduled activities See merge request pleroma/pleroma!989 | |||
2019-04-08 | renaming expire_at -> expires_at | Alex S | |
keyword style change | |||
2019-04-07 | Add check on activity visibility in sub notification | Sadposter | |
2019-04-07 | credo fix | Alex S | |
2019-04-07 | added docs to docs/api/admin_api.md | Alex 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-06 | Merge 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-06 | Add scheduler for sending scheduled activities to the queue | eugenijm | |
2019-04-06 | Added limits and media attachments for scheduled activities. | eugenijm | |
2019-04-06 | Handle `scheduled_at` on status creation. | eugenijm | |
2019-04-06 | Add scheduled activities | eugenijm | |
2019-04-06 | Return 403 on oauth token exchange for a deactivated user | eugenijm | |
2019-04-06 | Merge branch 'fix/failed-legacy-test' into 'develop' | feld | |
Mock :crypt.crypt/2 to pass LegacyAuthenticationPlugTest on Mac OS See merge request pleroma/pleroma!1030 | |||
2019-04-06 | little channges | Alex S | |
2019-04-06 | JSON need quotes! | Sadposter | |
2019-04-06 | Document subscription endpoints, fix typos | Sadposter | |
Also adds a quick error case on the subscription endpoints to avoid 500s | |||
2019-04-06 | Merge branch 'feature/prometheus' into 'develop' | feld | |
Upstream: Metrics and debugging See merge request pleroma/pleroma!1020 | |||
2019-04-06 | Pin recon dependency to 2.4.0 | Mark Felder | |
2019-04-06 | fix for field name | Alex S | |