Commit graph

9820 commits

Author SHA1 Message Date
lain 1aa8aa7d7f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2 2020-03-20 14:52:58 +01:00
Alexander Strizhakov fe15f0ba15
restrict_unauthenticated setting 2020-03-20 16:36:20 +03:00
lain d63dca8d99 Merge branch 'feature/1635-notifications-include-types' into 'develop'
include_types parameter in /api/v1/notifications

Closes #1635

See merge request pleroma/pleroma!2311
2020-03-20 13:27:29 +00:00
Alexander Strizhakov 98a60df41f
include_types parameter in /api/v1/notifications 2020-03-20 13:18:12 +03:00
Haelwenn (lanodan) Monnier a8aa917530
Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activity 2020-03-19 19:25:50 +01:00
lain 952cb589f4 Merge branch 'fix-testing' into 'develop'
Fix CI by temporarily removing federated testing

See merge request pleroma/pleroma!2314
2020-03-19 18:10:39 +00:00
Haelwenn (lanodan) Monnier c1fd4f6653
transmogrifier.ex: rework fix_attachment for better IR 2020-03-19 19:10:03 +01:00
lain 9b9d67bbec Fix linting. 2020-03-19 18:16:12 +01:00
lain 3c2c32b460 Merge branch 'remake-remodel' into develop 2020-03-19 18:00:55 +01:00
stwf a8c6933ca0 remove federated testing 2020-03-19 12:27:09 -04:00
Mark Felder 7d275970ab Add emoji reactions to features in nodeinfo 2020-03-19 10:08:11 -05:00
Haelwenn (lanodan) Monnier f9d622d25a
WIP 2020-03-19 15:39:11 +01:00
Ivan Tashkinov ec3719f539 Improved in-test config management functions. 2020-03-18 20:30:31 +03:00
Alexander Strizhakov 51ce0813d3
Merge branch 'gun' of git.pleroma.social:alex.s/pleroma into gun 2020-03-18 14:08:40 +03:00
Alexander Strizhakov f9ecb513fa
Merge branch 'develop' into gun 2020-03-18 14:08:21 +03:00
rinpatch 69341cbcba Merge branch 'feature/1530-removing-with_move' into 'develop'
Feature/1530 removing with move

Closes #1530

