aboutsummaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2020-01-14Merge branch 'develop' into admin-beAlexander Strizhakov
2020-01-12Delete attachments when status is deletedRoman Chvanikov
2020-01-12Merge branch 'updated-at-on-conversation-read' into 'develop'feld
MastodonAPI: Fix mark-as-read bringing the conversation to the top (`POST /api/v1/conversations/:id/read`) See merge request pleroma/pleroma!2080
2020-01-12Merge branch 'issue/1354' into 'develop'feld
[#1354] fix remote follow See merge request pleroma/pleroma!2079
2020-01-12Merge branch 'develop' into issue/1354Mark Felder
2020-01-12Merge branch 'issue/1487' into 'develop'feld
[#1487] fixed clear HTML entities after scrub html and truncate See merge request pleroma/pleroma!2090
2020-01-11Remove MDII uploaderHakaba Hitoyo
2020-01-11Merge branch 'develop' into admin-beAlexander Strizhakov
2020-01-10don't migrate prometheus settingsAlexander Strizhakov
2020-01-10more renamingsAlexander Strizhakov
2020-01-10don't migrate configurable_from_database settingAlexander Strizhakov
2020-01-10dynamic_configuration renamingAlexander Strizhakov
and moving it from instance settings
2020-01-10fix for pleroma assets group updateAlexander Strizhakov
2020-01-10Merge branch 'issue/1490' into 'develop'lain
[#1490] fixed create service user (relay, internal.fetch) See merge request pleroma/pleroma!2092
2020-01-10deep merge in config updateAlexander Strizhakov
2020-01-10flag for delete fixAlexander
2020-01-10little fixes and typos fixAlexander
2020-01-10fixes for logger backendsAlexander
2020-01-10fix for subgroup tupleAlexander
added settings for swoosh adapters local
2020-01-10logger backends fixAlexander
2020-01-10parsing proxy url settingAlexander
2020-01-10fix for endpoints after env updateAlexander
2020-01-10errors on endpointsAlexander
2020-01-10partially settings updateAlexander
2020-01-10tests for setttings without an explicit keyAlexander
2020-01-10config editing through databaseAlex S
2020-01-08fix create service actorMaksim Pechnikov
2020-01-05Fix mark-as-read (`POST /api/v1/conversations/:id/read`) refreshing ↵eugenijm
updated_at and bringing conversation to the top in the user's direct conversation list
2020-01-03fixed Metadata.Utils.scrub_html_and_truncateMaksim Pechnikov
2020-01-02Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
oauth-scopes-tweaks-and-tests
2019-12-25added code of mr#2067Maksim Pechnikov
2019-12-22update testMaksim Pechnikov
2019-12-22Apply suggestion to lib/pleroma/web/twitter_api/views/remote_follow_view.exMaksim
2019-12-22Apply suggestion to ↵Maksim
lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
2019-12-21moved remote follow in separate controllerMaksim Pechnikov
2019-12-21Merge branch 'feature/custom-runtime-modules' into 'develop'rinpatch
Add support for custom modules at runtime Closes #1448 See merge request pleroma/pleroma!2039
2019-12-21Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"Maxim Filippov
This reverts merge request !2076
2019-12-20Posts without media attachments should get the Summary TwitterCardMark Felder
2019-12-20Merge branch 'feature/status-counts-by-scope' into 'develop'feld
Stats: return status counts by scope See merge request pleroma/pleroma!2076
2019-12-20fixed remote followMaksim Pechnikov
2019-12-19Fix all countMaxim Filippov
2019-12-19Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
oauth-scopes-tweaks-and-tests
2019-12-19[#2068] Introduced proper OAuth tokens usage to controller tests.Ivan Tashkinov
2019-12-19Do not crash when remote user follower and following counters are hiddenEgor Kislitsyn
2019-12-18Stats: return status counts by scopeMaxim Filippov
2019-12-17Add ActivityPub Object Event type supportThomas Citharel
Adds Event support in the same way Video objects are handled, with the name of the object as message header. Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-12-17Hide follower counter when hiding is activatedEgor Kislitsyn
2019-12-16Merge branch 'develop' into feature/custom-runtime-modulesEgor Kislitsyn
2019-12-15OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: ↵Ivan Tashkinov
controller tests modification: OAuth scopes usage.
2019-12-13Publisher: check out a connection for inserting publish_one jobsrinpatch
Related to #1474, federation of one post on my istance creates in best-case 360 jobs, so if they for some reason take a while to insert, it will exhaust the connection pool. This fixes it by checking out one dedicated connection for inserting them.