Commit Graph

5782 Commits

Author SHA1 Message Date
kaniini 42422f3ff2 Merge branch 'tests/web/mastodon_api/search_controller' into 'develop'
add test for search_controller/ 100% coverage

See merge request pleroma/pleroma!1377
2019-07-10 08:28:03 +00:00
Maksim 008c55e4e9 add test for search_controller/ 100% coverage 2019-07-10 08:28:03 +00:00
rinpatch 9822f3a05e Merge branch 'hotfix/disable-email-changelog-fix' into 'develop'
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-10 08:18:12 +00:00
rinpatch e2782c342f Add a breaking changelog entry for explicitly disabling the mailer and reorder changelog sections in order of importance 2019-07-10 11:09:55 +03:00
kaniini d91231f0be Merge branch 'feature/disable_send_emails' into 'develop'
[#1062] added option to disable send email

See merge request pleroma/pleroma!1389
2019-07-10 05:34:21 +00:00
Maksim 12b1454245 [#1062] added option to disable send email 2019-07-10 05:34:21 +00:00
kaniini b00620b378 Merge branch 'feature/send-delete-user-activity' into 'develop'
Send and handle "Delete" activity for deleted users

Closes #1071 and #1059

See merge request pleroma/pleroma!1384
2019-07-10 05:16:08 +00:00
Sergey Suprunenko 2d2b50ccca Send and handle "Delete" activity for deleted users 2019-07-10 05:16:08 +00:00
kaniini 75be90a6d1 Merge branch 'release/listener' into 'develop'
add listener port and ip option for 'pleroma.instance gen' and enable its test

See merge request pleroma/pleroma!1393
2019-07-10 05:14:08 +00:00
kaniini 8f2cb820c0 Merge branch 'fix/license-attribution' into 'develop'
Add license/copyright to all project files

See merge request pleroma/pleroma!1394
2019-07-10 05:13:23 +00:00
feld 93a0eeab16 Add license/copyright to all project files 2019-07-10 05:13:23 +00:00
kaniini 37b0bd0d86 Merge branch 'tests/mrf_policy' into 'develop'
tests MRF filters

See merge request pleroma/pleroma!1379
2019-07-10 05:12:21 +00:00
Maksim bb8065a1fd tests MRF filters 2019-07-10 05:12:21 +00:00
Sachin Joshi 6d0ae264fc add listener port and ip option for 'pleroma.instance gen' and enable its test 2019-07-10 01:46:49 +05:45
rinpatch 81f1017b84 Merge branch '878-activity-object-decoupling-in-tests' into 'develop'
[#878] Refactored assumptions on embedded object presence in tests

Closes #878

See merge request pleroma/pleroma!1390
2019-07-09 20:00:37 +00:00
Ivan Tashkinov 8a41d34673 [#878] Tests improvements per code review. 2019-07-09 22:37:59 +03:00
Ivan Tashkinov 6fc0c27be3 [#878] Uncommented test statement. 2019-07-09 22:28:04 +03:00
Ivan Tashkinov 829e997223 [#878] Merge remote-tracking branch 'remotes/upstream/develop' into 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-09 21:46:16 +03:00
kaniini 2bb945cb70 Merge branch 'docs/more-mastodon-api' into 'develop'
Docs/more mastodon api

See merge request pleroma/pleroma!1392
2019-07-09 18:20:36 +00:00
feld c91b5c87ff Docs/more mastodon api 2019-07-09 18:20:36 +00:00
kaniini 670a77ecbc Merge branch 'feature/allow-user-query-via-id' into 'develop'
Admin API: Allow querying user by ID

See merge request pleroma/pleroma!1380
2019-07-09 17:53:41 +00:00
kaniini 1417627d07 Merge branch 'remove-avatar-header' into 'develop'
Ability to reset avatar, profile banner and backgroud

See merge request pleroma/pleroma!1187
2019-07-09 17:51:41 +00:00
Mark Felder 9a9b60cfbc Merge branch 'develop' into feature/allow-user-query-via-id 2019-07-09 12:49:04 -05:00
kaniini e19e829758 Merge branch 'fix/1019-correct-count-remote-users' into 'develop'
Fix/1019 correct count remote users

Closes #1019

See merge request pleroma/pleroma!1376
2019-07-09 17:36:35 +00:00
Alexander Strizhakov d6b0fce6e9 Fix/1019 correct count remote users 2019-07-09 17:36:35 +00:00
kaniini 4948117fcf Merge branch 'remove-swift' into 'develop'
Remove Uploaders.Swift and `httpoison` dependency

Closes #1051

See merge request pleroma/pleroma!1374
2019-07-09 16:54:32 +00:00
kaniini b6fd16d0a4 Merge branch 'test-coverage' into 'develop'
reverse proxy tests

See merge request pleroma/pleroma!1385
2019-07-09 16:54:14 +00:00
Alexander Strizhakov 4e6e5d8042 reverse proxy tests 2019-07-09 16:54:13 +00:00
kaniini 1179a13533 Merge branch 'features/sec-websocket-protocol-header' into 'develop'
Features: MastoAPI streaming Sec-WebSocket-Protocol header

See merge request pleroma/pleroma!1381
2019-07-09 16:52:22 +00:00
Haelwenn 1ab4e35f27 Merge branch 'enable-ogp-by-default' into 'develop'
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-09 16:07:20 +00:00
feld 167f810ff1 Merge branch 'proxy-error' into 'develop'
make sure the url used by proxy is same as original url

See merge request pleroma/pleroma!1383
2019-07-09 16:00:44 +00:00
Mark Felder e143747445 Add test for URLs with Unicode characters too 2019-07-09 10:55:36 -05:00
Haelwenn 95c085174d Merge branch 'test-speedup' into 'develop'
Testing: Don't federate in testing.

See merge request pleroma/pleroma!1391
2019-07-09 15:35:28 +00:00
Mark Felder ce3ffad13a Remove duplicated test. New one is more comprehensive. 2019-07-09 10:23:22 -05:00
Mark Felder 31a59d6f23 Merge branch 'develop' into proxy-error 2019-07-09 10:18:30 -05:00
Mark Felder 98f13eac9e Capitalize 2019-07-09 10:11:42 -05:00
Mark Felder 4213a4e2aa Test that all ASCII encoded characters are preserved 2019-07-09 09:43:33 -05:00
rinpatch 376a55c97f Merge branch '161-incoming-replies-depth-limit' into 'develop'
[#161] Limited replies depth on incoming federation (memory leaks fix)

Closes #161

See merge request pleroma/pleroma!1361
2019-07-09 14:15:10 +00:00
Ivan Tashkinov dd5a41e2a4 Apply suggestion to docs/config.md 2019-07-09 10:39:36 +00:00
lain 8574ebfc12 Merge branch 'fix/966-local-user-search' into 'develop'
change for local user search

Closes #966

See merge request pleroma/pleroma!1287
2019-07-09 08:52:49 +00:00
Alexander Strizhakov 23d4781e73 change for local user search 2019-07-09 08:52:49 +00:00
lain abe2e8881f Testing: Don't federate in testing. 2019-07-09 15:30:51 +09:00
Haelwenn 3a406db430 Merge branch 'fix/relationships-in-statuses' into 'develop'
Mastodon API: Fix embedded relationships not being rendered inside of statuses

See merge request pleroma/pleroma!1387
2019-07-08 20:40:59 +00:00
Ivan Tashkinov 46cf81a544 [#878] Formatting fix. 2019-07-08 20:05:02 +03:00
Ivan Tashkinov daff85a985 [#878] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity. 2019-07-08 19:53:02 +03:00
rinpatch f3cc2acb0f Add a changelog entry for changing the defaults 2019-07-08 14:13:30 +03:00
rinpatch 44b2e1fdad Formatting 2019-07-08 14:05:57 +03:00
rinpatch f5b91bc157 Improve wording in CHANGELOG.md 2019-07-08 13:05:46 +03:00
rinpatch 682f1897b7 Enable OpenGraph and TwitterCard by default
Closes #1034
2019-07-08 13:00:45 +03:00
rinpatch 9e58d3c624 FallbackRedirector: Do not crash on Metadata rendering errors 2019-07-08 12:59:49 +03:00