aboutsummaryrefslogtreecommitdiff
path: root/test/web
AgeCommit message (Collapse)Author
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-11Merge branch 'develop' into admin-beAlexander Strizhakov
2020-01-10more renamingsAlexander Strizhakov
2020-01-10dynamic_configuration renamingAlexander Strizhakov
and moving it from instance settings
2020-01-10Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1478-oauth-admin-scopes-tweaks # Conflicts: # lib/pleroma/user.ex
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-10logger backends fixAlexander
2020-01-10parsing proxy url settingAlexander
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-10[#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, ↵Ivan Tashkinov
migrated existing OAuth records. Adjusted tests.
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-24fix oauth scopes for AdminApi#reports_updateMaksim Pechnikov
2019-12-23update testsMaksim Pechnikov
2019-12-22update testMaksim Pechnikov
2019-12-21moved remote follow in separate controllerMaksim Pechnikov
2019-12-21Merge branch 'develop' into issue/1383Maksim Pechnikov
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-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-19Return 404 if account to filter notifications from is not foundEgor Kislitsyn
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-18add tag feedsMaksim Pechnikov
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-17Add support for `account_id` param to filter notifications by the accountEgor Kislitsyn
2019-12-17Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhostMaxim Filippov
2019-12-17Hide follower counter when hiding is activatedEgor Kislitsyn
2019-12-17Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2019-12-16formattingrinpatch
2019-12-16tests: significantly reduce streamer timeoutrinpatch
there is no reason IPC between two processes on the same node should take 4 seconds
2019-12-16tests: remove a useless 1 second sleeprinpatch
there is no need to wait for the task to finish, it will be deleted when the transaction is aborted anyway.
2019-12-16tests: remove a useless 3 second sleeprinpatch
the ids favs use are accurate down to a microsecond, there is no need for it
2019-12-15OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: ↵Ivan Tashkinov
controller tests modification: OAuth scopes usage.
2019-12-14Merge branch 'develop' into issue/1383Maksim Pechnikov
2019-12-14Disable rate limiter for socket/localhost (unless RemoteIp is enabled)Maxim Filippov
2019-12-12[#1427] Graceful clearance of OAuth admin scopes for non-admin users (no ↵Ivan Tashkinov
error raised). PleromaFE and other clients may safely request admin scope(s): if user isn't an admin, request is successful but only non-admin scopes from request are granted.
2019-12-12Merge branch 'develop' into feature/report-notesMaxim Filippov
2019-12-11Merge branch 'develop' into issue/1411Mark Felder
2019-12-10Merge branch 'develop' into 'domain-block-precedence'Sadposter
# Conflicts: # lib/pleroma/user.ex
2019-12-10make analysis happySadposter