aboutsummaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2019-10-21Fix RelayEgor Kislitsyn
2019-10-21Merge branch 'develop' into refactor/following-relationshipsEgor 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-20Merge 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] Analysis issue fix.Ivan Tashkinov
2019-10-20[#1304] Moved remaining fields from User.Info to User.Ivan Tashkinov
Misc. fixes / improvements.
2019-10-19rework to use properties instead of compound typing, per SocialCGAriadne Conill
2019-10-19implement invisible support for remote usersAriadne Conill
2019-10-19user: implement User.invisible?/1Ariadne Conill
2019-10-19relay: set invisible to trueAriadne Conill
2019-10-19user info: add invisible fieldAriadne Conill
2019-10-19Merge branch 'feature/mastofe-pwa' into 'develop'Haelwenn
MastoFE: Add PWA manifest. See merge request pleroma/pleroma!1834
2019-10-19Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's ↵eugenijm
conversations as read
2019-10-19MastoFE: Add PWA manifest.KokaKiwi
2019-10-19Merge branch 'mix-emoji-task-pack-json' into 'develop'rinpatch
For pleroma.emoji downloaded packs, generate pack.json instead See merge request pleroma/pleroma!1748
2019-10-18Merge branch 'develop' into feature/push-subject-for-dmMark Felder
2019-10-18Direct messages should provide a distinct push notification subjectMark Felder
2019-10-18Merge branch 'develop' into feature/relay-listMaxim Filippov
2019-10-18object: containment: simplify the pattern match for OStatus testsuite hackAriadne Conill
2019-10-18object: containment: only allow OStatus references in test suite environmentAriadne Conill
2019-10-18object: fetcher: fix up formattingAriadne Conill
2019-10-18activitypub: tag containment checks for better error tracingAriadne Conill
2019-10-18object: containment: also allow OStatus object IDs through when comparing ↵Ariadne Conill
origins
2019-10-18object: fetcher: improve error reportingAriadne Conill
2019-10-18object: containment: don't try to contain ostatus objectsAriadne Conill
2019-10-18object fetcher: fix up error handlingAriadne Conill
2019-10-18fix up some testsAriadne Conill
2019-10-18kill almost all of the OStatus moduleAriadne Conill
2019-10-18federator: remove OStatus incoming document supportAriadne Conill
2019-10-18remove Salmon moduleAriadne Conill
2019-10-18router: disconnect SalmonAriadne Conill
2019-10-18webfinger: stop pulling Salmon data out of WebFingerAriadne Conill
2019-10-18feed: don't advertise salmon endpointAriadne Conill
2019-10-18publisher: move remote_users() from Salmon moduleAriadne Conill
2019-10-18websub: remove entirelyAriadne Conill
2019-10-18federator: remove websub stuffAriadne Conill
2019-10-18application: don't start Federator.init/1 anymoreAriadne Conill
2019-10-18Fix a migration wiping user info of users that don't have any mutesrinpatch
And introduce safe_jsonb_set
2019-10-18upload.ex: Remove deprecated configurationHaelwenn (lanodan) Monnier
2019-10-18Merge branch 'develop' into feature/relay-listMaxim Filippov
2019-10-18Merge branch 'fix-streaming-with-sec-websocket-protocol' into 'develop'kaniini
Fix streaming websocket handshake with `Sec-WebSocket-Protocol` See merge request pleroma/pleroma!1847
2019-10-18Apply suggestion to lib/pleroma/web/mastodon_api/websocket_handler.exkaniini
2019-10-17Mastodon API: Mark the conversation as read for the author when they send a ↵eugenijm
new direct message
2019-10-17add Markers /api/v1/markersMaksim Pechnikov
2019-10-16[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.Ivan Tashkinov
2019-10-16Merge branch 'user-search-experiments' into 'develop'lain
User search: Remove trigram and refactor the module See merge request pleroma/pleroma!1850
2019-10-16Merge branch 'feature/multiple-users-activation-permissions' into 'develop'feld
Ability to toggle activation status, permission group & delete multiple users Closes admin-fe#39 See merge request pleroma/pleroma!1825
2019-10-16Merge branch 'benchmark-finishing' into 'develop'lain
Benchmark finishing Closes #755 See merge request pleroma/pleroma!1848
2019-10-16Order fts results by trigramrinpatch
2019-10-16User search: Remove trigram and refactor the modulerinpatch
- Remove trigram as it tends to rank garbage results highly, resulting in it prioritized above fts, which gives actually decent results. ACKed by kaniini and lain on irc. - Remove a test for handling misspelled requests, since we no longer have trigram - Remove a test for searching users with `nil` display names, because it is unrealistic, we don't accept usernames that are not >1 char strings - Make rank boosting for followers/followees sane again, previous values resulted in garbage matches getting on top just because the users are followers/followees