summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-07-10Update `gettext` dependencyEgor Kislitsyn
2019-07-10Add SetLocalePlugEgor Kislitsyn
2019-07-10Merge branch 'tests/web/mastodon_api/search_controller' into 'develop'kaniini
add test for search_controller/ 100% coverage See merge request pleroma/pleroma!1377
2019-07-10add test for search_controller/ 100% coverageMaksim
2019-07-10Merge branch 'hotfix/disable-email-changelog-fix' into 'develop'rinpatch
Add a breaking changelog entry for explicitly disabling the mailer and reorder changelog sections in order of importance See merge request pleroma/pleroma!1395
2019-07-10Add a breaking changelog entry for explicitly disabling the mailer and ↵rinpatch
reorder changelog sections in order of importance
2019-07-10Merge branch 'feature/disable_send_emails' into 'develop'kaniini
[#1062] added option to disable send email See merge request pleroma/pleroma!1389
2019-07-10[#1062] added option to disable send emailMaksim
2019-07-10Merge branch 'feature/send-delete-user-activity' into 'develop'kaniini
Send and handle "Delete" activity for deleted users Closes #1071 and #1059 See merge request pleroma/pleroma!1384
2019-07-10Send and handle "Delete" activity for deleted usersSergey Suprunenko
2019-07-10Merge branch 'release/listener' into 'develop'kaniini
add listener port and ip option for 'pleroma.instance gen' and enable its test See merge request pleroma/pleroma!1393
2019-07-10Merge branch 'fix/license-attribution' into 'develop'kaniini
Add license/copyright to all project files See merge request pleroma/pleroma!1394
2019-07-10Add license/copyright to all project filesfeld
2019-07-10Merge branch 'tests/mrf_policy' into 'develop'kaniini
tests MRF filters See merge request pleroma/pleroma!1379
2019-07-10tests MRF filtersMaksim
2019-07-10add listener port and ip option for 'pleroma.instance gen' and enable its testSachin Joshi
2019-07-09Merge branch '878-activity-object-decoupling-in-tests' into 'develop'rinpatch
[#878] Refactored assumptions on embedded object presence in tests Closes #878 See merge request pleroma/pleroma!1390
2019-07-09[#878] Tests improvements per code review.Ivan Tashkinov
2019-07-09[#878] Uncommented test statement.Ivan Tashkinov
2019-07-09[#878] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
878-activity-object-decoupling-in-tests # Conflicts: # lib/pleroma/object.ex # test/web/activity_pub/transmogrifier_test.exs # test/web/ostatus/ostatus_test.exs
2019-07-09Merge developRoman Chvanikov
2019-07-09Merge branch 'docs/more-mastodon-api' into 'develop'kaniini
Docs/more mastodon api See merge request pleroma/pleroma!1392
2019-07-09Docs/more mastodon apifeld
2019-07-09Merge branch 'feature/allow-user-query-via-id' into 'develop'kaniini
Admin API: Allow querying user by ID See merge request pleroma/pleroma!1380
2019-07-09Merge branch 'remove-avatar-header' into 'develop'kaniini
Ability to reset avatar, profile banner and backgroud See merge request pleroma/pleroma!1187
2019-07-09Merge branch 'develop' into feature/allow-user-query-via-idMark Felder
2019-07-09Merge branch 'fix/1019-correct-count-remote-users' into 'develop'kaniini
Fix/1019 correct count remote users Closes #1019 See merge request pleroma/pleroma!1376
2019-07-09Fix/1019 correct count remote usersAlexander Strizhakov
2019-07-09Merge branch 'remove-swift' into 'develop'kaniini
Remove Uploaders.Swift and `httpoison` dependency Closes #1051 See merge request pleroma/pleroma!1374
2019-07-09Merge branch 'test-coverage' into 'develop'kaniini
reverse proxy tests See merge request pleroma/pleroma!1385
2019-07-09reverse proxy testsAlexander Strizhakov
2019-07-09Merge branch 'features/sec-websocket-protocol-header' into 'develop'kaniini
Features: MastoAPI streaming Sec-WebSocket-Protocol header See merge request pleroma/pleroma!1381
2019-07-09Merge branch 'enable-ogp-by-default' into 'develop'Haelwenn
Do not crash if metadata fails to render and enable OGP and TwitterCard by default Closes #1034 See merge request pleroma/pleroma!1388
2019-07-09Merge branch 'proxy-error' into 'develop'feld
make sure the url used by proxy is same as original url See merge request pleroma/pleroma!1383
2019-07-09Add test for URLs with Unicode characters tooMark Felder
2019-07-09Merge branch 'test-speedup' into 'develop'Haelwenn
Testing: Don't federate in testing. See merge request pleroma/pleroma!1391
2019-07-09Remove duplicated test. New one is more comprehensive.Mark Felder
2019-07-09Merge branch 'develop' into proxy-errorMark Felder
2019-07-09CapitalizeMark Felder
2019-07-09Test that all ASCII encoded characters are preservedMark Felder
2019-07-09Merge branch '161-incoming-replies-depth-limit' into 'develop'rinpatch
[#161] Limited replies depth on incoming federation (memory leaks fix) Closes #161 See merge request pleroma/pleroma!1361
2019-07-09Apply suggestion to docs/config.mdIvan Tashkinov
2019-07-09Merge branch 'fix/966-local-user-search' into 'develop'lain
change for local user search Closes #966 See merge request pleroma/pleroma!1287
2019-07-09change for local user searchAlexander Strizhakov
2019-07-09Testing: Don't federate in testing.lain
2019-07-08Merge branch 'fix/relationships-in-statuses' into 'develop'Haelwenn
Mastodon API: Fix embedded relationships not being rendered inside of statuses See merge request pleroma/pleroma!1387
2019-07-08[#878] Formatting fix.Ivan Tashkinov
2019-07-08[#878] Refactored assumptions on embedded object presence in tests. Adjusted ↵Ivan Tashkinov
note factory to not embed object into activity.
2019-07-08Add a changelog entry for changing the defaultsrinpatch
2019-07-08Formattingrinpatch
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-22 10:35:50 +0000