Egor Kislitsyn
8b8b8599e9
Fix atom leak in Rich Media Parser
2020-06-12 18:51:42 +03:00
Haelwenn
9396b2f8cf
Merge branch 'features/apc2s-pagination' into 'develop'
...
Fix AP C2S pagination
Closes #866 and #751
See merge request pleroma/pleroma!2491
2020-06-08 00:58:31 +03:00
href
37c2deb3dd
Expand and authorize streams in Streamer directly (backport from !2519 )
2020-05-12 21:14:46 +02:00
rinpatch
7b05933677
Merge branch '1559-follow-request-notifications' into 'develop'
...
[#1559 ] Support for "follow_request" notifications
Closes #1559
See merge request pleroma/pleroma!2354
2020-05-02 18:59:12 +03:00
rinpatch
da4923f2e5
Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'
...
Enforcement of OAuth scopes check for authenticated API endpoints
See merge request pleroma/pleroma!2349
2020-05-01 00:58:40 +03:00
Haelwenn
b0a9a02af3
Merge branch 'feature/funkwhale-audio' into 'develop'
...
Add support for funkwhale Audio activity
Closes #764 and #1624
See merge request pleroma/pleroma!2287
2020-04-02 23:00:23 +03:00
Haelwenn
01a3f145d5
Merge branch 'bugfix/funkwhale-channel' into 'develop'
...
Fix profile url for funkwhale channels, removes one source_data use
Closes #1653
See merge request pleroma/pleroma!2333
2020-04-02 22:55:09 +03:00
rinpatch
e99e2a86af
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-31 13:42:02 +03:00
lain
c4d3ccc7b9
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-31 13:41:47 +03:00
rinpatch
0e92aa0025
Merge branch '1364-notifications-sending-control' into 'develop'
...
[#1364 ] Ability to opt-out of notifications (in all clients)
Closes #1364
See merge request pleroma/pleroma!2301
2020-03-31 13:39:58 +03:00
rinpatch
fcf51a77ba
Merge branch 'features/staticfe-sanitization' into 'develop'
...
static_fe: Sanitize HTML
Closes #1614
See merge request pleroma/pleroma!2299
2020-03-16 00:14:04 +03:00
Haelwenn (lanodan) Monnier
3f54215219
auth_controller.ex: Add admin scope to MastoFE
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1265
2020-03-15 17:00:41 +03:00
e7837bc14e
Merge branch 'fix/signup-without-email' into 'develop'
...
Allow account registration without an email
See merge request pleroma/pleroma!2246
2020-03-15 16:58:51 +03:00
lain
4bce13fa2f
MastodonController: Return 404 errors correctly.
2020-03-04 18:09:06 +01:00
Mark Felder
05da5f5cca
Update Copyrights
2020-03-03 16:44:49 -06:00
Haelwenn (lanodan) Monnier
6da6540036
Bump copyright years of files changed after 2020-01-07
...
Done via the following command:
git diff fcd5dd259a
2020-03-02 06:08:45 +01:00
rinpatch
b5465bf385
timeline controller: add a TODO for replacing copypaste with a macro
2020-03-01 02:03:46 +03:00
rinpatch
ffcebe7e22
timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user
2020-03-01 01:13:08 +03:00
Egor Kislitsyn
2ef70b55f5
Fix status.expires_at type
2020-02-18 14:52:11 +04: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
lain
24c526a0b1
Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge
2020-02-11 13:58:36 +01:00
Maksim Pechnikov
6813c0302c
Merge branch 'develop' into issue/1383
2020-02-10 20:49:20 +03:00
Lain Soykaf
f875b9650a
EmojiReactions: Add Mastodon-aligned reaction endpoints, change response
2020-02-07 14:52:13 +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
Maksim Pechnikov
2c40c8b4a2
Merge branch 'develop' into issue/1383
2020-02-03 21:42:36 +03:00
rinpatch
983a87175e
mastodon API: do not sanitize html in non-html fields
2020-02-02 14:46:32 +03:00
lain
a802e07241
Emoji Reactions: Add reacted field to emoji reactions
2020-01-29 11:39:06 +01:00
Maksim Pechnikov
21a2a05407
Merge branch 'develop' into issue/1383
2020-01-28 20:39:20 +03:00
dabd535e43
Remove user recommendation by third party engine
2020-01-27 13:21:50 +00:00
Maksim Pechnikov
bfc70fdf29
Merge branch 'develop' into issue/1383
2020-01-27 08:48:19 +03:00
Alexander Strizhakov
de4102b247
can be changed in runtime
2020-01-25 10:39:10 +03:00
lain
347f3ed2c6
Emoji reactions: Change api format once more
2020-01-24 10:52:24 +01:00
Maksim Pechnikov
8589632d09
fixed delete ScheduledActivity
2020-01-23 17:18:23 +03:00
Maksim Pechnikov
5fc2fa8908
Merge branch 'develop' into issue/1383
2020-01-23 11:11:18 +03:00
lain
615b72238e
Notifications: Add emoji reaction notifications
2020-01-22 20:06:12 +01:00
Maksim Pechnikov
cf19bf3c7c
Merge branch 'develop' into issue/1383
2020-01-22 20:20:39 +03:00
lain
dd3fc50ea4
Emoji reactions: Change cache and reply format
2020-01-22 13:57:42 +01:00
Maksim Pechnikov
b8d5c09f48
Merge branch 'develop' into issue/1383
2020-01-22 09:30:30 +03:00
rinpatch
04c9ca5d68
Merge branch 'emoji-reaction-extensions' into 'develop'
...
StatusView: Add `emoji_reactions`
See merge request pleroma/pleroma!2120
2020-01-21 13:13:17 +00:00
Maksim Pechnikov
6e88a7e591
exclude blocked user posts from search results
2020-01-21 07:40:13 +03:00
lain
7d8b709d29
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions
2020-01-20 18:10:55 +01:00
lain
4c5b5f14dc
StatusView: Add emoji_reactions
2020-01-20 16:24:20 +01:00
lain
6a716e3fe5
Merge branch 'credo/version-bump-1.1.5' into 'develop'
...
Bump credo to 1.1.5
See merge request pleroma/pleroma!2115
2020-01-20 14:42:43 +00:00
Haelwenn
e8759cb5ba
Merge branch 'hashtag-benchmarks' into 'develop'
...
Hashtag benchmarks
See merge request pleroma/pleroma!2116
2020-01-20 11:26:07 +00:00
Haelwenn (lanodan) Monnier
5c533e10e7
Bump credo to 1.1.5
2020-01-20 12:17:14 +01:00
Egor Kislitsyn
3849053c6a
Merge branch 'develop' into notifications-from-account
2020-01-15 16:49:45 +04:00
lain
2ee6754095
Mix Tasks: Add pleroma.benchmarks.tags
2020-01-14 17:24:26 +01:00
Maksim Pechnikov
54c9db38c8
Merge branch 'develop' into issue/1383
2019-12-21 20:38:59 +03:00
Egor Kislitsyn
34d85f8a54
Return 404 if account to filter notifications from is not found
2019-12-19 20:45:44 +07:00
d2f1c4f658
Add ActivityPub Object Event type support
...
Adds Event support in the same way Video objects are handled, with the
name of the object as message header.
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-12-17 16:16:21 +01:00
