lain
12b6fcdb8c
Merge branch 'features/task-test-email' into 'develop'
...
Create pleroma.email mix task
Closes #1061
See merge request pleroma/pleroma!2118
5 years ago
Haelwenn (lanodan) Monnier
4eb935be78
Create pleroma.email mix task
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061
5 years ago
Maksim Pechnikov
bcffa662dc
Merge branch 'develop' into feature/tag_feed
5 years ago
Hakaba Hitoyo
dabd535e43
Remove user recommendation by third party engine
5 years ago
Maksim Pechnikov
055edd3d72
Merge branch 'develop' into feature/tag_feed
5 years ago
Mark Felder
a43b73bba9
Document dynamic_configuration breaking change
5 years ago
lain
9a994878f1
Emoji reactions: Update docs and changelog
5 years ago
Maksim Pechnikov
293281fcbd
Merge branch 'develop' into feature/tag_feed
5 years ago
Alexander Strizhakov
4344c5d5b9
truncate config table on migrate to db task
5 years ago
Maksim Pechnikov
2cfe1b9385
Merge branch 'develop' into feature/tag_feed
5 years ago
lain
002146d297
Update changelog
5 years ago
Egor Kislitsyn
0b843f2567
Update CHANGELOG
5 years ago
lain
043cd5aa54
Emoji reactions: Document changes
5 years ago
Maksim Pechnikov
5ea8596448
Merge branch 'develop' into feature/tag_feed
5 years ago
Maksim Pechnikov
41e2332007
Merge branch 'develop' into feature/tag_feed
5 years ago
lain
7d8b709d29
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions
5 years ago
lain
7518f3877f
Update changelog
5 years ago
lain
4c5b5f14dc
StatusView: Add `emoji_reactions`
5 years ago
rinpatch
dc0498ab2b
Check for unapplied migrations on startup
...
Closes #1328
5 years ago
Maksim Pechnikov
a5db044e57
Merge branch 'develop' into feature/tag_feed
5 years ago
Ivan Tashkinov
5304c8cd21
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
5 years ago
lain
aa9fe3a712
Merge branch 'develop' into 'feature/tag_feed'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Egor Kislitsyn
3849053c6a
Merge branch 'develop' into notifications-from-account
5 years ago
Maksim Pechnikov
c9f45edeac
Merge branch 'develop' into feature/tag_feed
5 years ago
Roman Chvanikov
88f0eed0f2
Delete attachments when status is deleted
5 years ago
feld
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
5 years ago
Hakaba Hitoyo
0c9c62509d
Remove MDII uploader
5 years ago
Ivan Tashkinov
6c94b7498b
[ #1478 ] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
5 years ago
lain
180f257ced
Update CHANGELOG.md
5 years ago
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
5 years ago
Maksim Pechnikov
b53573a837
add tag feeds
5 years ago
Egor Kislitsyn
6c39fa20b1
Add support for `account_id` param to filter notifications by the account
5 years ago
Maxim Filippov
45180d4c60
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
5 years ago
Egor Kislitsyn
36d66d9655
Fix typo
5 years ago
minibikini
d81c3afbb2
Apply suggestion to CHANGELOG.md
5 years ago
Egor Kislitsyn
a12b6454bb
Add an option to require fetches to be signed
5 years ago
Maxim Filippov
eb11c60289
Disable rate limiter for socket/localhost (unless RemoteIp is enabled)
5 years ago
Egor Kislitsyn
7528322f83
Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
Egor Kislitsyn
e536796984
Add native captcha and enable it by default.
5 years ago
Maxim Filippov
3ecf131511
Merge branch 'develop' into feature/report-notes
5 years ago
Mark Felder
0867064441
Document the favorites timeline order change
5 years ago
Egor Kislitsyn
1a6e30d32e
Update CHANGELOG
5 years ago
minibikini
43d9c06a2a
Merge branch 'develop' into 'feature/custom-runtime-modules'
...
# Conflicts:
# CHANGELOG.md
5 years ago
lain
1ae976ac51
Merge branch 'develop' into '1427-oauth-admin-scopes'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Hakaba Hitoyo
701815e64c
[ActivityPub] Configurable ActivityPub actor type
5 years ago
Ivan Tashkinov
835ac2157c
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
...
# Conflicts:
# CHANGELOG.md
5 years ago
rinpatch
632dab5d30
Merge branch 'user-timelines-changelog' into 'develop'
...
Changelog: Update with user timeline change info.
See merge request pleroma/pleroma!2049
5 years ago
Egor Kislitsyn
c098dec473
Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
lain
e4ea0e20b3
Merge branch 'issue/1342' into 'develop'
...
[#1342 ] Added privacy option to push notifications
See merge request pleroma/pleroma!1920
5 years ago
lain
a5e28bf214
Merge branch 'develop' into 'fix/oauth-compile-time'
...
# Conflicts:
# CHANGELOG.md
5 years ago
lain
eb7f412b26
Changelog: Update with user timeline change info.
5 years ago
Maksim Pechnikov
dfae1d705f
update changelog
5 years ago
rinpatch
d6c89068f3
HTML: Compile Scrubbers on boot
...
This makes it possible to configure their behavior on OTP releases.
5 years ago
rinpatch
bd3aa8500c
OAuth token cleanup: Get rid of compile-time configuration
5 years ago
rinpatch
6cb31edd76
Merge branch 'feature/1455-chat-character-limit' into 'develop'
...
Feature/1455 chat character limit
Closes #1455
See merge request pleroma/pleroma!2034
5 years ago
Ivan Tashkinov
13926537b6
Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
5 years ago
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).
5 years ago
rinpatch
cdff5b8267
Merge branch 'develop' into fix/mrf-delete
5 years ago
rinpatch
9f99640cfc
ActivityPub: Fix deletes being exempt from MRF
...
Closes #1461
5 years ago
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
5 years ago
feld
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
5 years ago
Egor Kislitsyn
48ae3c4347
Add support for custom modules
5 years ago
Ivan Tashkinov
30caf3e51e
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user.ex
5 years ago
lain
21353a8ee9
Changelog: Add information about chat limit.
5 years ago
Maxim Filippov
4b60d41db9
Add report notes
5 years ago
lain
7722e5a67a
Merge branch 'feature/move-activity' into 'develop'
...
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
5 years ago
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
5 years ago
Maxim Filippov
b62be2564c
Merge branch 'develop' into feature/admin-api-render-whole-status
5 years ago
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)
5 years ago
feld
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
5 years ago
feld
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
5 years ago
Maxim Filippov
82f4e4760e
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
Maxim Filippov
fd24467b92
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
Maxim Filippov
2b341627da
Admin API: Render whole status in grouped reports
5 years ago
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
5 years ago
rinpatch
c2ad9fd5f9
Merge branch 'list-users' into 'develop'
...
Add CLI list users command
See merge request pleroma/pleroma!1990
5 years ago
Alex Schroeder
fbc379d689
Add CLI list users command
5 years ago
Ivan Tashkinov
81f1c6bc47
[ #1335 ] Added CHANGELOG.md entry.
5 years ago
rinpatch
dc8830da27
changelog: add 1.1.6 entries from stable
5 years ago
Maxim Filippov
46eb160135
AdminAPI: Confirm user account, resend confirmation email
5 years ago
Egor Kislitsyn
36686f5245
Support authentication via `x-admin-token` HTTP header
5 years ago
Maxim Filippov
c506cc48ef
Admin API: Error when trying to update reports in the "old" format
5 years ago
rinpatch
da28bf8fdd
Sync the changelogs between develop and stable
5 years ago
lain
075789c442
Apply suggestion to CHANGELOG.md
5 years ago
Ariadne Conill
2469880a2b
add changelog entry for MRF ObjectAgePolicy
5 years ago
Maxim Filippov
114930b5fd
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
Maxim Filippov
30af5da330
Admin API: list all statuses from a given instance
5 years ago
feld
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
5 years ago
Egor Kislitsyn
3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
5 years ago
rinpatch
6085c71bd1
Merge branch 'reactions' into 'develop'
...
Emoji Reactions
See merge request pleroma/pleroma!1662
5 years ago
lain
7a322713c3
Update CHANGELOG.md
5 years ago
Egor Kislitsyn
63c493cd53
Update CHANGELOG
5 years ago
kaniini
2cc043591c
Merge branch 'feature/static-fe' into 'develop'
...
Static frontend
See merge request pleroma/pleroma!1917
5 years ago
rinpatch
827b938502
Add a changelog entry for !1940
5 years ago
Maxim Filippov
46787b9fe1
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
Maxim Filippov
1649d6f689
Add "/api/pleroma/admin/reports/:id" -> "/api/pleroma/admin/reports" changelog entry
5 years ago
Maxim Filippov
31343e4321
Code style fixes
5 years ago
Maxim Filippov
b2e8371e6a
Apply suggestion to CHANGELOG.md
5 years ago
rinpatch
4499a7a075
Disable attachment links by default
...
Closes #1394
5 years ago
lain
a88e834dba
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
5 years ago