rinpatch
30eaef9d61
healthcheck: report real amount of memory allocated by beam
...
as opposed to memory currently in use
2020-05-08 23:57:47 +03:00
rinpatch
f4d50fbd81
CHANGELOG.md: Add entries from 2.0.3
2020-05-08 23:54:16 +03:00
Maksim Pechnikov
8b97b6f5ba
Merge branch 'develop' into issue/1276-2
2020-05-06 14:47:50 +03:00
lain
df846eda71
Merge branch 'bugfix/sensitive_object' into 'develop'
...
Transmogrifier.set_sensitive/1: Keep sensitive set to true
Closes #954
See merge request pleroma/pleroma!2470
2020-05-06 09:04:13 +00:00
lain
f84c8f2f0d
Merge branch 'feature/1728-webfinger-acct-scheme' into 'develop'
...
Webfinger: Request account info with the acct scheme
Closes #1728
See merge request pleroma/pleroma!2465
2020-05-06 08:46:45 +00:00
Maksim Pechnikov
fb38b7339c
Merge branch 'develop' into issue/1276-2
2020-05-06 05:55:39 +03:00
Alexander Strizhakov
e7d8ab8303
admin_api fetch status by id
2020-05-05 16:18:56 +03:00
Egor Kislitsyn
decaa64f75
Merge branch 'develop' into global-status-expiration
2020-05-05 14:28:54 +04:00
Haelwenn (lanodan) Monnier
bf0e41f0da
Transmogrifier.set_sensitive/1: Keep sensitive set to true
2020-05-04 23:36:00 +02:00
lain
7dd47bee82
Update changelog
2020-05-04 12:22:31 +02:00
Maksim Pechnikov
fe7a0d660e
Merge branch 'develop' into issue/1276-2
2020-05-04 06:08:49 +03:00
rinpatch
3126f8a334
Merge branch 'feature/1710-consolidate-instance-info' into 'develop'
...
Feature/1710 consolidate instance info
Closes #1710
See merge request pleroma/pleroma!2430
2020-05-02 16:44:55 +00:00
rinpatch
e0d392c04c
CHANGELOG.md: Add 2.0.3 changelog
2020-05-02 19:16:27 +03:00
rinpatch
d589f3dcfb
CHANGELOG.md: Add entry for re-registration ban
2020-05-02 19:05:13 +03:00
rinpatch
9a92e5a351
Reword changelog entry for follow relationship bug
2020-05-02 19:05:13 +03:00
eugenijm
66a8e1312d
Mastodon API: do not create a following relationship if the corresponding follow request doesn't exist when calling POST /api/v1/follow_requests/:id/authorize
2020-05-02 19:05:13 +03:00
Ivan Tashkinov
92efb888c7
Made follow request notifications non-optional (removed config switch).
2020-05-01 09:51:41 +03:00
Maksim Pechnikov
a92c713d9c
Merge branch 'develop' into issue/1276-2
2020-05-01 06:21:59 +03:00
Alexander Strizhakov
9855018425
changelog entry
2020-04-30 16:09:22 +03:00
Alexander Strizhakov
f3070ddae5
removing entry from changelog
2020-04-30 15:45:57 +03:00
Alexander Strizhakov
5839e67eb8
return data only for updated emoji
2020-04-30 15:24:02 +03:00
lain
4c4344b7b1
Merge branch '1364-no-pushes-from-blocked-domains-users' into 'develop'
...
[#1364 ] [FIX] Disabled notifications on activities from blocked domains (unless actors are followed)
See merge request pleroma/pleroma!2367
2020-04-30 10:29:46 +00:00
Egor Kislitsyn
764b4f95a8
Merge branch 'develop' into global-status-expiration
2020-04-28 14:13:53 +04:00
lain
5a3a5abc0c
Changelog: Add info about /api/v1/instance changes
2020-04-27 14:35:12 +02:00
Egor Kislitsyn
c56c0a3d23
Merge branch 'develop' into global-status-expiration
2020-04-24 18:37:58 +04:00
lain
e2f3030c86
Apply suggestion to CHANGELOG.md
2020-04-24 15:43:54 +03:00
Alexander
6e625a427c
reply filtering
2020-04-24 15:43:49 +03:00
Ivan Tashkinov
e7fb593d13
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# CHANGELOG.md
2020-04-22 20:00:51 +03:00
Egor Kislitsyn
771c1ad735
Update CHANGELOG
2020-04-22 19:31:03 +04:00
Ivan Tashkinov
bb5d0eafa4
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# CHANGELOG.md
2020-04-21 08:20:50 +03:00
Egor Kislitsyn
364eecc49f
Merge branch 'develop' into global-status-expiration
2020-04-20 20:37:56 +04:00
Alex Gleason
bedc558809
Merge remote-tracking branch 'upstream/develop' into accept-deletes
2020-04-20 10:15:40 -05:00
Alex Gleason
b54c8813d6
Add :reject_deletes option to SimplePolicy
2020-04-20 10:11:06 -05:00
Ilja
8b4de61d64
Fix ObjectAgePolicyTest
...
The policy didn't block old posts as it should.
* I fixed it and tested on a test server
* I added the settings to description so that this information is shown in nodeinfo
* TODO: I didn't work TTD and still need to fix the tests
2020-04-20 12:59:16 +00:00
rinpatch
918a8094fc
Merge branch '1559-follow-request-notifications' into 'develop'
...
[#1559 ] Support for "follow_request" notifications
Closes #1559
See merge request pleroma/pleroma!2354
2020-04-19 21:45:20 +00:00
Ivan Tashkinov
66f55106bd
[ #1682 ] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality.
2020-04-17 21:21:10 +03:00
Ivan Tashkinov
6e6f95c6ae
Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications
...
# Conflicts:
# CHANGELOG.md
2020-04-17 16:23:58 +03:00
Alexander Strizhakov
4d22b100b7
move changelogs entries to unreleased section
2020-04-17 12:33:11 +03:00
Haelwenn
a17bfb5fab
Merge branch 'feature/1584-client-captcha-options' into 'develop'
...
Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252
2020-04-17 09:19:35 +00:00
Alexander Strizhakov
72ef6cc4f2
added need_reboot endpoint to admin api
2020-04-16 16:03:26 +03:00
Maksim Pechnikov
4b3b1fec4e
added an endpoint for getting unread notification count
2020-04-15 21:19:43 +03:00
Ivan Tashkinov
0cda80f266
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# lib/pleroma/notification.ex
2020-04-14 20:10:02 +03:00
lain
4576520461
Revert "Merge branch 'issue/1276' into 'develop'"
...
This reverts merge request !1877
2020-04-14 16:32:22 +00:00
bf3afbc1a1
Merge branch 'logger-configuration' into 'develop'
...
Fix for logger configuration through admin-fe
See merge request pleroma/pleroma!2365
2020-04-14 15:11:25 +00:00
Ivan Tashkinov
650853fc89
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# lib/pleroma/notification.ex
2020-04-14 11:58:38 +03:00
Maksim Pechnikov
a16b3dbcbf
Merge branch 'develop' into issue/1276
2020-04-13 21:19:27 +03:00
Egor Kislitsyn
dc8fa04192
Merge branch 'develop' into global-status-expiration
2020-04-13 14:12:51 +04:00
Ivan Tashkinov
a21baf89d8
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
2020-04-13 09:16:51 +03:00
Ivan Tashkinov
dc2637c188
[ #2342 ] Removed changelog entry for temporary configuration option.
2020-04-13 09:16:35 +03:00
Alexander Strizhakov
de34c4ee6b
changelog entry
2020-04-13 08:59:06 +03:00
Ivan Tashkinov
88b16fdfb7
[ #1364 ] Disabled notifications on activities from blocked domains.
2020-04-11 16:01:09 +03:00
Mark Felder
6ff8812ea3
Add a section for changelog entries that pertain to the next patch release.
...
This will make it easier to keep changelogs synced between develop and stable branches.
2020-04-10 11:37:02 -05:00
Egor Kislitsyn
dd612f86ae
Merge remote-tracking branch 'origin/develop' into global-status-expiration
2020-04-10 20:00:05 +04:00
Egor Kislitsyn
7f692343c8
Merge branch 'develop' into global-status-expiration
2020-04-10 14:20:48 +04:00
Egor Kislitsyn
cf2a0574e7
Merge branch 'develop' into fix/support-conversations-pagination
2020-04-10 14:18:57 +04:00
rinpatch
9abf13abe0
CHANGELOG.md: update 2.0.2 release date
2020-04-09 15:46:12 -05:00
rinpatch
adeb82e496
CHANGELOG.md: add 2.0.2 update notes
2020-04-09 15:45:41 -05:00
rinpatch
0b8f9a66ae
CHANGELOG.md: add entries for funkwhale-related changes
2020-04-09 15:45:35 -05:00
rinpatch
7306d2d069
CHANGELOG.md: Add 2.0.2 entry
2020-04-09 15:45:25 -05:00
rinpatch
2a08f44b02
CHANGELOG.md: Add upgrade notes for 2.0.1
2020-04-09 15:43:54 -05:00
rinpatch
781ac28859
changelog.md: add 2.0.1 entry
2020-04-09 15:42:01 -05:00
Egor Kislitsyn
c826d5195f
Update CHANGELOG
2020-04-09 23:36:17 +04:00
Alexander Strizhakov
73134e248a
no changelog entry - bug fixed only in develop
2020-04-09 08:03:21 +03:00
Alexander Strizhakov
5739c498c0
fix for gun connections pool
2020-04-08 18:46:01 +03:00
rinpatch
a8d98ba3aa
CHANGELOG.md: update 2.0.2 release date
2020-04-08 00:40:08 +03:00
rinpatch
8593867c47
CHANGELOG.md: add 2.0.2 update notes
2020-04-08 00:38:48 +03:00
rinpatch
ae937bcaa1
CHANGELOG.md: add entries for funkwhale-related changes
2020-04-08 00:29:18 +03:00
Ivan Tashkinov
1a4875adfa
[ #1559 ] Support for "follow_request" notifications (configurable).
...
(Not currently supported by PleromaFE, thus disabled by default).
2020-04-07 21:52:32 +03:00
Maksim Pechnikov
2b7d7bbd2d
Merge branch 'develop' into issue/1276
2020-04-07 14:09:43 +03:00
lain
1d4ab06505
Merge branch 'featureflag/emoji_reactions' into 'develop'
...
Add emoji reactions to features in nodeinfo
See merge request pleroma/pleroma!2313
2020-04-06 12:51:35 +00:00
Maksim Pechnikov
dbcfac11b4
Merge branch 'develop' into issue/1276
2020-04-02 14:47:17 +03:00
Ivan Tashkinov
98b96e45ab
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
...
# Conflicts:
# CHANGELOG.md
2020-04-01 20:08:14 +03:00
Ivan Tashkinov
2f2bd7fe72
Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
...
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
2020-04-01 19:49:09 +03:00
Alexander Strizhakov
df5f89c0d6
test for default features and changelog entry
2020-03-31 18:22:25 +03:00
rinpatch
78b6549611
CHANGELOG.md: Add 2.0.2 entry
2020-03-31 13:59:26 +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
Alexander Strizhakov
2afc7a9112
changelog fix
2020-03-30 12:16:45 +03:00
Alexander Strizhakov
f497cf2f7c
Merge branch 'develop' into gun
2020-03-30 12:15:23 +03:00
Maksim Pechnikov
dfd2c74184
Merge branch 'develop' into issue/1276
2020-03-29 06:57:34 +03:00
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
Egor Kislitsyn
4a2538967c
Support pagination in conversations
2020-03-24 20:18:27 +04:00
Alexander Strizhakov
a6ee6784bc
creating trusted app from adminFE & mix task
2020-03-23 10:44:47 +03:00
Egor Kislitsyn
80e1571610
Merge branch 'develop' into global-status-expiration
2020-03-20 22:08:34 +04:00
Alexander Strizhakov
9bae9b1b1b
Merge branch 'develop' into gun
2020-03-20 20:47:54 +03:00
Alexander Strizhakov
fe15f0ba15
restrict_unauthenticated setting
2020-03-20 16:36:20 +03:00
Alexander Strizhakov
98a60df41f
include_types parameter in /api/v1/notifications
2020-03-20 13:18:12 +03:00
Alexander Strizhakov
f9ecb513fa
Merge branch 'develop' into gun
2020-03-18 14:08:21 +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
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
Egor Kislitsyn
421e35b578
Merge branch 'develop' into global-status-expiration
2020-03-16 15:31:31 +04:00
Alexander Strizhakov
f0651730bd
Merge branch 'develop' into gun
2020-03-16 14:25:55 +03:00
rinpatch
8d15d6c3ab
CHANGELOG.md: Add upgrade notes for 2.0.1
2020-03-16 00:50:03 +03:00
rinpatch
be500f8c88
CHANGELOG.md: Add remaining entries for 2.0.1
2020-03-16 00:18:16 +03:00
rinpatch
8096bfb891
changelog.md: add 2.0.1 entry
2020-03-15 17:26:58 +03:00
Haelwenn (lanodan) Monnier
5f9fbd7d33
Formatting: Do not use \n and prefer <br> instead
...
It moves bbcode to bbcode_pleroma as the former is owned by kaniini
and transfering ownership wasn't done in a timely manner.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375
2020-03-15 16:59:52 +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
Haelwenn (lanodan) Monnier
d1379c4de8
Formatting: Do not use \n and prefer <br> instead
...
It moves bbcode to bbcode_pleroma as the former is owned by kaniini
and transfering ownership wasn't done in a timely manner.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375
2020-03-13 16:07:17 +01:00
Alexander Strizhakov
39ed608b13
Merge branch 'develop' into gun
2020-03-12 18:31:10 +03:00
Egor Kislitsyn
d1c7f8e576
Merge remote-tracking branch 'origin/develop' into global-status-expiration
2020-03-12 16:02:24 +04:00
2019f3b3ff
Merge branch 'fix/signup-without-email' into 'develop'
...
Allow account registration without an email
See merge request pleroma/pleroma!2246
2020-03-11 16:53:05 +00:00
Alexander Strizhakov
d9f8941dac
Merge branch 'develop' into gun
2020-03-09 10:56:33 +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
rinpatch
3508ae7039
version bump changelog and mix version
2020-03-05 22:35:23 +03:00
rinpatch
69a85e9c82
changelog: sync with stable
2020-03-05 22:28:37 +03:00
Mark Felder
ec3dc462ff
Document the instance stats fix
2020-03-04 13:41:04 -06:00
Alexander Strizhakov
509c81e4b1
Merge branch 'develop' into gun
2020-03-03 10:08:07 +03:00
Egor Kislitsyn
0f386110c6
Merge remote-tracking branch 'origin/develop' into global-status-expiration
2020-03-03 00:32:34 +04:00
Egor Kislitsyn
4f3313bf80
Merge remote-tracking branch 'origin/develop' into fix/signup-without-email
2020-03-03 00:29:51 +04:00
lain
4c02e04935
Merge branch 'prepared-statements-settings' into 'develop'
...
Prepared statements settings
See merge request pleroma/pleroma!2238
2020-03-02 17:00:04 +00:00
Egor Kislitsyn
4a45b96a91
Merge branch 'develop' into fix/signup-without-email
2020-03-02 15:35:49 +04:00
Alexander Strizhakov
d9e4b77f8b
Merge branch 'develop' into gun
2020-03-01 12:48:49 +03:00
rinpatch
e6ccf12129
changelog: entries for timeline DoS fixes
2020-03-01 01:13:08 +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
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
lain
e4804137b3
Document database default changes
2020-02-25 11:53:51 +01:00
Maksim Pechnikov
10f452ad1f
Merge branch 'develop' into issue/1276
2020-02-25 07:22:56 +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
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
Egor Kislitsyn
011ede4536
Update documentation
2020-02-21 14:42:43 +04: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
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
3af6d3f8e2
Emoji Reactions: Add documentation
2020-02-19 17:17:05 +01:00
Mark Felder
2a219f5e86
Improve changelog message
2020-02-18 09:12:46 -06:00
Ivan Tashkinov
61d9f43e46
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
2020-02-18 17:46:09 +03:00
Alexander Strizhakov
514c899275
adding gun adapter
2020-02-18 08:19:01 +03:00
Egor Kislitsyn
3732b0ba72
Update CHANGELOG
2020-02-14 16:39:02 +04:00
Maksim Pechnikov
6f9839c73c
Merge branch 'develop' into issue/1276
2020-02-13 20:43:34 +03:00
Maksim Pechnikov
da44ee5b0f
Merge branch 'develop' into issue/1276
2020-02-13 09:20:34 +03: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
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
b87533760b
Merge branch 'develop' into issue/1276
2020-02-10 07:59:52 +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
lain
964b4d82a0
Merge branch 'fix/upload-limit-otp' into 'develop'
...
Actually fix upload limit on OTP releases
Closes #1109
See merge request pleroma/pleroma!2185
2020-02-08 14:02:36 +00:00
rinpatch
15ea75cd2a
Actually fix upload limit on OTP releases
...
Closes #1109
2020-02-07 20:14:06 +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
ce95882009
EmojiReactions: Add docs and Changelog
2020-02-07 14:59:26 +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
2cc4fbab96
Update CHANGELOG
2020-02-06 18:03:53 +04:00
Alexander Strizhakov
2a3e06eb70
Apply suggestion to CHANGELOG.md
2020-02-05 18:28:05 +00:00
Alexander Strizhakov
5db6ac8ee4
removing migrate_from_db endpoint from admin api
2020-02-05 20:36:21 +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
774cba84f5
Merge branch 'reenable-rate-limit-and-remote-ip' into 'develop'
...
Re-enable rate limiter and enable remote ip
See merge request pleroma/pleroma!2164
2020-01-30 18:47:44 +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
rinpatch
7499805abf
config.exs: Re-enable rate limiter and enable remote ip
2020-01-30 00:06:58 +03:00
Roman Chvanikov
f5f7a0f9c1
Update confusing changelog message for attachments cleanup
2020-01-29 18:53:25 +03:00
lain
d378550d2d
Emoji Reactions: Document changes
2020-01-29 11:40:57 +01:00
Maksim Pechnikov
ba5e8a6444
Merge branch 'develop' into issue/1276
2020-01-28 21:11:13 +03: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
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
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
055edd3d72
Merge branch 'develop' into feature/tag_feed
2020-01-24 21:46:57 +03:00
Mark Felder
a43b73bba9
Document dynamic_configuration breaking change
2020-01-24 08:04:25 -06:00
lain
9a994878f1
Emoji reactions: Update docs and changelog
2020-01-24 10:53:01 +01:00
Maksim Pechnikov
293281fcbd
Merge branch 'develop' into feature/tag_feed
2020-01-24 08:58:07 +03:00
Alexander Strizhakov
4344c5d5b9
truncate config table on migrate to db task
2020-01-23 17:23:02 +03:00
Maksim Pechnikov
2cfe1b9385
Merge branch 'develop' into feature/tag_feed
2020-01-23 11:42:10 +03:00
lain
002146d297
Update changelog
2020-01-22 20:12:45 +01:00
Egor Kislitsyn
0b843f2567
Update CHANGELOG
2020-01-22 22:29:07 +04:00
lain
043cd5aa54
Emoji reactions: Document changes
2020-01-22 13:58:02 +01:00
Maksim Pechnikov
5ea8596448
Merge branch 'develop' into feature/tag_feed
2020-01-21 20:56:49 +03:00
Maksim Pechnikov
41e2332007
Merge branch 'develop' into feature/tag_feed
2020-01-21 09:23:35 +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
7518f3877f
Update changelog
2020-01-20 16:31:12 +01:00
lain
4c5b5f14dc
StatusView: Add emoji_reactions
2020-01-20 16:24:20 +01:00
rinpatch
dc0498ab2b
Check for unapplied migrations on startup
...
Closes #1328
2020-01-20 12:20:26 +03:00
Maksim Pechnikov
a5db044e57
Merge branch 'develop' into feature/tag_feed
2020-01-15 19:11:13 +03:00
Ivan Tashkinov
5304c8cd21
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
2020-01-15 18:12:08 +03:00
lain
aa9fe3a712
Merge branch 'develop' into 'feature/tag_feed'
...
# Conflicts:
# CHANGELOG.md
2020-01-15 14:29:56 +00:00
Egor Kislitsyn
3849053c6a
Merge branch 'develop' into notifications-from-account
2020-01-15 16:49:45 +04:00
Maksim Pechnikov
c9f45edeac
Merge branch 'develop' into feature/tag_feed
2020-01-14 21:29:14 +03:00
Roman Chvanikov
88f0eed0f2
Delete attachments when status is deleted
2020-01-12 18:48:58 +00:00
8b4d81609d
Merge branch 'updated-at-on-conversation-read' into 'develop'
...
MastodonAPI: Fix mark-as-read bringing the conversation to the top (`POST /api/v1/conversations/:id/read`)
See merge request pleroma/pleroma!2080
2020-01-12 18:37:52 +00:00
0c9c62509d
Remove MDII uploader
2020-01-11 17:19:54 +00:00
Ivan Tashkinov
6c94b7498b
[ #1478 ] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
2020-01-10 10:52:21 +03:00
lain
180f257ced
Update CHANGELOG.md
2020-01-06 14:10:07 +00:00
eugenijm
0b6d1292d2
Fix mark-as-read (POST /api/v1/conversations/:id/read) refreshing updated_at and bringing conversation to the top in the user's direct conversation list
2020-01-05 17:38:51 +03:00
Maksim Pechnikov
b53573a837
add tag feeds
2019-12-18 09:19:37 +03:00
Egor Kislitsyn
6c39fa20b1
Add support for account_id param to filter notifications by the account
2019-12-17 17:00:46 +07:00
Maxim Filippov
45180d4c60
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
2019-12-17 12:36:56 +03:00
Egor Kislitsyn
36d66d9655
Fix typo
2019-12-17 02:06:58 +07:00
minibikini
d81c3afbb2
Apply suggestion to CHANGELOG.md
2019-12-16 18:40:12 +00:00
Egor Kislitsyn
a12b6454bb
Add an option to require fetches to be signed
2019-12-16 22:24:03 +07:00
Maxim Filippov
eb11c60289
Disable rate limiter for socket/localhost (unless RemoteIp is enabled)
2019-12-14 03:06:43 +03:00
Egor Kislitsyn
7528322f83
Merge branch 'develop' into feature/custom-runtime-modules
2019-12-13 01:51:52 +07:00
Egor Kislitsyn
e536796984
Add native captcha and enable it by default.
2019-12-12 17:39:39 +07:00
Maxim Filippov
3ecf131511
Merge branch 'develop' into feature/report-notes
2019-12-12 02:16:23 +03:00
Mark Felder
0867064441
Document the favorites timeline order change
2019-12-11 15:03:54 -06:00
Egor Kislitsyn
1a6e30d32e
Update CHANGELOG
2019-12-11 22:32:53 +07:00
minibikini
43d9c06a2a
Merge branch 'develop' into 'feature/custom-runtime-modules'
...
# Conflicts:
# CHANGELOG.md
2019-12-10 13:38:25 +00:00
lain
1ae976ac51
Merge branch 'develop' into '1427-oauth-admin-scopes'
...
# Conflicts:
# CHANGELOG.md
2019-12-10 13:34:54 +00:00
701815e64c
[ActivityPub] Configurable ActivityPub actor type
2019-12-10 13:19:26 +00:00
Ivan Tashkinov
835ac2157c
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
...
# Conflicts:
# CHANGELOG.md
2019-12-10 08:55:14 +03:00
rinpatch
632dab5d30
Merge branch 'user-timelines-changelog' into 'develop'
...
Changelog: Update with user timeline change info.
See merge request pleroma/pleroma!2049
2019-12-09 17:50:00 +00:00
Egor Kislitsyn
c098dec473
Merge branch 'develop' into feature/custom-runtime-modules
2019-12-10 00:16:43 +07:00
lain
e4ea0e20b3
Merge branch 'issue/1342' into 'develop'
...
[#1342 ] Added privacy option to push notifications
See merge request pleroma/pleroma!1920
2019-12-09 14:30:35 +00:00
lain
a5e28bf214
Merge branch 'develop' into 'fix/oauth-compile-time'
...
# Conflicts:
# CHANGELOG.md
2019-12-09 13:52:01 +00:00
lain
eb7f412b26
Changelog: Update with user timeline change info.
2019-12-09 14:43:57 +01:00
Maksim Pechnikov
dfae1d705f
update changelog
2019-12-08 21:46:20 +03:00
rinpatch
d6c89068f3
HTML: Compile Scrubbers on boot
...
This makes it possible to configure their behavior on OTP releases.
2019-12-08 20:35:41 +03:00
Maksim Pechnikov
6fbafb1cdc
Merge branch 'develop' into issue/1276
2019-12-08 20:14:28 +03:00
rinpatch
bd3aa8500c
OAuth token cleanup: Get rid of compile-time configuration
2019-12-08 20:03:33 +03:00
rinpatch
6cb31edd76
Merge branch 'feature/1455-chat-character-limit' into 'develop'
...
Feature/1455 chat character limit
Closes #1455
See merge request pleroma/pleroma!2034
2019-12-06 15:36:30 +00:00
Ivan Tashkinov
13926537b6
Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
2019-12-06 00:26:31 +03:00
Ivan Tashkinov
af42c00cff
[ #1427 ] Reworked admin scopes support.
...
Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).
2019-12-06 00:25:44 +03:00
rinpatch
cdff5b8267
Merge branch 'develop' into fix/mrf-delete
2019-12-06 00:12:21 +03:00
rinpatch
9f99640cfc
ActivityPub: Fix deletes being exempt from MRF
...
Closes #1461
2019-12-05 21:45:57 +03:00
lain
67d8df04a4
Merge branch '1335-user-api-id-fields-relations' into 'develop'
...
[#1335 ] User: refactoring of AP ID fields into relations
Closes #1335
See merge request pleroma/pleroma!1963
2019-12-05 17:16:23 +00:00
d0bd4348b3
Merge branch 'feature/admin-api-render-whole-status' into 'develop'
...
Miscellaneous grouped reports fixes
Closes admin-fe#48 and admin-fe#51
See merge request pleroma/pleroma!2007
2019-12-05 13:34:34 +00:00
Egor Kislitsyn
48ae3c4347
Add support for custom modules
2019-12-05 20:18:25 +07:00
Maksim Pechnikov
49bb0a130f
Merge branch 'develop' into issue/1276
2019-12-05 12:22:19 +03:00
Ivan Tashkinov
30caf3e51e
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user.ex
2019-12-04 18:56:31 +03:00
lain
21353a8ee9
Changelog: Add information about chat limit.
2019-12-04 12:49:46 +01:00
Maxim Filippov
4b60d41db9
Add report notes
2019-12-04 00:26:37 +09:00
lain
7722e5a67a
Merge branch 'feature/move-activity' into 'develop'
...
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
2019-12-02 16:26:19 +00:00
Ivan Tashkinov
c8d3c3bfec
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
2019-11-26 10:42:36 +03:00
Maxim Filippov
b62be2564c
Merge branch 'develop' into feature/admin-api-render-whole-status
2019-11-26 00:25:43 +09:00
Maxim Filippov
b3b4e5ca80
AdminAPI: Grouped reports old/new fix
...
If some status received reports both in the "new" format and "old" format it was considered reports on two different statuses (in the context of grouped reports)
2019-11-26 00:20:46 +09:00
5f981178d0
Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into 'develop'
...
Admin API: list all statuses from a given instance
See merge request pleroma/pleroma!1981
2019-11-25 13:29:53 +00:00
9374b52756
Merge branch 'fix/update-reports-old-format' into 'develop'
...
Admin API: Fix error when trying to update reports in the "old" format
See merge request pleroma/pleroma!1986
2019-11-25 13:29:22 +00:00
Maxim Filippov
82f4e4760e
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
2019-11-25 01:46:18 +09:00
Maxim Filippov
fd24467b92
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
2019-11-25 01:43:11 +09:00
Maxim Filippov
2b341627da
Admin API: Render whole status in grouped reports
2019-11-25 00:04:29 +09:00
lain
bd62946020
Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'
...
AdminAPI: Confirm user account, resend confirmation email
See merge request pleroma/pleroma!1994
2019-11-22 15:39:19 +00:00
rinpatch
c2ad9fd5f9
Merge branch 'list-users' into 'develop'
...
Add CLI list users command
See merge request pleroma/pleroma!1990
2019-11-21 20:33:11 +00:00
Alex Schroeder
fbc379d689
Add CLI list users command
2019-11-21 21:07:06 +01:00
Ivan Tashkinov
81f1c6bc47
[ #1335 ] Added CHANGELOG.md entry.
2019-11-20 15:57:51 +03:00
rinpatch
dc8830da27
changelog: add 1.1.6 entries from stable
2019-11-20 00:01:58 +03:00
Maxim Filippov
46eb160135
AdminAPI: Confirm user account, resend confirmation email
2019-11-19 20:14:02 +09:00
Egor Kislitsyn
36686f5245
Support authentication via x-admin-token HTTP header
2019-11-19 15:58:20 +07:00
Maxim Filippov
c506cc48ef
Admin API: Error when trying to update reports in the "old" format
2019-11-16 18:44:48 +09:00
rinpatch
da28bf8fdd
Sync the changelogs between develop and stable
2019-11-16 01:02:08 +03:00
lain
075789c442
Apply suggestion to CHANGELOG.md
2019-11-15 12:31:09 +00:00
Ariadne Conill
2469880a2b
add changelog entry for MRF ObjectAgePolicy
2019-11-14 19:49:25 -06:00
Maxim Filippov
114930b5fd
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
2019-11-14 23:45:29 +09:00
Maxim Filippov
30af5da330
Admin API: list all statuses from a given instance
2019-11-14 23:44:07 +09:00
1afeaf82fa
Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'
...
Admin API: Grouped reports, update multiple reports in one query
Closes admin-fe#43
See merge request pleroma/pleroma!1815
2019-11-14 13:35:41 +00:00
Egor Kislitsyn
3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
2019-11-14 16:39:45 +07:00
rinpatch
6085c71bd1
Merge branch 'reactions' into 'develop'
...
Emoji Reactions
See merge request pleroma/pleroma!1662
2019-11-14 08:47:10 +00:00
lain
7a322713c3
Update CHANGELOG.md
2019-11-14 08:21:06 +00:00
Egor Kislitsyn
63c493cd53
Update CHANGELOG
2019-11-12 18:51:12 +07:00
kaniini
2cc043591c
Merge branch 'feature/static-fe' into 'develop'
...
Static frontend
See merge request pleroma/pleroma!1917
2019-11-11 19:10:44 +00:00
rinpatch
827b938502
Add a changelog entry for !1940
2019-11-11 17:05:30 +03:00
Maxim Filippov
46787b9fe1
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
2019-11-11 19:18:12 +09:00
Maxim Filippov
1649d6f689
Add "/api/pleroma/admin/reports/:id" -> "/api/pleroma/admin/reports" changelog entry
2019-11-11 19:16:04 +09:00
Maxim Filippov
31343e4321
Code style fixes
2019-11-11 19:06:09 +09:00
Maxim Filippov
b2e8371e6a
Apply suggestion to CHANGELOG.md
2019-11-11 09:55:00 +00:00
rinpatch
4499a7a075
Disable attachment links by default
...
Closes #1394
2019-11-10 15:02:47 +03:00
lain
a88e834dba
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
2019-11-10 11:32:50 +00:00
Maksim Pechnikov
9d0b989521
add subject to atom feed
2019-11-10 11:10:20 +03:00
Phil Hagelberg
6ef8049664
Add changelog entry, cheatsheet docs, and alphabetize.
2019-11-09 18:09:29 -08:00
lain
b22ee9d966
Merge remote-tracking branch 'origin/develop' into reactions
2019-11-08 13:27:11 +01:00
Maxim Filippov
b14bf9044f
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
2019-11-08 18:30:49 +09:00
eugenijm
7888803ffe
Mastodon API: Add the recipients parameter to GET /api/v1/conversations
2019-11-07 08:26:24 +03:00
Ivan Tashkinov
66c502879b
Removed duplicate Changed entry in Unreleased section of CHANGELOG.md.
2019-11-06 17:19:32 +03:00
Maxim Filippov
2cbfa256fd
Merge branch 'develop' into feature/multiple-users-force-password-reset
2019-11-05 11:36:47 +10:00
Maxim Filippov
43ea16870f
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
2019-11-05 02:12:48 +03:00
Maksim Pechnikov
ff6c727739
Merge branch 'develop' into issue/1276
2019-11-04 20:24:53 +03:00
eugenijm
ed29be24cb
Mastodon API, streaming: Add pleroma.direct_conversation_id to the conversation stream event payload.
2019-11-04 18:36:16 +03:00
Maxim Filippov
10e9ba6340
Apply suggestion to CHANGELOG.md
2019-11-01 17:25:41 +00:00
Maxim Filippov
743b622b7b
Force password reset for multiple users
2019-11-01 18:45:47 +03:00
Maksim Pechnikov
58da7f6620
updated docs\changelog
2019-10-31 17:34:17 +03:00
Maxim Filippov
791bcfd90f
Merge branch 'develop' into feature/store-statuses-data-inside-flag
2019-10-27 16:11:25 +03:00
Maxim Filippov
8eff05d4c6
Strip status data from Flag (when federating or closing/resolving report)
2019-10-27 16:05:32 +03:00
Ivan Tashkinov
8cc809e44e
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# lib/pleroma/notification.ex
2019-10-23 17:22:42 +03:00
Maksim Pechnikov
31d6ef6f92
update changelog
2019-10-21 11:53:11 +03:00
Ivan Tashkinov
c6fdfbc4f1
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
2019-10-20 20:43:18 +03:00
eugenijm
52ed2f8f2d
Pleroma API: POST /api/v1/pleroma/conversations/read to mark all user's conversations as read
2019-10-19 15:24:06 +03:00
rinpatch
0341f6f779
Merge branch 'fix/pleroma-ctl-rpc' into 'develop'
...
pleroma_ctl: Fix attempting to use RPC for config generation
See merge request pleroma/pleroma!1862
2019-10-18 21:40:07 +00:00
rinpatch
901bf0fb8c
pleroma_ctl: Fix attempting to use RPC for config generation
2019-10-19 00:37:39 +03:00
Maxim Filippov
019147f115
Merge branch 'develop' into feature/relay-list
2019-10-18 18:35:58 +02:00
Ariadne Conill
4e270964d7
update changelog
2019-10-18 14:50:09 +00:00
rinpatch
c2f1cc4f16
Fix wrong list level in the changelog
2019-10-18 15:56:14 +03:00
rinpatch
09c1e7a82e
Sync the changelog from stable and collapse the API sections
2019-10-18 15:46:51 +03:00
Haelwenn (lanodan) Monnier
3c6fd0bb99
upload.ex: Remove deprecated configuration
2019-10-18 12:34:09 +02:00
Maxim Filippov
2473702be2
Merge branch 'develop' into feature/relay-list
2019-10-18 10:24:29 +02:00
eugenijm
359dd1890e
Mastodon API: Mark the conversation as read for the author when they send a new direct message
2019-10-17 16:49:39 +03:00
Ivan Tashkinov
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
2019-10-16 21:59:21 +03:00
Maxim Filippov
da0e4879bc
DELETE /api/pleroma/admin/users now accepts nicknames array
2019-10-15 17:33:29 +02:00
3b1bc079af
Merge branch 'exclude-visibilities-for-timelines' into 'develop'
...
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
See merge request pleroma/pleroma!1818
2019-10-14 19:40:40 +00:00
rinpatch
d1e969842d
Add a changelog entry for branch-moving
2019-10-14 18:42:30 +03:00
eugenijm
a97b642289
Mastodon API: Add exclude_visibilities parameter to the timeline and notification endpoints
2019-10-14 02:57:21 +03:00
Maxim Filippov
cc6875b582
Add GET /api/pleroma/admin/relay endpoint - lists all followed relays
2019-10-11 19:12:29 +03:00
Maxim Filippov
c0aca32dd0
Merge branch 'develop' into feature/multiple-users-activation-permissions
2019-10-11 15:59:35 +03:00
Maxim Filippov
aaa4252f41
Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
2019-10-11 15:58:45 +03:00
Maxim Filippov
f5104f36bb
Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it
2019-10-11 00:24:31 +03:00
lain
d7f9679ff2
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
2019-10-10 12:38:51 +00:00
Maxim Filippov
24eecc3cb4
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
2019-10-10 03:33:55 +03:00
lain
1357ec1a10
Merge branch 'add-direct-conversation-id-to-status-show-page' into 'develop'
...
Add `pleroma.direct_conversation_id` to `GET /api/v1/statuses/:id`
See merge request pleroma/pleroma!1822
2019-10-09 15:10:08 +00:00
Maxim Filippov
ad42837244
Ability to toggle activation status and permission group for a group of users
2019-10-09 17:03:54 +03:00
Egor Kislitsyn
d537bfd4e1
Add a task to re-count statuses for all users
2019-10-09 13:11:57 +07:00
eugenijm
580a67f5ca
Mastodon API: Return pleroma.direct_conversation_id when viewing a status (GET /api/v1/statuses/:id)
2019-10-09 07:27:09 +03:00
Maxim Filippov
35068baf65
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
2019-10-07 15:41:41 +03:00
Maxim Filippov
7aceaa517b
Admin API: Reports, grouped by status
2019-10-07 15:39:07 +03:00
lain
6c278cfe09
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
2019-10-07 12:31:51 +00:00
Ariadne Conill
9a2f71f4d5
mastodon api: fix exclude_replies ( closes #1287 )
2019-10-07 12:29:33 +00:00
Sergey Suprunenko
4b3f77a99f
Extract RSS Feed functionality from OStatus
2019-10-07 12:20:41 +00:00
lain
73b6512907
Merge remote-tracking branch 'origin/develop' into reactions
2019-10-07 12:30:59 +02:00
kaniini
93bdc55306
Merge branch 'mrf/simple_policy/check_actor' into 'develop'
...
mrf/simple_policy: check actor against accept/reject
See merge request pleroma/pleroma!1806
2019-10-07 10:19:24 +00:00
Ivan Tashkinov
28fb98d69e
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
2019-10-07 11:06:30 +03:00
Haelwenn
b4f3c16885
Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop'
...
[#1234 ] Mastodon 2.4.3 hierarchical OAuth scopes
Closes #1234
See merge request pleroma/pleroma!1643
2019-10-07 02:14:45 +00:00
Haelwenn (lanodan) Monnier
58aeabd020
mrf/simple_policy: check actor against accept/reject
2019-10-07 03:49:57 +02:00
1d8e956c32
Use the user.id instead of nickname in report URLs
...
Ensures links to profiles of remote users work.
2019-10-06 14:13:04 +00:00
Ivan Tashkinov
06b3bb54c5
Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
2019-10-06 11:43:49 +03:00
Ivan Tashkinov
f459aabdfa
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
2019-10-06 09:30:49 +03:00
eugenijm
8249924485
Mastodon API: Add pleroma.unread_conversation_count to the Account entity
2019-10-05 20:12:00 +03:00
kaniini
e07e9cb75e
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
...
This reverts merge request !1737
2019-10-05 10:00:05 +00:00
lain
d9aaea44ff
Merge remote-tracking branch 'origin/develop' into reactions
2019-10-05 10:42:29 +02:00
kaniini
e0c0ea9f13
Merge branch 'bugfix/widen-streamer-blocks' into 'develop'
...
widen streaming API block effects
See merge request pleroma/pleroma!1784
2019-10-04 17:39:06 +00:00
kaniini
5c04e81724
Merge branch 'user-info-unread-direct-conversation' into 'develop'
...
Add the `unread_conversation_count` field to the user info
See merge request pleroma/pleroma!1737
2019-10-04 17:33:18 +00:00
Maxim Filippov
8dcc2f9f5e
Admin API: Allow changing the state of multiple reports at once
2019-10-04 19:00:58 +03:00
Ariadne Conill
dbf5fce67e
update changelog
2019-10-04 15:45:06 +00:00
31e57cd1b3
Merge branch 'develop' into 'fix/extended-nickname-format-default-config'
...
# Conflicts:
# CHANGELOG.md
2019-10-04 14:16:28 +00:00
lain
27110793a7
Merge branch 'featrue/job-monitor' into 'develop'
...
Add Pleroma.JobQueueMonitor
Closes #1274
See merge request pleroma/pleroma!1721
2019-10-04 12:52:11 +00:00
lain
8e83c8423f
Update Changelog.
2019-10-04 14:49:59 +02:00
rinpatch
8217292085
Fix get_cached_by_nickname_or_id not allowing to get local users by
...
nickname
Closes #1293
2019-10-04 14:44:09 +03:00
eugenijm
06d9df79c5
Mastodon API: Add pleroma.unread_conversation_count to the Account entity
2019-10-04 00:53:23 +03:00
Mark Felder
b8b98ac40f
Add missing extended_nickname_format setting to the default config
2019-10-03 10:40:49 -05:00
Ivan Tashkinov
64095961fe
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
2019-10-02 20:42:40 +03:00
Egor Kislitsyn
93f966ea4b
Update CHANGELOG and pleroma_api.md
2019-10-02 14:51:30 +07:00
1255ec888d
Revert "Add upload limits to /api/v1/instance"
...
This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.
2019-10-01 22:16:29 +00:00
Sergey Suprunenko
c541b83bef
Track failed proxy urls and don't request them again
2019-10-01 20:00:27 +00:00
Ivan Tashkinov
6ffa2b5f66
[ #1260 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
2019-09-30 17:41:20 +03:00
Ariadne Conill
1d7cbdaf7b
change new scrobble endpoint
2019-09-30 10:39:48 +00:00
Ariadne Conill
53506da414
update changelog
2019-09-30 10:39:48 +00:00
rinpatch
e9d1aa75d5
Revert subscription refactoring.
...
As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10c4fbb56984
2019-09-29 18:43:27 +03:00
kaniini
6d74a7528c
Merge branch 'feature/follow-requests-count' into 'develop'
...
Mastodon API: add follow_requests_count
See merge request pleroma/pleroma!1726
2019-09-29 11:44:31 +00:00
Haelwenn (lanodan) Monnier
e46dfd9295
CHANGELOG.md: Sorting, colon after breaking
...
[ci skip]
2019-09-29 02:16:52 +02:00
Haelwenn (lanodan) Monnier
51a4a211a3
CHANGELOG.md: !1691 is a breaking change
...
!1691 : https://git.pleroma.social/pleroma/pleroma/merge_requests/1691
2019-09-29 02:13:17 +02:00
minibikini
f9380289eb
Add remote_ip plug
2019-09-27 21:59:23 +00:00
Ariadne Conill
843c11d1f6
changelog
2019-09-27 04:24:20 +00:00
kaniini
eb9aa7aa10
Merge branch 'refactor/subscription' into 'develop'
...
Refactor subscription functionality
Closes #1130
See merge request pleroma/pleroma!1664
2019-09-27 03:51:24 +00:00
rinpatch
3ec81b816f
Sync changelogs between master and develop
2019-09-27 01:16:24 +03:00
Maxim Filippov
e7836adf21
Merge branch 'develop' into feature/moderation-log-filters
2019-09-26 19:01:54 +03:00
Roman Chvanikov
b736312123
Update CHANGELOG
2019-09-26 15:17:36 +03:00
kaniini
a39e065916
Merge branch 'feature/return-link-for-password-reset' into 'develop'
...
Admin API: Return link alongside with token on password reset
See merge request pleroma/pleroma!1691
2019-09-26 03:12:03 +00:00
