| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2019-11-04 | Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the ↵ | eugenijm | |
| `conversation` stream event payload. | |||
| 2019-11-04 | Merge branch 'transmogrifier-test-errors' into 'develop' | lain | |
| capture test log where errors are expected See merge request pleroma/pleroma!1915 | |||
| 2019-11-04 | add missing tesla mocks | Steven Fuchs | |
| 2019-11-04 | Merge branch 'feature/store-statuses-data-inside-flag' into 'develop' | lain | |
| Store status data inside flag activity See merge request pleroma/pleroma!1849 | |||
| 2019-11-03 | Merge branch 'bugfix/streamer-follows' into 'develop' | rinpatch | |
| streamer: use direct object for filter checks when there is no valid child object in an activity Closes #1291 See merge request pleroma/pleroma!1931 | |||
| 2019-11-03 | Merge branch 'feature/omit-relay-user' into 'develop' | kaniini | |
| AdminAPI: Omit relay user from users list Closes #1349 See merge request pleroma/pleroma!1924 | |||
| 2019-11-03 | Merge branch 'feature/fast_sanitize' into 'develop' | kaniini | |
| Switching to FastSanitize See merge request pleroma/pleroma!1916 | |||
| 2019-11-03 | streamer: use direct object for filter checks when there is no valid child ↵ | Ariadne Conill | |
| object in an activity We call Object.normalize/1 to get the child object for situations like Announce. However, the check is flawed and immediately fails if Object.normalize/1 fails. Instead, we should use the activity itself in those cases to allow activities which never have a child object to pass through the filter. Closes #1291 | |||
| 2019-11-01 | Force password reset for multiple users | Maxim Filippov | |
| 2019-10-31 | AdminAPI: Omit relay user from users list | Maxim Filippov | |
| 2019-10-30 | Merge branch 'develop' into feature/fast_sanitize | Mark Felder | |
| 2019-10-30 | Handle "Move" activity | Egor Kislitsyn | |
| 2019-10-30 | Update test for get_recipients_from_activity | kPherox | |
| 2019-10-30 | Rip out the rest of htmlsanitizeex | rinpatch | |
| 2019-10-29 | Fix XSS emoji test | rinpatch | |
| 2019-10-29 | Add test follow activity for locked account | kPherox | |
| 2019-10-29 | Switch from HtmlSanitizeEx to FastSanitize | rinpatch | |
| 2019-10-28 | capture where errors are expected | stwf | |
| 2019-10-28 | Merge branch 'develop' into feature/move-activity | Egor Kislitsyn | |
| 2019-10-28 | Merge branch 'refactor/following-relationships' into 'develop' | lain | |
| Move following relationships to a separate table Closes #1233 See merge request pleroma/pleroma!1814 | |||
| 2019-10-27 | Make sure incoming flags are updated with status data | Maxim Filippov | |
| 2019-10-27 | Merge branch 'develop' into feature/store-statuses-data-inside-flag | Maxim Filippov | |
| 2019-10-27 | Strip status data from Flag (when federating or closing/resolving report) | Maxim Filippov | |
| 2019-10-26 | Mark the conversations with the blocked user as read and update the blocking ↵ | eugenijm | |
| user's `unread_conversation_count`. Since the conversations with the blocked user are invisible, they are excluded from the blocking user's `unread_conversation_count`. | |||
| 2019-10-25 | Add `also_known_as` field to Pleroma.User | Egor Kislitsyn | |
| 2019-10-24 | fix test | stwf | |
| 2019-10-24 | Merge remote-tracking branch 'upstream/develop' into ↵ | Egor Kislitsyn | |
| refactor/following-relationships | |||
| 2019-10-23 | Store status data inside Flag activity | Maxim Filippov | |
| 2019-10-23 | Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
| 1304-user-info-deprecation # Conflicts: # lib/pleroma/notification.ex | |||
| 2019-10-22 | activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors | Ariadne Conill | |
| 2019-10-22 | tests: transmogrifier: add explicit regression tests for JSON-LD string to ↵ | Ariadne Conill | |
| single-element array deserialization There appears to be confusion on whether or not Pleroma can handle this particular sin of JSON-LD. It can, and we will add regression tests to prove that it can handle this particular sin. Which, by the way, this is actually not a "feature" of JSON-LD, but whatever. | |||
| 2019-10-21 | Merge branch 'feature/push-subject-for-dm' into 'develop' | kaniini | |
| Direct messages should provide a distinct push notification subject See merge request pleroma/pleroma!1864 | |||
| 2019-10-21 | Spelling | Mark Felder | |
| 2019-10-21 | Add tests for the subject of push notifications | Mark Felder | |
| 2019-10-21 | Merge branch 'fix/notifs-exclude-blocked-from-with-muted' into 'develop' | rinpatch | |
| Do not include notifications from blocked users when with_muted is set See merge request pleroma/pleroma!1869 | |||
| 2019-10-21 | Do not include notifications from blocked users when with_muted is set | rinpatch | |
| This is not what with_muted is for per documentation and it was agreed on irc that this behavior doesn't make sense. | |||
| 2019-10-21 | [#1304] Merged `develop`, handled User.Info.invisible. | Ivan Tashkinov | |
| 2019-10-21 | Merge branch 'develop' into feature/masto_api_markers | Maksim Pechnikov | |
| 2019-10-21 | Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
| 1304-user-info-deprecation # Conflicts: # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/activity_pub/transmogrifier.ex | |||
| 2019-10-21 | Fix Relay | Egor Kislitsyn | |
| 2019-10-21 | Merge branch 'develop' into refactor/following-relationships | Egor Kislitsyn | |
| 2019-10-20 | [#1304]. Post-merge fixes. Merge branch 'develop' of ↵ | Ivan Tashkinov | |
| git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs | |||
| 2019-10-20 | Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
| 1304-user-info-deprecation # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs | |||
| 2019-10-20 | [#1304] Moved remaining fields from User.Info to User. | Ivan Tashkinov | |
| Misc. fixes / improvements. | |||
| 2019-10-19 | change Maksim's test description | Ariadne Conill | |
| 2019-10-19 | tests: add test to ensure invisible actors are rendered with the invisible ↵ | Ariadne Conill | |
| hint set to true | |||
| 2019-10-19 | tests: add test verifying the relay user is invisible | Ariadne Conill | |
| 2019-10-19 | rework to use properties instead of compound typing, per SocialCG | Ariadne Conill | |
| 2019-10-19 | fix test | Maksim Pechnikov | |
| 2019-10-19 | added test fo Pleroma.Web.MastodonAPI.StatusController | Maksim Pechnikov | |
 |
index : pleroma.git | |
| [no description] |
| aboutsummaryrefslogtreecommitdiff |