kaniini
|
d91231f0be
|
Merge branch 'feature/disable_send_emails' into 'develop'
[#1062] added option to disable send email
See merge request pleroma/pleroma!1389
|
5 years ago |
|
Maksim
|
12b1454245
|
[#1062] added option to disable send email
|
5 years ago |
|
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
|
5 years ago |
|
Sergey Suprunenko
|
2d2b50ccca
|
Send and handle "Delete" activity for deleted users
|
5 years ago |
|
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
|
5 years ago |
|
kaniini
|
8f2cb820c0
|
Merge branch 'fix/license-attribution' into 'develop'
Add license/copyright to all project files
See merge request pleroma/pleroma!1394
|
5 years ago |
|
feld
|
93a0eeab16
|
Add license/copyright to all project files
|
5 years ago |
|
kaniini
|
37b0bd0d86
|
Merge branch 'tests/mrf_policy' into 'develop'
tests MRF filters
See merge request pleroma/pleroma!1379
|
5 years ago |
|
Maksim
|
bb8065a1fd
|
tests MRF filters
|
5 years ago |
|
Sachin Joshi
|
6d0ae264fc
|
add listener port and ip option for 'pleroma.instance gen' and enable its test
|
5 years ago |
|
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
|
5 years ago |
|
Ivan Tashkinov
|
8a41d34673
|
[#878] Tests improvements per code review.
|
5 years ago |
|
Ivan Tashkinov
|
6fc0c27be3
|
[#878] Uncommented test statement.
|
5 years ago |
|
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
|
5 years ago |
|
kaniini
|
2bb945cb70
|
Merge branch 'docs/more-mastodon-api' into 'develop'
Docs/more mastodon api
See merge request pleroma/pleroma!1392
|
5 years ago |
|
feld
|
c91b5c87ff
|
Docs/more mastodon api
|
5 years ago |
|
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
|
5 years ago |
|
kaniini
|
1417627d07
|
Merge branch 'remove-avatar-header' into 'develop'
Ability to reset avatar, profile banner and backgroud
See merge request pleroma/pleroma!1187
|
5 years ago |
|
Mark Felder
|
9a9b60cfbc
|
Merge branch 'develop' into feature/allow-user-query-via-id
|
5 years ago |
|
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
|
5 years ago |
|
Alexander Strizhakov
|
d6b0fce6e9
|
Fix/1019 correct count remote users
|
5 years ago |
|
kaniini
|
4948117fcf
|
Merge branch 'remove-swift' into 'develop'
Remove Uploaders.Swift and `httpoison` dependency
Closes #1051
See merge request pleroma/pleroma!1374
|
5 years ago |
|
kaniini
|
b6fd16d0a4
|
Merge branch 'test-coverage' into 'develop'
reverse proxy tests
See merge request pleroma/pleroma!1385
|
5 years ago |
|
Alexander Strizhakov
|
4e6e5d8042
|
reverse proxy tests
|
5 years ago |
|
kaniini
|
1179a13533
|
Merge branch 'features/sec-websocket-protocol-header' into 'develop'
Features: MastoAPI streaming Sec-WebSocket-Protocol header
See merge request pleroma/pleroma!1381
|
5 years ago |
|
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
|
5 years ago |
|
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
|
5 years ago |
|
Mark Felder
|
e143747445
|
Add test for URLs with Unicode characters too
|
5 years ago |
|
Haelwenn
|
95c085174d
|
Merge branch 'test-speedup' into 'develop'
Testing: Don't federate in testing.
See merge request pleroma/pleroma!1391
|
5 years ago |
|
Mark Felder
|
ce3ffad13a
|
Remove duplicated test. New one is more comprehensive.
|
5 years ago |
|
Mark Felder
|
31a59d6f23
|
Merge branch 'develop' into proxy-error
|
5 years ago |
|
Mark Felder
|
98f13eac9e
|
Capitalize
|
5 years ago |
|
Mark Felder
|
4213a4e2aa
|
Test that all ASCII encoded characters are preserved
|
5 years ago |
|
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
|
5 years ago |
|
Ivan Tashkinov
|
dd5a41e2a4
|
Apply suggestion to docs/config.md
|
5 years ago |
|
lain
|
8574ebfc12
|
Merge branch 'fix/966-local-user-search' into 'develop'
change for local user search
Closes #966
See merge request pleroma/pleroma!1287
|
5 years ago |
|
Alexander Strizhakov
|
23d4781e73
|
change for local user search
|
5 years ago |
|
lain
|
abe2e8881f
|
Testing: Don't federate in testing.
|
5 years ago |
|
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
|
5 years ago |
|
Ivan Tashkinov
|
46cf81a544
|
[#878] Formatting fix.
|
5 years ago |
|
Ivan Tashkinov
|
daff85a985
|
[#878] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity.
|
5 years ago |
|
rinpatch
|
f3cc2acb0f
|
Add a changelog entry for changing the defaults
|
5 years ago |
|
rinpatch
|
44b2e1fdad
|
Formatting
|
5 years ago |
|
rinpatch
|
f5b91bc157
|
Improve wording in CHANGELOG.md
|
5 years ago |
|
rinpatch
|
682f1897b7
|
Enable OpenGraph and TwitterCard by default
Closes #1034
|
5 years ago |
|
rinpatch
|
9e58d3c624
|
FallbackRedirector: Do not crash on Metadata rendering errors
|
5 years ago |
|
rinpatch
|
7f609ee8f4
|
OGP/TwitterCard: Add fallbacks in case the attachment key is nonexistent
|
5 years ago |
|
rinpatch
|
72b88c82bc
|
Mastodon API: Fix embedded relationships not being rendered inside of statuses
|
5 years ago |
|
Sachin Joshi
|
f5ad430974
|
make sure the url used by proxy is same as origin url
encoding or decoding it breaks some of the signed url
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
b5ba41a725
|
mastodon_websocket_test.exs: Test for Sec-WebSocket-Protocol header
|
5 years ago |