See merge request pleroma/pleroma!2306
2020-03-18 10:12:50 +00:00
Haelwenn (lanodan) Monnier d3cf7e19fb
activity_pub_controller_test.exs: test posting with AP C2S uploaded media 2020-03-17 14:00:19 +01:00
Cevado 4705590f76 Fix ssl option on Ecto config breaking release
To use `:ssl` option on Ecto config it's required to include Erlang ssl
application, this prevents releases to start when `:ssl` option is set
to true.
2020-03-16 22:02:01 -03:00
Mark Felder b17d8d305f Enable Gun adapter by default
We need devs to dogfood this before we merge it into the 2.1 release
2020-03-16 15:39:34 -05:00
Ivan Tashkinov 7438833685 [#1364] Improved notification-related tests. 2020-03-16 21:58:10 +03:00
eugenijm 13cce9c0de Admin API: PATCH /api/pleroma/admin/users/:nickname/credentials, GET /api/pleroma/admin/users/:nickname/credentials. 2020-03-16 20:42:37 +03:00
Haelwenn e4380afc18 Merge branch 'docs/mrf_object_age' into 'develop'
Improve documentation of mrf_object_age

See merge request pleroma/pleroma!2305
2020-03-16 17:42:10 +00:00
eugenijm d198e7fa2a Admin API: PATCH /api/pleroma/admin/users/:nickname/change_password 2020-03-16 20:32:07 +03:00
Alexander Strizhakov f3791add99
removing with_move parameter 2020-03-16 20:07:45 +03:00
Mark Felder 8dd01b24d2 Improve documentation of mrf_object_age 2020-03-16 11:44:53 -05:00
Ivan Tashkinov 0e07c5ef57 Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control 2020-03-16 17:58:42 +03:00
rinpatch b80958d4e3 Merge branch 'feat/templates' into 'develop'
gitlab: create templates for bug reports and release MRs

See merge request pleroma/pleroma!2304
2020-03-16 14:32:23 +00:00
rinpatch 7829de6da4 gitlab: create templates for bug reports and release MRs 2020-03-16 17:30:50 +03:00
Alexander Strizhakov bf474ca3c1
fix 2020-03-16 16:23:49 +03:00
Alexander Strizhakov 35471205f8
temp fix for :gun.info MatchError 2020-03-16 15:47:25 +03:00
Alexander Strizhakov 3805e09b9c
Merge branch 'develop' into gun 2020-03-16 14:35:27 +03:00
rinpatch ac5c2b66b9 Merge branch 'fix-warnings-in-tests' into 'develop'
Warnings fix

See merge request pleroma/pleroma!2303
2020-03-16 11:27:10 +00:00
Alexander Strizhakov f0651730bd
Merge branch 'develop' into gun 2020-03-16 14:25:55 +03:00
Alexander Strizhakov dc2ec84c0f
warnings fix 2020-03-16 14:19:36 +03:00
rinpatch c2527b8c63 Merge branch 'removing-deprecated' into 'develop'
Removing from descriptions.exs deprecated settings

See merge request pleroma/pleroma!2302
2020-03-16 11:08:06 +00:00
Alexander Strizhakov ba90a6d3e5
removing from descriptions.exs deprecated settings 2020-03-16 14:01:35 +03:00
Alexander Strizhakov 89e4b3ebbd
fix for content-type header for tag feed 2020-03-16 12:59:18 +03:00
Alexander Strizhakov 91870c8995
adding rss for user feed 2020-03-16 12:45:31 +03:00
Alexander Strizhakov 26e2076659
fix for feed page pagination 2020-03-16 12:33:55 +03:00
rinpatch 34fd1c2c9d Merge branch 'bugfix/earmark_renderer_test' into 'develop'
test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex

See merge request pleroma/pleroma!2300
2020-03-15 20:04:31 +00:00
rinpatch df2608ebf8 Merge branch 'features/staticfe-sanitization' into 'develop'
static_fe: Sanitize HTML

Closes #1614

See merge request pleroma/pleroma!2299
2020-03-15 19:53:52 +00:00
Haelwenn (lanodan) Monnier 8176ca9e40 static_fe: Sanitize HTML in users 2020-03-15 20:44:04 +01:00
Haelwenn (lanodan) Monnier acb016397e mix.lock: [minor] last hash appended 2020-03-15 20:44:04 +01:00
Haelwenn (lanodan) Monnier 0ac6e29654 static_fe: Sanitize HTML in posts
Note: Seems to have different sanitization with TwitterCard generator giving
the following:

<meta content=\"“alert(&#39;xss&#39;)”\" property=\"twitter:description\">
2020-03-15 20:44:04 +01:00
lain fa4ec17c84 Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'
[#1560] Restricted AP- & OStatus-related routes for non-federating instances

Closes #1560

See merge request pleroma/pleroma!2235
2020-03-15 19:15:20 +00:00
Ivan Tashkinov 7c8003c3fc [#1364] Improved control over generation / sending of notifications. Fixed blocking / muting users notifications issue. Added tests. 2020-03-15 21:00:12 +03:00
Haelwenn d84670b9e1 Merge branch 'f' into 'develop'
rip out fetch_initial_posts

Closes #1422 and #1595

See merge request pleroma/pleroma!2297
2020-03-15 16:14:54 +00:00
Haelwenn (lanodan) Monnier dca21cd1d6 test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex
Wasn't in the test suite otherwise
2020-03-15 17:07:08 +01:00
Haelwenn 67a27825b1 Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop'
rate limiter: disable based on if remote ip was found, not on if the plug was enabled

Closes #1620

See merge request pleroma/pleroma!2296
2020-03-15 14:22:10 +00:00
rinpatch e87a32bcd7 rip out fetch_initial_posts
Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.

idea acked by lain and feld on irc

Closes #1595 #1422
2020-03-15 15:59:17 +03:00