Commit graph

8784 commits

Author SHA1 Message Date
lain 1d75d0ed7a Merge branch 'admin-api-change-password' into 'develop'
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`

See merge request pleroma/pleroma!2149
2020-03-24 17:34:13 +00:00
rinpatch fbf02a3722 Merge branch 'bugfix/profile-bio-newline' into 'develop'
AccountView: fix for other forms of <br> in bio

Closes #1643

See merge request pleroma/pleroma!2322
2020-03-23 19:32:01 +00:00
rinpatch d931a59072 Merge branch 'support-emoji-staticfe' into 'develop'
Add emoji support in statuses in staticfe

Closes #1453

See merge request pleroma/pleroma!2324
2020-03-23 10:43:20 +00:00
Egor Kislitsyn 5a34dca8ed
Add emoji support in statuses in staticfe 2020-03-23 14:03:31 +04:00
Haelwenn (lanodan) Monnier 15be6ba9c2
AccountView: fix for other forms of <br> in bio
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643
2020-03-22 16:41:01 +01:00
rinpatch 7dbf1ffa86 Merge branch 'fix/ecto_ssl_option' into 'develop'
Fix ssl option on Ecto config breaking release

See merge request pleroma/pleroma!2307
2020-03-22 14:32:40 +00:00
Haelwenn 4633793bc1 Merge branch 'relationship-remove-outdated-hack' into 'develop'
Mastodon API Account view: Remove an outdated hack

See merge request pleroma/pleroma!2321
2020-03-22 14:25:11 +00:00
rinpatch 981e015f1b Mastodon API Account view: Remove an outdated hack
The hack with caching the follow relationship was introduced
when we still were storing it inside the follow activity, resulting in
slow queries. Now we store follow state in `FollowRelationship` table,
so this is no longer necessary.
2020-03-22 17:10:37 +03:00
lain d74405fc1a Merge branch 'fix-feed-pagination' into 'develop'
Fix for feed page pagination

Closes #1605

See merge request pleroma/pleroma!2281
2020-03-20 16:57:51 +00:00
lain d23e81903d Merge branch 'clear-config-test-improvements' into 'develop'
Improved in-test config management

See merge request pleroma/pleroma!2312
2020-03-20 16:54:55 +00:00
Ivan Tashkinov 1c05f539aa Improved in-test clear_config/n applicability (setup / setup_all / in-test usage). 2020-03-20 18:33:00 +03:00
Ivan Tashkinov 0e27c274f4 Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements
# Conflicts:
#	test/web/mastodon_api/controllers/account_controller_test.exs
2020-03-20 18:08:23 +03:00
lain 5efa5b0c4a Merge branch 'feature/1206-restrict-unauthenticated' into 'develop'
restrict_unauthenticated setting

Closes #1206

See merge request pleroma/pleroma!2318
2020-03-20 14:40:08 +00: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
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
stwf a8c6933ca0 remove federated testing 2020-03-19 12:27:09 -04:00
Ivan Tashkinov ec3719f539 Improved in-test config management functions. 2020-03-18 20:30:31 +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
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
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
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
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 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
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
rinpatch 85ac909160 Merge branch 'bugfix/pleroma_conversation_api' into 'develop'
pleroma_api_controller.ex: Improve conversations error reporting

See merge request pleroma/pleroma!2264
2020-03-15 12:47:39 +00:00
Haelwenn (lanodan) Monnier 8f7bc07ebc pleroma_api_controller.ex: Improve conversations error reporting
Related: https://git.pleroma.social/pleroma/pleroma/issues/1594
2020-03-15 12:35:23 +01:00
Ivan Tashkinov ecb7809e92 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
# Conflicts:
#	lib/pleroma/plugs/static_fe_plug.ex
2020-03-14 15:37:02 +03:00
rinpatch 14ebf8f1e5 Merge branch 'update/admin-fe-20200312' into 'develop'
Update AdminFE

See merge request pleroma/pleroma!2292
2020-03-14 11:25:17 +00:00
rinpatch d88c8a9614 Merge branch 'fix/cache-control-headers' into 'develop'
Fix Cache Control headers on media

See merge request pleroma/pleroma!2295
2020-03-14 11:19:42 +00:00