Commit Graph

129 Commits (b5b98f9e10ebe9742aa5b00b93b6491dc1dddee3)

Author SHA1 Message Date
Haelwenn 901204df22 Merge branch 'poll-notification' into 'develop'
3 years ago
Ilja dd947d9bc8
Add tests for setting `:instance, :quarantined_instances`
3 years ago
Alex Gleason 62bf6d67e3
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
3 years ago
Alex Gleason 0b1c05ca1e
Poll notification: trigger PollWorker through common_pipeline
3 years ago
Alex Gleason 0114754db2
MastodonAPI: Support poll notification
3 years ago
Haelwenn (lanodan) Monnier 5c3a0dd26e
factory: Fix article_factory
3 years ago
Alexander Strizhakov 8857242c95
removeing corresponding add activity
4 years ago
Alexander Strizhakov 3adb43cc20
refetch user on incoming add/remove activity
4 years ago
Alexander Strizhakov 3ec1dbd922
Let pins federate
4 years ago
feld 008499f65a Merge branch 'develop' into 'fix/2412-filters'
4 years ago
Alexander Strizhakov 2cb6dc5a3a
list timeline filtration by params
4 years ago
Alexander Strizhakov 875fbaae35
support for expires_in/expires_at in filters
4 years ago
Lain Soykaf 39f3683a06 Pbkdf2: Use it everywhere.
4 years ago
lain 9106048c61 Password: Replace Pbkdf2 with Password.
4 years ago
Haelwenn (lanodan) Monnier c4439c630f
Bump Copyright to 2021
4 years ago
lain e1e7e4d379 Object: Rework how Object.normalize works
4 years ago
Haelwenn 3966add048 Revert "Merge branch 'features/hashtag-column' into 'develop'"
4 years ago
Haelwenn (lanodan) Monnier acb03d591b
Insert text representation of hashtags into object["hashtags"]
4 years ago
Alexander Strizhakov e2bf6b1f7e
fix for forwarded reports
4 years ago
Mark Felder 8bacdc3680 Change user.discoverable field to user.is_discoverable
4 years ago
stwf 41939e3175 User search respect discoverable flag
4 years ago
Alexander Strizhakov 9bf1065a06 schedule activity expiration in Oban
4 years ago
Alex Gleason f9301044ed
Add ReportNote test
4 years ago
Alex Gleason 77b48cb4ce
Factory: Add report_activity_factory
4 years ago
Sergey Suprunenko 4a8c26654e
Restrict statuses that contain user's irreversible filters
4 years ago
Haelwenn (lanodan) Monnier 244655e884
MastoAPI: Show source field when deleting
4 years ago
rinpatch 4ec2fb967e Merge branch 'features/users-raw_bio' into 'develop'
4 years ago
Alexander Strizhakov 9a4fde9766
Mogrify args as custom tuples
4 years ago
Haelwenn (lanodan) Monnier e1b07402ab
User: Add raw_bio, storing unformatted bio
4 years ago
lain 3bec0d2e50 Factory: Set users to be ap_enabled by default.
4 years ago
Alex Gleason b46811a074
Upgrade Comeonin to v5
4 years ago
Maksim 3d0c567fbc Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
4 years ago
lain 335aabc39c Transmogrifier tests: Extract like tests.
4 years ago
Alexander Strizhakov a6ee6784bc
creating trusted app from adminFE & mix task
5 years ago
Haelwenn (lanodan) Monnier 6da6540036
Bump copyright years of files changed after 2020-01-07
5 years ago
Alexander Strizhakov 29155137fd
renaming
5 years ago
Alexander Strizhakov 1630ecaa20
Merge branch 'develop' into admin-be
5 years ago
Alexander 5cacb988b9
partially settings update
5 years ago
Alex S 2753285b77
config editing through database
5 years ago
Ivan Tashkinov 7973cbdb9f OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
5 years ago
Maksim Pechnikov 95e6a2acd9 Merge branch 'develop' into issue/1342
5 years ago
Maksim Pechnikov 3fe7a1fd35 Merge branch 'develop' into issue/1342
5 years ago
Ivan Tashkinov 30caf3e51e Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Maksim Pechnikov a52da55eb9 added User.NotificationSetting struct
5 years ago
Ivan Tashkinov 1636cc5b7e Removed users.info and remaining usages.
5 years ago
Ivan Tashkinov de892d2fe1 [#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
5 years ago
Egor Kislitsyn 4c1dd55c48 Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
5 years ago
Maksim Pechnikov 243719a965 Merge branch 'develop' into feature/masto_api_markers
5 years ago
Egor Kislitsyn 4ea1a61b00
Merge branch 'develop' into refactor/following-relationships
5 years ago
Ariadne Conill 4f82e42e4e websub: remove entirely
5 years ago