Roman Chvanikov
|
dea968463d
|
Add logging
|
5 years ago |
|
Roman Chvanikov
|
7f78bd7e37
|
Fix __MODULE__ usage
|
5 years ago |
|
Roman Chvanikov
|
eb4870e1cd
|
Remove unused var
|
5 years ago |
|
Roman Chvanikov
|
52e08ec9fd
|
explicitly describe perform op in AttachmentsClenupWorker
|
5 years ago |
|
Roman Chvanikov
|
86c4b76bf0
|
Fix typo
|
5 years ago |
|
Roman Chvanikov
|
22e94bb2c7
|
Merge branch 'develop' into fix/attachments-cleanup
|
5 years ago |
|
rinpatch
|
04c9ca5d68
|
Merge branch 'emoji-reaction-extensions' into 'develop'
StatusView: Add `emoji_reactions`
See merge request pleroma/pleroma!2120
|
5 years ago |
|
Maksim Pechnikov
|
6e88a7e591
|
exclude blocked user posts from search results
|
5 years ago |
|
lain
|
7d8b709d29
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions
|
5 years ago |
|
rinpatch
|
00d08c9231
|
Merge branch 'favoritng-responses' into 'develop'
Mastodon API: Align favoriting / repeating behavior with Mastodon
See merge request pleroma/pleroma!2119
|
5 years ago |
|
lain
|
4c5b5f14dc
|
StatusView: Add `emoji_reactions`
|
5 years ago |
|
lain
|
6a716e3fe5
|
Merge branch 'credo/version-bump-1.1.5' into 'develop'
Bump credo to 1.1.5
See merge request pleroma/pleroma!2115
|
5 years ago |
|
lain
|
42ea480e95
|
Merge branch 'fix-emoji-reactions-oauth-scope' into 'develop'
Pleroma API: `emoji_reactions_by` does not need authorization
See merge request pleroma/pleroma!2117
|
5 years ago |
|
lain
|
510776ba31
|
CommonAPI: Don't error out on double favs/repeats
|
5 years ago |
|
lain
|
c814f22030
|
Merge branch 'fix-admin-api-scope' into 'develop'
fix oauth scopes for AdminApi#reports_update
See merge request pleroma/pleroma!2087
|
5 years ago |
|
lain
|
5fddf988ea
|
Pleroma API: `emoji_reactions_by` does not need authorization
|
5 years ago |
|
Haelwenn
|
e8759cb5ba
|
Merge branch 'hashtag-benchmarks' into 'develop'
Hashtag benchmarks
See merge request pleroma/pleroma!2116
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
5c533e10e7
|
Bump credo to 1.1.5
|
5 years ago |
|
rinpatch
|
9367b70f37
|
Merge branch 'features/cleanup-incoming-actor' into 'develop'
transmogrifier.ex: simplify handle_incoming of actors
See merge request pleroma/pleroma!2114
|
5 years ago |
|
rinpatch
|
dc0498ab2b
|
Check for unapplied migrations on startup
Closes #1328
|
5 years ago |
|
Roman Chvanikov
|
cde828ff7d
|
Fix credo warning
|
5 years ago |
|
Roman Chvanikov
|
d6a532bf0f
|
Delete attachments asynchronously
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
6cf3b19a38
|
transmogrifier.ex: simplify handle_incoming of actors
|
5 years ago |
|
Roman Chvanikov
|
81133702d4
|
Delete attachments after object and cache cleanup
|
5 years ago |
|
Ivan Tashkinov
|
5304c8cd21
|
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
|
5 years ago |
|
Egor Kislitsyn
|
3849053c6a
|
Merge branch 'develop' into notifications-from-account
|
5 years ago |
|
Ivan Tashkinov
|
76c1948880
|
[#1478] Adjusted AdminAPIController admin subscope requirements.
|
5 years ago |
|
Roman Chvanikov
|
0709757e47
|
Check if object->data is array when looking up attachment objects to delete
|
5 years ago |
|
lain
|
2ee6754095
|
Mix Tasks: Add pleroma.benchmarks.tags
|
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 |
|
feld
|
bb5862ea2f
|
Merge branch 'issue/1354' into 'develop'
[#1354] fix remote follow
See merge request pleroma/pleroma!2079
|
5 years ago |
|
Mark Felder
|
2f5b8fbeb3
|
Merge branch 'develop' into issue/1354
|
5 years ago |
|
feld
|
ea4a462858
|
Merge branch 'issue/1487' into 'develop'
[#1487] fixed clear HTML entities after scrub html and truncate
See merge request pleroma/pleroma!2090
|
5 years ago |
|
Hakaba Hitoyo
|
0c9c62509d
|
Remove MDII uploader
|
5 years ago |
|
Ivan Tashkinov
|
39ce894a07
|
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
# Conflicts:
# lib/pleroma/user.ex
|
5 years ago |
|
lain
|
05ca420c09
|
Merge branch 'issue/1490' into 'develop'
[#1490] fixed create service user (relay, internal.fetch)
See merge request pleroma/pleroma!2092
|
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 |
|
Maksim Pechnikov
|
70410dfafd
|
fix create service actor
|
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
|
fa7d8e77e6
|
fixed Metadata.Utils.scrub_html_and_truncate
|
5 years ago |
|
Ivan Tashkinov
|
badd0a96ea
|
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
|
5 years ago |
|
Maksim Pechnikov
|
933dc12043
|
added code of mr#2067
|
5 years ago |
|
Maksim Pechnikov
|
385356aad0
|
fix oauth scopes for AdminApi#reports_update
|
5 years ago |
|
Maksim Pechnikov
|
bdd71669da
|
update test
|
5 years ago |
|
Maksim
|
4c505bc615
|
Apply suggestion to lib/pleroma/web/twitter_api/views/remote_follow_view.ex
|
5 years ago |
|
Maksim
|
c9a44ec4a6
|
Apply suggestion to lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
|
5 years ago |
|
Maksim Pechnikov
|
5b84156013
|
moved remote follow in separate controller
|
5 years ago |
|
rinpatch
|
c51e93978e
|
Merge branch 'feature/custom-runtime-modules' into 'develop'
Add support for custom modules at runtime
Closes #1448
See merge request pleroma/pleroma!2039
|
5 years ago |
|
Maxim Filippov
|
e71a13ad57
|
Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"
This reverts merge request !2076
|
5 years ago |
