Maxim Filippov
|
f89728ad95
|
Merge branch 'develop' into feature/return-link-for-password-reset
|
5 years ago |
rinpatch
|
ea6d4137da
|
Apply suggestion to CHANGELOG.md
|
5 years ago |
rinpatch
|
bf8567996c
|
Sync develop changelog with master and create a new section for post-1.1
changes
|
5 years ago |
rinpatch
|
f758e663b2
|
Merge branch 'feature/bump-elixir-verstion' into 'develop'
Bump elixir version to ~> 1.8
See merge request pleroma/pleroma!1686
|
5 years ago |
Maxim Filippov
|
f9dd121ad3
|
Admin API: Return link alongside with token on password reset
|
5 years ago |
Maxim Filippov
|
e686f9be81
|
Apply suggestion to CHANGELOG.md
|
5 years ago |
Maxim Filippov
|
228bfd8a70
|
Bump elixir version to ~> 1.8
|
5 years ago |
Maxim Filippov
|
219dca1b00
|
Merge branch 'develop' into feature/return-total-for-reports
|
5 years ago |
Ivan Tashkinov
|
610236d6be
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# docs/config.md
|
5 years ago |
Ivan Tashkinov
|
6bcedb693c
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# docs/config.md
# mix.lock
|
5 years ago |
rinpatch
|
5c5ebd3861
|
Mastodon API: Respect post privacy in favourited/reblogged endpoints
|
5 years ago |
Haelwenn
|
0d9609894f
|
Merge branch 'feature/change-email' into 'develop'
Add email change endpoint
Closes #1156
See merge request pleroma/pleroma!1580
|
5 years ago |
Egor Kislitsyn
|
25d8216804
|
Add email change endpoint
|
5 years ago |
Alex S
|
68e45a327f
|
changelog
|
5 years ago |
Egor Kislitsyn
|
b40b10b53d
|
Add an endpoint to get multiple statuses by IDs
|
5 years ago |
minibikini
|
11e12b5761
|
Add Pleroma.Plugs.Cache
|
5 years ago |
feld
|
bce16f4557
|
Merge branch 'update-changelog' into 'develop'
Update CHANGELOG (add a note about !1649)
See merge request pleroma/pleroma!1650
|
5 years ago |
Egor Kislitsyn
|
e34de00052
|
Update CHANGELOG (add a note about !1649)
|
5 years ago |
Ivan Tashkinov
|
c3f00447af
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
|
5 years ago |
rinpatch
|
f92dc82dda
|
Prioritize the removal of TwitterAPI and :accept_blocks in the changelog
|
5 years ago |
Ivan Tashkinov
|
ca1ba1e272
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# test/web/twitter_api/twitter_api_controller_test.exs
|
5 years ago |
rinpatch
|
896ffabe37
|
Merge branch 'so-long-twitterapi' into 'develop'
Removing TwitterAPI
See merge request pleroma/pleroma!1605
|
5 years ago |
rinpatch
|
b312ca3d52
|
Mastodon API Poll view: Fix handling of polls without an end date
|
5 years ago |
Ivan Tashkinov
|
79cf629e1a
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
|
5 years ago |
rinpatch
|
3e30f6e198
|
Merge branch 'fix/safe-render-notifications' into 'develop'
Do not crash if one notification failed to render
See merge request pleroma/pleroma!1630
|
5 years ago |
rinpatch
|
558969a0fd
|
Do not crash if one notification failed to render
|
5 years ago |
Maxim Filippov
|
af746fa4a8
|
Return total for reports
|
5 years ago |
rinpatch
|
3face45467
|
Mastodon API: Add `pleroma.thread_muted` to Status entity
Needed for pleroma-fe!941
|
5 years ago |
rinpatch
|
c2b6c1b089
|
Extend `/api/pleroma/notifications/read` to mark multiple notifications
as read and make it respond with Mastoapi entities
|
5 years ago |
Ivan Tashkinov
|
eb17cc17a1
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# CHANGELOG.md
|
5 years ago |
Maxim Filippov
|
b15cfd80ef
|
Return "total" optionally
|
5 years ago |
Maxim Filippov
|
a4c5f71e93
|
Return total from pagination + tests
|
5 years ago |
Ivan Tashkinov
|
a90ea8ba15
|
[#1149] Addressed code review comments (code style, jobs pruning etc.).
|
5 years ago |
Ivan Tashkinov
|
e890ea7e82
|
[#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# config/config.exs
|
5 years ago |
rinpatch
|
dbfcba85ec
|
Add a changelog entry for twitterapi removal and fix credo issues
|
5 years ago |
feld
|
7853b3f17d
|
Fix AntiFollowbotPolicy when trying to follow a relay
|
5 years ago |
lain
|
3da65292b3
|
Transmogrifier: Fix follow handling when the actor is an object.
|
5 years ago |
Maxim Filippov
|
37dd3867bb
|
Log admin/moderator actions
|
5 years ago |
lain
|
90986667ce
|
Merge branch 'admin-create-users' into 'develop'
user creation admin api will create multiple users
See merge request pleroma/pleroma!1170
|
5 years ago |
lain
|
1d7033d962
|
Update CHANGELOG.md
|
5 years ago |
lain
|
cc6c0b4ba6
|
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
|
5 years ago |
Ivan Tashkinov
|
c34126f89c
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
|
5 years ago |
Ivan Tashkinov
|
581123f8bb
|
[#1149] Introduced `quantum` job scheduler. Documentation & config changes.
|
5 years ago |
rinpatch
|
05e7d0a438
|
Add an index on object likes
In !1538 favorites timeline was switched to use the joined object, but
no idex on likes in the joined object was added.
|
5 years ago |
lain
|
74f7f308f8
|
Merge branch 'fix/admin-api-user-deletion' into 'develop'
Fix deactivated user deletion
See merge request pleroma/pleroma!1546
|
5 years ago |
lain
|
8340fe8fcc
|
Merge branch 'digest-template' into 'develop'
Improve digest email template
See merge request pleroma/pleroma!1565
|
5 years ago |
Egor Kislitsyn
|
cd2fd225dc
|
Update CHANGELOG
|
5 years ago |
lain
|
ef43016b2c
|
Merge branch 'feature/custom-fields' into 'develop'
Add custom profile fields
See merge request pleroma/pleroma!1488
|
5 years ago |
lain
|
d2c9befc64
|
Merge branch 'develop' into 'fix/reverse-proxy-body-too-large'
# Conflicts:
# CHANGELOG.md
|
5 years ago |
Mark Felder
|
cb222b72b3
|
Add changelog entry too
|
5 years ago |