lain
|
347f3ed2c6
|
Emoji reactions: Change api format once more
|
5 years ago |
feld
|
a182d400d7
|
Merge branch 'fix_for_migrate_to_db_test' into 'develop'
Fix for migrate to db test
See merge request pleroma/pleroma!2133
|
5 years ago |
Alexander Strizhakov
|
6cd2e851d9
|
parsing Swoosh modules
|
5 years ago |
Alexander Strizhakov
|
4344c5d5b9
|
truncate config table on migrate to db task
|
5 years ago |
Alexander Strizhakov
|
2bad25cf14
|
fix for migrate to db test
|
5 years ago |
Haelwenn
|
dddebee047
|
Merge branch 'emoji-notifications' into 'develop'
Emoji notifications
See merge request pleroma/pleroma!2130
|
5 years ago |
lain
|
615b72238e
|
Notifications: Add emoji reaction notifications
|
5 years ago |
feld
|
be27777156
|
Merge branch 'admin-be' into 'develop'
Config api for admin-fe
Closes #1406
See merge request pleroma/pleroma!1976
|
5 years ago |
rinpatch
|
34aa0c542b
|
Merge branch 'emoji-reaction-extensions-2' into 'develop'
Emoji Reactions: In the API, sort them by first emoji insertion date
See merge request pleroma/pleroma!2126
|
5 years ago |
lain
|
dd3fc50ea4
|
Emoji reactions: Change cache and reply format
|
5 years ago |
Alexander Strizhakov
|
d5f8a88a37
|
support for updating env after settings deletion
|
5 years ago |
Alexander Strizhakov
|
32a643a159
|
Merge branch 'develop' into admin-be
|
5 years ago |
Roman Chvanikov
|
22e94bb2c7
|
Merge branch 'develop' into fix/attachments-cleanup
|
5 years ago |
Alexander Strizhakov
|
f01ab6cd29
|
some refactor and tests
|
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 |
Alexander Strizhakov
|
503d966e9f
|
Merge branch 'develop' into admin-be
|
5 years ago |
Alexander Strizhakov
|
dcae5914d1
|
fix for db key
|
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 |
Ivan Tashkinov
|
ca3b4de2c9
|
[#1521] AdminApiControllerTest: fixed create report test (OAuth).
|
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
|
2199d63ddc
|
StatusControllerTest: Fix typo
|
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 (lanodan) Monnier
|
5c533e10e7
|
Bump credo to 1.1.5
|
5 years ago |
rinpatch
|
dc0498ab2b
|
Check for unapplied migrations on startup
Closes #1328
|
5 years ago |
Roman Chvanikov
|
0f1fc382d0
|
Add test case for attachment deletion when non-map data.url present in DB
|
5 years ago |
Roman Chvanikov
|
d6a532bf0f
|
Delete attachments asynchronously
|
5 years ago |
Alexander Strizhakov
|
efb8ef5abe
|
releases support
|
5 years ago |
Alexander Strizhakov
|
e699861690
|
full update for some subkeys
|
5 years ago |
Alexander Strizhakov
|
89e93fb33f
|
return db key on update requests
|
5 years ago |
Alexander Strizhakov
|
7676ed8239
|
some clean up
|
5 years ago |
Alexander Strizhakov
|
60ba2339a2
|
saving to DB only added by user settings
|
5 years ago |
Alexander Strizhakov
|
29155137fd
|
renaming
Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB
|
5 years ago |
Ivan Tashkinov
|
5304c8cd21
|
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
|
5 years ago |
Alexander Strizhakov
|
59ba5c80b9
|
little cleanup
|
5 years ago |
Egor Kislitsyn
|
023b7f605b
|
Fix notification controller test
|
5 years ago |
Egor Kislitsyn
|
3849053c6a
|
Merge branch 'develop' into notifications-from-account
|
5 years ago |
Alexander Strizhakov
|
a9c7cd341b
|
Merge branch 'develop' into admin-be
|
5 years ago |
Alexander Strizhakov
|
0d331f3d23
|
compilation warnings fix
|
5 years ago |
Alexander Strizhakov
|
70c7a26de8
|
Merge branch 'develop' into admin-be
|
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
|
e64059d218
|
Assign token that can write to follows
|
5 years ago |
Mark Felder
|
2f5b8fbeb3
|
Merge branch 'develop' into issue/1354
|
5 years ago |