| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2019-12-10 | Merge branch 'develop' into 'domain-block-precedence' | Sadposter | |
| # Conflicts: # lib/pleroma/user.ex | |||
| 2019-12-10 | make analysis happy | Sadposter | |
| 2019-12-10 | modify SQL to include followed-but-domain-blocked activities | Sadposter | |
| 2019-12-08 | Merge branch 'improve-move-notificaions-api' into 'develop' | rinpatch | |
| Add `with_move` query param to the notifications API See merge request pleroma/pleroma!2032 | |||
| 2019-12-06 | Merge branch 'develop' into fix/mrf-delete | rinpatch | |
| 2019-12-05 | ActivityPub: Fix deletes being exempt from MRF | rinpatch | |
| Closes #1461 | |||
| 2019-12-05 | Merge branch '1335-user-api-id-fields-relations' into 'develop' | lain | |
| [#1335] User: refactoring of AP ID fields into relations Closes #1335 See merge request pleroma/pleroma!1963 | |||
| 2019-12-05 | Merge branch 'feature/admin-api-render-whole-status' into 'develop' | feld | |
| Miscellaneous grouped reports fixes Closes admin-fe#48 and admin-fe#51 See merge request pleroma/pleroma!2007 | |||
| 2019-12-04 | Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
| 1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/user.ex | |||
| 2019-12-03 | Add `with_move` query param to the notifications API | Egor Kislitsyn | |
| 2019-12-02 | Merge branch 'feature/move-activity' into 'develop' | lain | |
| Support "Move" activity Closes #1316 See merge request pleroma/pleroma!1883 | |||
| 2019-11-30 | test missing first field | kPherox | |
| 2019-11-29 | Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
| 1335-user-api-id-fields-relations # Conflicts: # mix.lock | |||
| 2019-11-28 | Cleanup tests output | Egor Kislitsyn | |
| 2019-11-26 | Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
| 1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/web/activity_pub/activity_pub.ex | |||
| 2019-11-26 | Merge branch 'develop' into feature/admin-api-render-whole-status | Maxim Filippov | |
| 2019-11-26 | AdminAPI: Grouped reports old/new fix | Maxim Filippov | |
| If some status received reports both in the "new" format and "old" format it was considered reports on two different statuses (in the context of grouped reports) | |||
| 2019-11-25 | ActivityPub controller: do not render remote users | rinpatch | |
| 2019-11-19 | [#1335] Implemented notification mutes and reblog mutes as ↵ | Ivan Tashkinov | |
| UserRelationships. User to UserRelationship relations and functions refactoring. | |||
| 2019-11-15 | Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
| 1335-user-api-id-fields-relations | |||
| 2019-11-15 | [#1335] Reorganized `users.mutes` as relation to UserMute entity. | Ivan Tashkinov | |
| 2019-11-14 | fix credo | Ariadne Conill | |
| 2019-11-14 | MRF: add ObjectAgePolicy which deals with old posts being imported | Ariadne Conill | |
| 2019-11-14 | Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop' | feld | |
| Admin API: Grouped reports, update multiple reports in one query Closes admin-fe#43 See merge request pleroma/pleroma!1815 | |||
| 2019-11-14 | Merge remote-tracking branch 'upstream/develop' into feature/move-activity | Egor Kislitsyn | |
| 2019-11-12 | Add a notification for Move activities | Egor Kislitsyn | |
| 2019-11-12 | Add `allow_following_move` setting to User | Egor Kislitsyn | |
| 2019-11-11 | Merge branch 'develop' into feature/reports-groups-and-multiple-state-update | Maxim Filippov | |
| 2019-11-10 | [#1335] User: refactored :blocks field into :blocked_users relation. | Ivan Tashkinov | |
| Introduced UserBlock. | |||
| 2019-11-10 | Merge branch 'develop' into 'reactions' | lain | |
| # Conflicts: # CHANGELOG.md | |||
| 2019-11-10 | add subject to atom feed | Maksim Pechnikov | |
| 2019-11-08 | Merge remote-tracking branch 'origin/develop' into reactions | lain | |
| 2019-11-08 | Support old flag format | Maxim Filippov | |
| 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 | Merge branch 'feature/store-statuses-data-inside-flag' into 'develop' | lain | |
| Store status data inside flag activity See merge request pleroma/pleroma!1849 | |||
| 2019-10-30 | Merge branch 'develop' into feature/fast_sanitize | Mark Felder | |
| 2019-10-30 | Handle "Move" activity | Egor Kislitsyn | |
| 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-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 | |||
 |
index : pleroma | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summaryrefslogtreecommitdiff |