summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-08-25Merge branch 'gun' of git.pleroma.social:alex.s/pleroma into ↵integration/alex.s/gunAriadne Conill
integration/alex.s/gun
2019-08-25Merge branch 'issue/1177' into 'develop'kaniini
[#1177] fixed unfollow for relay actor See merge request pleroma/pleroma!1589
2019-08-25Merge branch 'feature/moderation-log' into 'develop'kaniini
Log admin/moderator actions See merge request pleroma/pleroma!1582
2019-08-25Log admin/moderator actionsMaxim Filippov
2019-08-25Merge branch 'fix-all-custom-fields-deleted' into 'develop'kaniini
Fix not to use unupdated attachments when all fields are deleted See merge request pleroma/pleroma!1596
2019-08-26Update test for custom profile fieldskPherox
2019-08-25Merge branch 'bugfix/rel_me_missing_mocks' into 'develop'lain
Implement missing mocks for rel=me See merge request pleroma/pleroma!1598
2019-08-25no drop active connectionsAlex S
2019-08-25Merge branch 'bugfix/log_non_implemented_mocks' into 'develop'rinpatch
HttpRequestMock: Log non-implemented mock responses Closes #1088 See merge request pleroma/pleroma!1416
2019-08-25HttpRequestMock: Remove useless `error = error`Haelwenn (lanodan) Monnier
2019-08-25user_test.exs: fix rel=me testsHaelwenn (lanodan) Monnier
2019-08-25Implement missing mocks for rel=meHaelwenn (lanodan) Monnier
2019-08-25HttpRequestMock: Improve non-implemented error messageHaelwenn (lanodan) Monnier
2019-08-25HttpRequestMock: Log mock errors as warningsHaelwenn (lanodan) Monnier
2019-08-25Change to use attachment only when fields do not existkPherox
2019-08-24Merge branch 'admin-create-users' into 'develop'lain
user creation admin api will create multiple users See merge request pleroma/pleroma!1170
2019-08-24Merge branch 'activity-expiration' into 'develop'kaniini
Activity expiration See merge request pleroma/pleroma!1595
2019-08-24Update CHANGELOG.mdlain
2019-08-24Activity expiration: Fix docs.lain
2019-08-24Activity Expiration: Switch to 'expires_in' system.lain
2019-08-24ActivityExpirationWorker: Fix merge issues.lain
2019-08-24calculated crf for closing connectionsAlex S
don't close conn where are waiting pids
2019-08-24update testsMaksim Pechnikov
2019-08-24 put_resp_header("content-type", "application/activity+json") -> ↵Maksim Pechnikov
put_resp_content_type("application/activity+json")
2019-08-24Merge remote-tracking branch 'origin/develop' into ↵lain
sixohsix/pleroma-post_expiration
2019-08-24add testsMaksim Pechnikov
2019-08-23Merge branch 'fix-default-config-account_field' into 'develop'kaniini
Fix default config of account fields length See merge request pleroma/pleroma!1593
2019-08-23Fix default config of account fields lengtharies
2019-08-23some refactoringAlex S
2019-08-23bump tesla versionAlex S
2019-08-23little refactoringAlex S
2019-08-23added tls_opts to connect methodAlex S
2019-08-23basic support for proxiesAlex S
2019-08-23Merge branch 'fix/add-likes-index-objects' into 'develop'kaniini
Add an index on object likes See merge request pleroma/pleroma!1592
2019-08-23Add an index on object likesrinpatch
In !1538 favorites timeline was switched to use the joined object, but no idex on likes in the joined object was added.
2019-08-22fix /inbox for RelayMaksim Pechnikov
2019-08-22fix testMaksim Pechnikov
2019-08-22Merge branch 'develop' into issue/1177Maksim Pechnikov
2019-08-22Merge branch 'support/tests' into 'develop'feld
fixed clear config after test See merge request pleroma/pleroma!1588
2019-08-22Merge branch 'improve-ap-routes-rate-limit' into 'develop'lain
Improve AP routes rate limit See merge request pleroma/pleroma!1590
2019-08-22formattingAlex S
2019-08-22opts to verify certificates by gunAlex S
2019-08-22was used with hackneyAlex S
2019-08-22tesla version bumpAlex S
2019-08-22Improve AP routes rate limitEgor Kislitsyn
2019-08-22fixed unfollow for relay actorMaksim Pechnikov
2019-08-22remove old user create and delete routes for adminSachin Joshi
2019-08-21fixed clear config after testMaksim Pechnikov
2019-08-21Merge branch 'rate-limit-ap-routes' into 'develop'lain
[#1174] Rate limit AP routes See merge request pleroma/pleroma!1586
2019-08-20tests: fix up tesla testAriadne Conill
generated by cgit v1.2.3 (git 2.44.0) at 2024-05-04 11:10:05 +0000