Commit graph

3272 commits

Author SHA1 Message Date
Haelwenn (lanodan) Monnier
863ec33ba2
Add support for funkwhale Audio activity
reel2bits fixture not included as it lacks the Actor fixture for it.

Closes: https://git.pleroma.social/pleroma/pleroma/issues/1624
Closes: https://git.pleroma.social/pleroma/pleroma/issues/764
2020-03-11 13:46:42 +01:00
Ivan Tashkinov
5b696a8ac1 [#1560] Enforced authentication for non-federating instances in StaticFEController. 2020-03-11 14:05:56 +03:00
Ivan Tashkinov
972889550d Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions 2020-03-11 09:15:55 +03:00
Mark Felder
5af798f246 Fix enforcement of character limits 2020-03-10 13:08:00 -05:00
Alexander Strizhakov
f39e1b9eff
add verify tls_opts only when we open connection
for other requests tesla will add tls_opts
2020-03-10 15:54:11 +03:00
Alexander Strizhakov
426f5ee48a
tesla adapter can't be changed in adminFE 2020-03-10 15:31:44 +03:00
Ivan Tashkinov
5fc92deef3 [#1560] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring. 2020-03-09 20:51:44 +03:00
Maksim Pechnikov
edb659dc57 Merge branch 'develop' into issue/1276 2020-03-08 14:10:59 +03:00
Alexander Strizhakov
b2eb1124d1
Merge branch 'develop' into gun 2020-03-07 12:41:37 +03:00
Alexander Strizhakov
9f884a2639
tests changes 2020-03-07 11:01:37 +03:00
Alexander Strizhakov
14678a7708
using stub instead expect 2020-03-07 10:12:34 +03:00
Alexander Strizhakov
56ff02f2ef
removing GunMock to use Mox 2020-03-06 20:23:58 +03:00
Ivan Tashkinov
027714b519 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions 2020-03-06 11:48:30 +03:00
Ivan Tashkinov
40765875d4 [#1560] Misc. improvements in ActivityPubController federation state restrictions. 2020-03-05 21:19:21 +03:00
Alexander Strizhakov
931111fd55
removing integration tests 2020-03-05 18:57:45 +03:00
Alexander Strizhakov
f0753eed0f
removing try block in tesla request
added mocks for tests which fail with Tesla.Mock.Error
2020-03-05 17:31:06 +03:00
eugenijm
ad22e94f33 Exclude private and direct statuses visible to the admin when using godmode 2020-03-05 15:15:27 +03:00
lain
f1750b4658 Admin API tests: Fix wrong test. 2020-03-05 12:42:02 +01:00
lain
4bce13fa2f MastodonController: Return 404 errors correctly. 2020-03-04 18:09:06 +01:00
Alexander Strizhakov
d6bebd4f9c
moving some logic to tesla adapter
- checking original inside gun adapter
- flushing streams on max_body error
2020-03-04 18:13:24 +03:00
lain
6f7a8c43a2 Merge branch 'fix/no-email-no-fail' into 'develop'
Do not fail when user has no email

See merge request pleroma/pleroma!2249
2020-03-04 12:43:06 +00:00
Alexander Strizhakov
22d52f5691
same copyright date format 2020-03-04 09:41:23 +03:00
Alexander Strizhakov
6b2fb9160c
otp version 2020-03-04 09:23:42 +03:00
Mark Felder
d9c5ae7c09 Update Copyrights for gun related files 2020-03-03 17:16:24 -06:00
Mark Felder
4427161ca3 Merge branch 'develop' into gun 2020-03-03 17:15:49 -06:00
Mark Felder
5592db4757 Older copyright updates 2020-03-03 16:46:45 -06:00
Mark Felder
05da5f5cca Update Copyrights 2020-03-03 16:44:49 -06:00
Ivan Tashkinov
b6fc98d9cd [#1560] ActivityPubController federation state restrictions adjustments. Adjusted tests. 2020-03-03 22:22:02 +03:00
Alexander Strizhakov
884d9710b2
refactoring for gun api modules 2020-03-03 19:24:14 +03:00
Alexander Strizhakov
23f407bf09
don't test gun itself 2020-03-03 18:57:16 +03:00
Alexander Strizhakov
f98ee730f0
adapter renaming to adapter_helper 2020-03-03 18:53:44 +03:00
Alexander Strizhakov
3723d72365
proxy parse tests fix 2020-03-03 17:32:59 +03:00
Alexander Strizhakov
7c0ed9302c
unnecessary mock 2020-03-03 16:46:20 +03:00
Alexander Strizhakov
e605e79df9
simplification of formatting host method
case for format_proxy method
2020-03-03 16:42:03 +03:00
Alexander Strizhakov
ee8071f0d5
removing unused method 2020-03-03 15:12:09 +03:00
Alexander Strizhakov
28ed4b41d0
naming for checkin from pool timeout 2020-03-03 13:05:28 +03:00
Alexander Strizhakov
4c8569d403
otp_version refactor 2020-03-03 12:21:10 +03:00
Alexander Strizhakov
509c81e4b1
Merge branch 'develop' into gun 2020-03-03 10:08:07 +03:00
Ivan Tashkinov
bd8624d649 [#1560] Added tests for non-federating instance bahaviour to OStatusControllerTest. 2020-03-02 22:02:21 +03:00
Ivan Tashkinov
b4367125e9 [#1560] Added tests for non-federating instance bahaviour to ActivityPubControllerTest. 2020-03-02 21:43:18 +03:00
Ivan Tashkinov
99a6c660a9 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions 2020-03-02 18:41:12 +03:00
Egor Kislitsyn
4a45b96a91
Merge branch 'develop' into fix/signup-without-email 2020-03-02 15:35:49 +04:00
Haelwenn
764a50f8a6 Merge branch 'feature/1482-activity_pub_transactions' into 'develop'
ActivityPub actions & side-effects in transaction

Closes #1482

See merge request pleroma/pleroma!2089
2020-03-02 07:58:01 +00:00
Alexander Strizhakov
137c600cae
stop connections manually 2020-03-02 10:01:07 +03:00
Alexander Strizhakov
cc98d010ed
relay list shows hosts without accepted follow 2020-03-02 09:27:20 +03:00
Haelwenn (lanodan) Monnier
6da6540036
Bump copyright years of files changed after 2020-01-07
Done via the following command:
git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
2020-03-02 06:08:45 +01:00
Haelwenn (lanodan) Monnier
6c0d869d9d
Bump copyright years of files changed after 2019-01-01
Done via the following command:
git diff 1e6c102b --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
2020-03-02 05:54:56 +01:00
Alexander Strizhakov
d9e4b77f8b
Merge branch 'develop' into gun 2020-03-01 12:48:49 +03:00
Alexander Strizhakov
32d1e04817
ActivityPub actions & side-effects in transaction 2020-03-01 12:01:39 +03:00
rinpatch
4d416343fa rate limiter: Fix a race condition
When multiple requests are processed by rate limiter plug at the same
time and the bucket is not yet initialized, both would try to initialize
the bucket resulting in an internal server error.
2020-03-01 01:13:07 +03:00
rinpatch
19e559fe51 Merge branch 'rate-limiter-runtime-settings' into 'develop'
RateLimiter improvements: runtime configurability, no default limits in tests

See merge request pleroma/pleroma!2250
2020-02-29 21:52:33 +00:00
Ivan Tashkinov
c747260989 [#2250] Tiny refactoring per merge request review. 2020-02-29 22:04:09 +03:00
Alexander Strizhakov
814b275af7
Merge branch 'develop' into gun 2020-02-29 11:34:50 +03:00
f2216287a7 Merge branch 'admin-status-list' into 'develop'
Admin API: `/api/pleroma/admin/statuses` (accepts `godmode` and `local_only`)

Closes #1550

See merge request pleroma/pleroma!2192
2020-02-27 18:11:04 +00:00
Ivan Tashkinov
6f2efb1c45 Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests. 2020-02-27 18:46:05 +03:00
Egor Kislitsyn
cb60a9c42f
Do not fail when user has no email 2020-02-27 17:27:49 +04:00
eugenijm
4ab07cf0d5 Admin API: Exclude boosts from GET /api/pleroma/admin/users/:nickname/statuses and GET /api/pleroma/admin/instance/:instance/statuses 2020-02-26 22:35:57 +03:00
eugenijm
e2a6a40367 Admin API: GET /api/pleroma/admin/statuses - list all statuses (accepts godmode and local_only) 2020-02-26 20:21:38 +03:00
Egor Kislitsyn
f446744a6a
Allow account registration without an email 2020-02-26 20:13:53 +04:00
97dae77240 Merge branch 'token-web-push-test' into 'develop'
Add a test to ensure OAuth tokens are tied to Push subscriptions

Closes #1551

See merge request pleroma/pleroma!2241
2020-02-25 16:06:06 +00:00
Egor Kislitsyn
c495e6d387
Add a test to ensure OAuth tokens are tied to Push subscriptions 2020-02-25 18:04:28 +04:00
Alexander Strizhakov
3eccdd15aa
compile fix 2020-02-25 15:19:52 +03:00
Maksim Pechnikov
10f452ad1f Merge branch 'develop' into issue/1276 2020-02-25 07:22:56 +03:00
rinpatch
035c2c1415 Merge branch 'fix/instance-gen-custom-static' into 'develop'
instance.gen task: fix crash when using custom static directory

Closes #1082

See merge request pleroma/pleroma!2237
2020-02-24 20:52:10 +00:00
rinpatch
5e4fe0e8f7 instance.gen task: fix crash when using custom static directory
Closes #1082
2020-02-24 23:42:24 +03:00
eugenijm
7ad5c51f23 Admin API: GET /api/pleroma/admin/stats to get status count by visibility scope 2020-02-24 21:46:37 +03:00
Alexander Strizhakov
8efae966b1
open conn in separate task 2020-02-24 19:56:27 +03:00
lain
81f29e7c6a Merge branch 'bugfix/captcha-nil-answer_data' into 'develop'
Bugfix: return invalid when answer_data is nil

Closes #1585

See merge request pleroma/pleroma!2236
2020-02-24 14:54:22 +00:00
Haelwenn (lanodan) Monnier
f9fe6a9e30
Captcha: return invalid when answer_data is nil 2020-02-24 02:49:53 +01:00
Haelwenn (lanodan) Monnier
ee57663d34
captcha_test.exs: Use the same testing logic in Kocaptcha and native 2020-02-24 01:27:16 +01:00
Ivan Tashkinov
0cf1d4fcd0 [#1560] Restricted AP- & OStatus-related routes for non-federating instances. 2020-02-22 19:48:41 +03:00
Ivan Tashkinov
8f0ca19b9c Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
# Conflicts:
#	CHANGELOG.md
#	config/config.exs
2020-02-22 09:31:43 +03:00
Alexander Strizhakov
ad8f26c0a4
more info in Connections.checkin timout errors 2020-02-21 12:53:40 +03:00
Alexander Strizhakov
13918cb545
Merge branch 'develop' into gun 2020-02-21 10:02:37 +03:00
Haelwenn
c5570e0493 Merge branch 'single_emoji_reaction' into 'develop'
Single emoji reaction

Closes #1578

See merge request pleroma/pleroma!2226
2020-02-20 23:50:40 +00:00
lain
3eddd9caa6 Merge branch 'require-signature' into 'develop'
Add an option to require fetches to be signed

Closes #1444

See merge request pleroma/pleroma!2071
2020-02-20 12:13:21 +00:00
lain
c69b04c490 Merge branch 'features/remote-follow-userpage-redirect' into 'develop'
remote_follow_controller.ex: Redirect to the user page on success

Closes #1245

See merge request pleroma/pleroma!2123
2020-02-20 12:04:29 +00:00
Ivan Tashkinov
0c65a8c3d0 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
# Conflicts:
#	config/config.exs
2020-02-20 15:00:48 +03:00
lain
e0b2de6385 Merge branch 'feature/new-registrations-digest' into 'develop'
New users digest email

Closes #1514

See merge request pleroma/pleroma!2128
2020-02-20 11:58:37 +00:00
lain
cf4ecffcea Merge branch 'tests-clear-config-tweaks' into 'develop'
Tweaks to `clear_config` calls in tests

See merge request pleroma/pleroma!2209
2020-02-20 11:36:48 +00:00
lain
314928333a Pleroma API: Add endpoint to get reaction information on a single emoji 2020-02-19 17:16:45 +01:00
Alexander Strizhakov
c9db0507f8
removing retry option and changing some logger messages levels 2020-02-19 12:26:57 +03:00
Mark Felder
138a3c1fe4 Spelling was wrong in test as well 2020-02-18 09:30:18 -06:00
Mark Felder
cf94349287 Merge branch 'develop' into gun 2020-02-18 09:06:27 -06:00
lain
cf8307e71c Merge branch 'fix/status-view/expires_at' into 'develop'
Fix `status.expires_at` type

Closes #1573

See merge request pleroma/pleroma!2222
2020-02-18 14:56:59 +00:00
Ivan Tashkinov
226f4d5ef9 Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks
# Conflicts:
#	test/web/admin_api/admin_api_controller_test.exs
2020-02-18 17:52:31 +03:00
Ivan Tashkinov
61d9f43e46 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation 2020-02-18 17:46:09 +03:00
lain
c07efd5b42 Merge branch 'need-reboot-flag' into 'develop'
need_reboot flag for adminFE

See merge request pleroma/pleroma!2188
2020-02-18 14:32:03 +00:00
Egor Kislitsyn
ca7ac068f0
Add a test 2020-02-18 17:09:50 +04:00
Alexander Strizhakov
514c899275
adding gun adapter 2020-02-18 08:19:01 +03:00
Maksim Pechnikov
28701c08ad Merge branch 'develop' into issue/1276 2020-02-17 08:56:03 +03:00
rinpatch
472132215e Use floki's new APIs for parsing fragments 2020-02-16 01:55:26 +03:00
Ivan Tashkinov
269d592181 [#1505] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction). 2020-02-15 20:41:38 +03:00
Haelwenn (lanodan) Monnier
1257331291
MastodonAPI.StatusView: Do not use site_name
site_name allow to spoof the origin of the domain and so hacks like:

<!-- served on https://hacktivis.me/tmp/joinmastodon.org.html -->
<meta property="og:image" content="https://hacktivis.me/datalove/img/meme/pleroma/mastodon%2C%20forbidden%20amuse%20yourself.jpeg" />
<meta property="og:title" content="Mastodon: Forbidden Amuse Yourself" />
<meta property="og:site_name" content="joinmastodon.org" />
<meta http-equiv="refresh" content="0; url=http://joinmastodon.org/">
2020-02-15 00:36:09 +01:00
Ivan Tashkinov
4f8c3462a8 Tweaks to clear_config calls in tests in order to prevent side effects on config during test suite execution. 2020-02-13 21:55:47 +03:00
Maksim Pechnikov
6f9839c73c Merge branch 'develop' into issue/1276 2020-02-13 20:43:34 +03:00
b312c36b8e Merge branch 'develop' into 'fix/rename-no_attachment_links-setting'
# Conflicts:
#   config/description.exs
2020-02-13 14:37:55 +00:00
Maksim Pechnikov
da44ee5b0f Merge branch 'develop' into issue/1276 2020-02-13 09:20:34 +03:00
Egor Kislitsyn
19516af74e
Fix status.expires_in validation 2020-02-12 20:20:44 +04:00
Mark Felder
ff9fd4ca89 Fix the confusingly named and inverted logic of "no_attachment_links"
The setting is now simply "attachment_links" and the boolean value does
what you expect. A double negative is never possible and describing the
functionality is no longer a philospher's worst nightmare.
2020-02-11 15:39:19 -06:00
Egor Kislitsyn
58b2017aa0
Restore TwitterAPI tests 2020-02-12 00:51:05 +04:00
Egor Kislitsyn
50d9fcbe29
Hotlink logo instead of attachment 2020-02-11 23:33:05 +04:00
237b2068f9 Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
This reverts merge request !2194
2020-02-11 16:55:18 +00:00
rinpatch
ea1631d7e6 Make Floki use fast_html 2020-02-11 16:17:21 +03:00
lain
24c526a0b1 Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge 2020-02-11 13:58:36 +01:00
Egor Kislitsyn
6875ccb6bf
Merge branch 'develop' into feature/new-registrations-digest 2020-02-11 13:54:55 +04:00
Maksim Pechnikov
58574ef156 Merge branch 'develop' into issue/1276 2020-02-11 08:35:26 +03:00
Maksim Pechnikov
6813c0302c Merge branch 'develop' into issue/1383 2020-02-10 20:49:20 +03:00
Ivan Tashkinov
b95dd5e217 [#1505] Improved replies-handling tests: updated Mastodon message fixture, used exact Pleroma federation message. 2020-02-10 11:46:16 +03:00
Maksim Pechnikov
cd040691bd maked unread_count as virtual field 2020-02-10 09:01:45 +03:00
Maksim Pechnikov
b87533760b Merge branch 'develop' into issue/1276 2020-02-10 07:59:52 +03:00
Ivan Tashkinov
24e49d14f2 [#1505] Removed wrapping of reply URIs into first element, added comments to transmogrifier tests. 2020-02-09 17:34:48 +03:00
Ivan Tashkinov
7c3991f59e [#1505] Fixed replies serialization (included objects' ids instead of activities' ids). 2020-02-09 10:17:21 +03:00
Ivan Tashkinov
4e6bbdc7b5 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation 2020-02-08 19:59:37 +03:00
Ivan Tashkinov
d458f4fdca [#1505] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation. 2020-02-08 19:58:02 +03:00
Alexander Strizhakov
dad23e3766
need_reboot flag 2020-02-08 13:00:02 +03:00
Haelwenn
1262357ddb Merge branch 'cancel-follow-request' into 'develop'
Add support for cancellation of a follow request

Closes #1522

See merge request pleroma/pleroma!2175
2020-02-07 16:10:43 +00:00
Lain Soykaf
d85bcc8627 Questions: Add timezone to closed property 2020-02-07 16:57:46 +01:00
Lain Soykaf
4538a1ee01 EmojiReactions: Remove old API endpoints 2020-02-07 15:01:45 +01:00
Lain Soykaf
f875b9650a EmojiReactions: Add Mastodon-aligned reaction endpoints, change response 2020-02-07 14:52:13 +01:00
Egor Kislitsyn
bc2e98b200
Add User.get_follow_state/2 2020-02-07 16:17:34 +04:00
Lain Soykaf
8a79f20c21 EmojiReactions: Rename to EmojiReacts 2020-02-06 18:09:57 +01:00
df0b00b32d Merge branch 'mastoapi-non-html-strings' into 'develop'
mastodon API: do not sanitize html in non-html fields

See merge request pleroma/pleroma!2167
2020-02-06 16:08:23 +00:00
Egor Kislitsyn
8b9742ecf5 Cancellation of a follow request for a remote user 2020-02-06 18:02:33 +04:00
Alexander Strizhakov
c85aa6e87f
removing confusing error 2020-02-06 12:50:36 +03:00
rinpatch
15cb1f6804 Merge branch 'fix/unpinnable-polls' into 'develop'
fix not being able to pin polls

See merge request pleroma/pleroma!2172
2020-02-05 21:04:16 +00:00
Alexander Strizhakov
5db6ac8ee4
removing migrate_from_db endpoint from admin api 2020-02-05 20:36:21 +03:00
rinpatch
49e80a1537 Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'
Restarting pleroma from outside application

See merge request pleroma/pleroma!2144
2020-02-05 16:59:21 +00:00
Egor Kislitsyn
8c71f7e11a Add support for cancellation of a follow request 2020-02-05 20:22:15 +04:00
Ivan Tashkinov
e84fee5b86 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation 2020-02-05 07:56:36 +03:00
Maksim Pechnikov
2c40c8b4a2 Merge branch 'develop' into issue/1383 2020-02-03 21:42:36 +03:00
rinpatch
50f5a92021 fix not being able to pin polls 2020-02-02 14:55:06 +03:00
rinpatch
983a87175e mastodon API: do not sanitize html in non-html fields 2020-02-02 14:46:32 +03:00
Roman Chvanikov
8057157ee3 Make attachments cleanup optional 2020-01-31 01:20:37 +03:00
rinpatch
c27d1d65bf Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop'
Disable rate limiter for socket/localhost

Closes #1380

See merge request pleroma/pleroma!2064
2020-01-30 19:24:04 +00:00
rinpatch
5b62acf6e9 Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost 2020-01-30 22:16:55 +03:00
lain
01fb4dbeae Emoji Reactions: Add fixtures 2020-01-30 16:26:45 +01:00
lain
a0d9d42eaa Emoji Reactions: Actually use the validation. 2020-01-30 16:07:37 +01:00
e2f2602fdc Merge branch 'emoji-api-errors' into 'develop'
Emoji api error if emoji dir is not writable

Closes admin-fe#62

See merge request pleroma/pleroma!2161
2020-01-30 14:13:40 +00:00
rinpatch
263abe3ba5 Merge branch 'emoji-reactions-reacted' into 'develop'
Emoji reactions: Add `reacted` field

See merge request pleroma/pleroma!2160
2020-01-30 13:16:04 +00:00
Haelwenn
946de2299c Merge branch 'fix-streaming-reblog' into 'develop'
Streamer: Correctly handle reblog mutes

Closes #1129 and #1438

See merge request pleroma/pleroma!2156
2020-01-29 20:21:32 +00:00
Alexander Strizhakov
e7fee0d6fa
emoji api error on not writable dir 2020-01-29 15:31:34 +03:00
lain
7a60cd91ff Merge branch 'fix-streaming-reblog' of git.pleroma.social:pleroma/pleroma into fix-streaming-reblog 2020-01-29 11:52:24 +01:00
lain
e2e9299b8e Streamer Tests: code readability improvements 2020-01-29 11:50:49 +01:00
lain
b3a877d6c9 Emoji Reactions: Correctly handle deleted users 2020-01-29 11:43:36 +01:00
lain
a802e07241 Emoji Reactions: Add reacted field to emoji reactions 2020-01-29 11:39:06 +01:00
Alexander Strizhakov
1f4fbe9d98
title parse improvement 2020-01-29 11:13:34 +03:00
Maksim Pechnikov
ba5e8a6444 Merge branch 'develop' into issue/1276 2020-01-28 21:11:13 +03:00
Maksim Pechnikov
21a2a05407 Merge branch 'develop' into issue/1383 2020-01-28 20:39:20 +03:00
lain
cedee2793d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/remote-follow-userpage-redirect 2020-01-28 17:52:42 +01:00
lain
e8f22451da Merge branch 'linkify-test-expansion' into 'develop'
Formatter: Add a test for domain / username clashes

See merge request pleroma/pleroma!2151
2020-01-28 16:51:29 +00:00
lain
12b6fcdb8c Merge branch 'features/task-test-email' into 'develop'
Create pleroma.email mix task

Closes #1061

See merge request pleroma/pleroma!2118
2020-01-28 16:42:57 +00:00
lain
2c121b2623 Merge branch 'fix/1524-link_preview' into 'develop'
Meta tags parser respects first title tag

Closes #1524

See merge request pleroma/pleroma!2157
2020-01-28 16:38:14 +00:00
Alexander Strizhakov
7bd4c14581
meta tag parser respect first title header 2020-01-28 19:29:27 +03:00
lain
d385789a45 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed 2020-01-28 17:06:36 +01:00
Haelwenn (lanodan) Monnier
4eb935be78
Create pleroma.email mix task
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061
2020-01-28 16:49:38 +01:00
lain
e816edbb2f Update streamer_test.exs 2020-01-28 15:42:05 +00:00
lain
77f24525ca Streamer: Correctly handle reblog mutes 2020-01-28 16:40:44 +01:00
Alexander Strizhakov
33bd8fbffe
filename and test fixes 2020-01-28 18:02:11 +03:00
d9cb8acd3e Merge branch 'fix/attachments-cleanup' into 'develop'
Fix attachments cleanup with custom base_url

See merge request pleroma/pleroma!2154
2020-01-28 14:52:57 +00:00
Egor Kislitsyn
2ddd1bb088
Fix compatibility with Elixir v1.10 2020-01-28 18:23:59 +04:00
Roman Chvanikov
d18a2e4e36 Add test for custom base_url when deleting an attachment 2020-01-28 17:22:24 +03:00
lain
51283bf996 Formatter: Add a test for domain / username clashes 2020-01-28 13:38:21 +01:00
Maksim Pechnikov
be926863a8 fix test 2020-01-27 21:20:33 +03:00
Maksim Pechnikov
bcffa662dc Merge branch 'develop' into feature/tag_feed 2020-01-27 21:13:13 +03:00
dabd535e43 Remove user recommendation by third party engine 2020-01-27 13:21:50 +00:00
Maksim Pechnikov
e442ea5722 Merge branch 'develop' into issue/1276 2020-01-27 15:20:47 +03:00
Maksim Pechnikov
bfc70fdf29 Merge branch 'develop' into issue/1383 2020-01-27 08:48:19 +03:00
Mark Felder
d770cffce0 Merge branch 'develop' into issue/1280 2020-01-26 11:23:05 -06:00
Alexander Strizhakov
ac97d01fb6
right test 2020-01-25 19:21:21 +03:00
Alexander Strizhakov
e93cc561cd
restarting pleroma from outside application 2020-01-25 18:42:04 +03:00
Ivan Tashkinov
86e4d23acb [#1505] Background fetching of incoming activities' replies collections. 2020-01-25 10:47:30 +03:00
Maksim Pechnikov
99c0a11c58 added atom feed 2020-01-24 22:12:23 +03:00
Maksim Pechnikov
055edd3d72 Merge branch 'develop' into feature/tag_feed 2020-01-24 21:46:57 +03:00
rinpatch
8533b63d1f Merge branch 'fix/1532-fix-for-migration-fe-setting' into 'develop'
Fix for non existing atom

Closes #1532

See merge request pleroma/pleroma!2139
2020-01-24 11:33:02 +00:00
rinpatch
0fceeb44b3 Merge branch 'emoji-reaction-sanity-check' into 'develop'
Emoji reactions: Add sanity checks for the cache

See merge request pleroma/pleroma!2132
2020-01-24 11:32:25 +00:00
lain
347f3ed2c6 Emoji reactions: Change api format once more 2020-01-24 10:52:24 +01:00
Alexander Strizhakov
6a0f0ac4a2
fix for non existing atom 2020-01-24 12:22:26 +03:00
Maksim Pechnikov
293281fcbd Merge branch 'develop' into feature/tag_feed 2020-01-24 08:58:07 +03:00
a182d400d7 Merge branch 'fix_for_migrate_to_db_test' into 'develop'
Fix for migrate to db test

See merge request pleroma/pleroma!2133
2020-01-24 00:25:38 +00:00
Alexander Strizhakov
6cd2e851d9
parsing Swoosh modules 2020-01-23 18:21:29 +03:00
Alexander Strizhakov
4344c5d5b9
truncate config table on migrate to db task 2020-01-23 17:23:02 +03:00
Alexander Strizhakov
2bad25cf14
fix for migrate to db test 2020-01-23 15:13:27 +03:00
lain
34fc0ca053 Emoji reactions: Add sanity checks for the cache 2020-01-23 12:34:34 +01:00
Maksim Pechnikov
2cfe1b9385 Merge branch 'develop' into feature/tag_feed 2020-01-23 11:42:10 +03:00
Maksim Pechnikov
5fc2fa8908 Merge branch 'develop' into issue/1383 2020-01-23 11:11:18 +03:00
Maksim Pechnikov
ce7c887a27 removed try/rescue 2020-01-23 11:05:08 +03:00
Haelwenn
dddebee047 Merge branch 'emoji-notifications' into 'develop'
Emoji notifications

See merge request pleroma/pleroma!2130
2020-01-23 02:12:03 +00:00
Mark Felder
e151dea276 Merge branch 'develop' into feature/new-registrations-digest 2020-01-22 15:59:24 -06:00
Mark Felder
ae78059ff4 Merge branch 'develop' into features/remote-follow-userpage-redirect 2020-01-22 15:05:39 -06:00
lain
615b72238e Notifications: Add emoji reaction notifications 2020-01-22 20:06:12 +01:00
Ivan Tashkinov
cf96c40057 [#1505] Added Mastodon-compatible replies collection to Note federated representation. 2020-01-22 21:10:17 +03:00
Maksim Pechnikov
cf19bf3c7c Merge branch 'develop' into issue/1383 2020-01-22 20:20:39 +03:00
Egor Kislitsyn
5c842e3b68
Merge branch 'develop' into feature/new-registrations-digest 2020-01-22 21:18:27 +04:00
be27777156 Merge branch 'admin-be' into 'develop'
Config api for admin-fe

Closes #1406

See merge request pleroma/pleroma!1976
2020-01-22 17:13:17 +00:00
Egor Kislitsyn
b6f5b326e7
Fix credo warnings 2020-01-22 20:59:58 +04:00
Egor Kislitsyn
df0b8f1d08
Add new users digest email 2020-01-22 20:31:42 +04:00
rinpatch
34aa0c542b Merge branch 'emoji-reaction-extensions-2' into 'develop'
Emoji Reactions: In the API, sort them by first emoji insertion date

See merge request pleroma/pleroma!2126
2020-01-22 14:11:01 +00:00
lain
dd3fc50ea4 Emoji reactions: Change cache and reply format 2020-01-22 13:57:42 +01:00
Alexander Strizhakov
d5f8a88a37
support for updating env after settings deletion 2020-01-22 15:14:11 +03:00