feld
|
36838b516f
|
Merge branch 'fix/runtime-config' into 'develop'
Fixes for runtime config
See merge request pleroma/pleroma!2143
|
5 years ago |
|
Mark Felder
|
d770cffce0
|
Merge branch 'develop' into issue/1280
|
5 years ago |
|
Alexander Strizhakov
|
de4102b247
|
can be changed in runtime
|
5 years ago |
|
rinpatch
|
8533b63d1f
|
Merge branch 'fix/1532-fix-for-migration-fe-setting' into 'develop'
Fix for non existing atom
Closes #1532
See merge request pleroma/pleroma!2139
|
5 years ago |
|
rinpatch
|
0fceeb44b3
|
Merge branch 'emoji-reaction-sanity-check' into 'develop'
Emoji reactions: Add sanity checks for the cache
See merge request pleroma/pleroma!2132
|
5 years ago |
|
lain
|
347f3ed2c6
|
Emoji reactions: Change api format once more
|
5 years ago |
|
Alexander Strizhakov
|
6a0f0ac4a2
|
fix for non existing atom
|
5 years ago |
|
Alexander Strizhakov
|
6cd2e851d9
|
parsing Swoosh modules
|
5 years ago |
|
lain
|
34fc0ca053
|
Emoji reactions: Add sanity checks for the cache
|
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 |
|
rinpatch
|
6e6f1ead31
|
Merge branch 'no-error-404' into 'develop'
Log at debug level for object deletion, not error.
See merge request pleroma/pleroma!2066
|
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 |
|
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 |
|
Alexander Strizhakov
|
8023fa48db
|
merge fix
|
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 |
|
Alexander Strizhakov
|
efb8ef5abe
|
releases support
|
5 years ago |
|
Alexander Strizhakov
|
e699861690
|
full update for some subkeys
|
5 years ago |
|
Roman Chvanikov
|
81133702d4
|
Delete attachments after object and cache cleanup
|
5 years ago |
|
Alexander Strizhakov
|
89e93fb33f
|
return db key on update requests
|
5 years ago |
|
Alexander Strizhakov
|
7676ed8239
|
some clean up
|
5 years ago |
|
Maksim Pechnikov
|
108a39c876
|
updated error messages for authentication process
|
5 years ago |
|
Alexander Strizhakov
|
58e8963824
|
fix for config loader
|
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 |
