| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2019-04-13 | Merge develop to 788-separate-email-addresses | Alex 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-13 | fallback to the old behaviour | Alex S | |
| admin and user mailers | |||
| 2019-04-12 | Revert "simplify mentions escape" | Egor | |
| This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1. | |||
| 2019-04-12 | Merge 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-12 | add tests | Egor Kislitsyn | |
| 2019-04-12 | Merge 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-12 | Merge branch 'fix/732-password-align' into 'develop' | lambda | |
| password reset page labels align See merge request pleroma/pleroma!986 | |||
| 2019-04-12 | adding destroy multiple for mastofe | Alexander Strizhakov | |
| 2019-04-12 | in_reply_to_id - null | Alexander Strizhakov | |
| 2019-04-11 | Merge 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-12 | Add `with_body: true` to requests relying on `max_body: val` | Roman Chvanikov | |
| 2019-04-11 | Update OAuth web template | Mark Felder | |
| 2019-04-11 | fix format | Egor Kislitsyn | |
| 2019-04-11 | move user disable into deactivation | Egor Kislitsyn | |
| 2019-04-11 | Merge remote-tracking branch 'pleroma/develop' into feature/disable-account | Egor Kislitsyn | |
| 2019-04-10 | [#923] OAuth consumer params handling refactoring. | Ivan Tashkinov | |
| Registration and authorization-related params are wrapped in "authorization" in order to reduce edge cases number and simplify handling logic. | |||
| 2019-04-10 | Conversations: Tidying up. | lain | |
| 2019-04-10 | Conversations: Make tests run. | lain | |
| 2019-04-10 | Participations: Add last activity. | lain | |
| 2019-04-10 | Participation: Get for a user. | lain | |
| 2019-04-10 | Conversations: Create or bump on inserting a dm. | lain | |
| 2019-04-10 | Participations: Add marking as read and unread. | lain | |
| 2019-04-10 | Conversation: Add Conversations and Participations. | lain | |
| 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 '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 | s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/ | Haelwenn (lanodan) Monnier | |
| 2019-04-10 | s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/ | Haelwenn (lanodan) Monnier | |
| 2019-04-10 | s/Pleroma.Mailer/Pleroma.Emails.Mailer/ | Haelwenn (lanodan) Monnier | |
| 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 | Merge remote-tracking branch 'origin/develop' into ↵ | lain | |
| features/mastoapi/2.6.0-conversations | |||
| 2019-04-08 | Use Pleroma.Config instead of Application.get_env | Sadposter | |
| 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 | adding language tag | Alexander Strizhakov | |
| 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 | |
 |
index : pleroma | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summaryrefslogtreecommitdiff |