Alexander Strizhakov
f01ab6cd29
some refactor and tests
2020-01-21 18:42:00 +03:00
rinpatch
04c9ca5d68
Merge branch 'emoji-reaction-extensions' into 'develop'
...
StatusView: Add `emoji_reactions`
See merge request pleroma/pleroma!2120
2020-01-21 13:13:17 +00:00
Alexander Strizhakov
503d966e9f
Merge branch 'develop' into admin-be
2020-01-21 10:32:27 +03:00
Alexander Strizhakov
dcae5914d1
fix for db key
2020-01-21 10:14:48 +03:00
Maksim Pechnikov
41e2332007
Merge branch 'develop' into feature/tag_feed
2020-01-21 09:23:35 +03:00
Maksim Pechnikov
6e88a7e591
exclude blocked user posts from search results
2020-01-21 07:40:13 +03:00
lain
7d8b709d29
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions
2020-01-20 18:10:55 +01:00
rinpatch
00d08c9231
Merge branch 'favoritng-responses' into 'develop'
...
Mastodon API: Align favoriting / repeating behavior with Mastodon
See merge request pleroma/pleroma!2119
2020-01-20 16:31:43 +00:00
Alexander Strizhakov
8023fa48db
merge fix
2020-01-20 18:25:00 +03:00
lain
4c5b5f14dc
StatusView: Add emoji_reactions
2020-01-20 16:24:20 +01:00
lain
6a716e3fe5
Merge branch 'credo/version-bump-1.1.5' into 'develop'
...
Bump credo to 1.1.5
See merge request pleroma/pleroma!2115
2020-01-20 14:42:43 +00:00
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
2020-01-20 13:49:06 +00:00
lain
510776ba31
CommonAPI: Don't error out on double favs/repeats
2020-01-20 14:27:59 +01:00
lain
c814f22030
Merge branch 'fix-admin-api-scope' into 'develop'
...
fix oauth scopes for AdminApi#reports_update
See merge request pleroma/pleroma!2087
2020-01-20 12:07:12 +00:00
lain
5fddf988ea
Pleroma API: emoji_reactions_by does not need authorization
2020-01-20 13:05:35 +01:00
Haelwenn
e8759cb5ba
Merge branch 'hashtag-benchmarks' into 'develop'
...
Hashtag benchmarks
See merge request pleroma/pleroma!2116
2020-01-20 11:26:07 +00:00
Haelwenn (lanodan) Monnier
5c533e10e7
Bump credo to 1.1.5
2020-01-20 12:17:14 +01:00
rinpatch
9367b70f37
Merge branch 'features/cleanup-incoming-actor' into 'develop'
...
transmogrifier.ex: simplify handle_incoming of actors
See merge request pleroma/pleroma!2114
2020-01-20 10:25:17 +00:00
rinpatch
dc0498ab2b
Check for unapplied migrations on startup
...
Closes #1328
2020-01-20 12:20:26 +03:00
Roman Chvanikov
cde828ff7d
Fix credo warning
2020-01-19 22:09:47 +03:00
Roman Chvanikov
d6a532bf0f
Delete attachments asynchronously
2020-01-19 19:45:20 +03:00
Haelwenn (lanodan) Monnier
6cf3b19a38
transmogrifier.ex: simplify handle_incoming of actors
2020-01-19 07:06:15 +01:00
Alexander Strizhakov
efb8ef5abe
releases support
2020-01-18 17:14:50 +03:00
Alexander Strizhakov
e699861690
full update for some subkeys
2020-01-18 12:25:56 +03:00
Roman Chvanikov
81133702d4
Delete attachments after object and cache cleanup
2020-01-17 20:20:37 +03:00
Alexander Strizhakov
89e93fb33f
return db key on update requests
2020-01-17 18:15:41 +03:00
Alexander Strizhakov
7676ed8239
some clean up
2020-01-17 16:28:44 +03:00
Alexander Strizhakov
ce027fd0ef
revert non needable
2020-01-17 15:13:24 +03:00
Alexander Strizhakov
9e10b90b5b
configure only console backend
2020-01-17 15:06:42 +03:00
Maksim Pechnikov
108a39c876
updated error messages for authentication process
2020-01-17 15:01:37 +03:00
Alexander Strizhakov
b310feeccb
compile fix
2020-01-17 15:00:20 +03:00
Alexander Strizhakov
58e8963824
fix for config loader
2020-01-17 11:54:22 +03:00
Alexander Strizhakov
60ba2339a2
saving to DB only added by user settings
2020-01-17 11:45:44 +03:00
Alexander Strizhakov
29155137fd
renaming
...
Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB
2020-01-16 08:50:27 +03:00
Maksim Pechnikov
a5db044e57
Merge branch 'develop' into feature/tag_feed
2020-01-15 19:11:13 +03:00
Ivan Tashkinov
5304c8cd21
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
2020-01-15 18:12:08 +03:00
lain
aa9fe3a712
Merge branch 'develop' into 'feature/tag_feed'
...
# Conflicts:
# CHANGELOG.md
2020-01-15 14:29:56 +00:00
Alexander Strizhakov
59ba5c80b9
little cleanup
2020-01-15 17:10:33 +03:00
Alexander Strizhakov
66de2b159b
don't migrate Pleroma.Web.EndPoint settings
...
don't set Logger level to all tasks
2020-01-15 17:08:45 +03:00
Egor Kislitsyn
3849053c6a
Merge branch 'develop' into notifications-from-account
2020-01-15 16:49:45 +04:00
lain
167e9c45ec
Benchmarks: Move to correct folder
2020-01-15 12:37:50 +01:00
Ivan Tashkinov
76c1948880
[ #1478 ] Adjusted AdminAPIController admin subscope requirements.
2020-01-15 12:11:23 +03:00
Maksim Pechnikov
c9f45edeac
Merge branch 'develop' into feature/tag_feed
2020-01-14 21:29:14 +03:00
Roman Chvanikov
0709757e47
Check if object->data is array when looking up attachment objects to delete
2020-01-14 19:53:28 +03:00
lain
2ee6754095
Mix Tasks: Add pleroma.benchmarks.tags
2020-01-14 17:24:26 +01:00
Alexander Strizhakov
70c7a26de8
Merge branch 'develop' into admin-be
2020-01-14 14:52:00 +03:00
Roman Chvanikov
88f0eed0f2
Delete attachments when status is deleted
2020-01-12 18:48:58 +00:00
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
2020-01-12 18:37:52 +00:00
bb5862ea2f
Merge branch 'issue/1354' into 'develop'
...
[#1354 ] fix remote follow
See merge request pleroma/pleroma!2079
2020-01-12 18:20:31 +00:00
Mark Felder
2f5b8fbeb3
Merge branch 'develop' into issue/1354
2020-01-12 12:12:15 -06:00
ea4a462858
Merge branch 'issue/1487' into 'develop'
...
[#1487 ] fixed clear HTML entities after scrub html and truncate
See merge request pleroma/pleroma!2090
2020-01-12 17:25:25 +00:00
0c9c62509d
Remove MDII uploader
2020-01-11 17:19:54 +00:00
Alexander Strizhakov
1630ecaa20
Merge branch 'develop' into admin-be
2020-01-11 12:15:42 +03:00
Alexander Strizhakov
3453b27015
don't migrate prometheus settings
2020-01-10 21:24:06 +03:00
Alexander Strizhakov
d933fd3d61
more renamings
2020-01-10 19:51:32 +03:00
Alexander Strizhakov
eadb674c41
don't migrate configurable_from_database setting
2020-01-10 19:44:30 +03:00
Alexander Strizhakov
7d128ca208
dynamic_configuration renaming
...
and moving it from instance settings
2020-01-10 19:34:19 +03:00
Alexander Strizhakov
958d0452e4
fix for pleroma assets group update
2020-01-10 18:18:09 +03:00
Ivan Tashkinov
39ce894a07
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
...
# Conflicts:
# lib/pleroma/user.ex
2020-01-10 16:18:32 +03:00
lain
05ca420c09
Merge branch 'issue/1490' into 'develop'
...
[#1490 ] fixed create service user (relay, internal.fetch)
See merge request pleroma/pleroma!2092
2020-01-10 13:14:20 +00:00
Alexander Strizhakov
88a16bb9fc
deep merge in config update
2020-01-10 15:52:02 +03:00
Alexander
c841174de8
flag for delete fix
2020-01-10 15:52:02 +03:00
Alexander
0b02040327
little fixes and typos fix
2020-01-10 15:52:02 +03:00
Alexander
9c1f3bfeff
fixes for logger backends
2020-01-10 15:52:01 +03:00
Alexander
cda2c1fc63
fix for subgroup tuple
...
added settings for swoosh adapters local
2020-01-10 15:52:01 +03:00
Alexander
063ab6d911
logger backends fix
2020-01-10 15:52:01 +03:00
Alexander
583cee4607
parsing proxy url setting
2020-01-10 15:52:01 +03:00
Alexander
a71393dd29
fix for endpoints after env update
2020-01-10 15:52:00 +03:00
Alexander
fea734ca70
errors on endpoints
2020-01-10 15:52:00 +03:00
Alexander
5cacb988b9
partially settings update
2020-01-10 15:52:00 +03:00
Alexander
0656816c77
tests for setttings without an explicit key
2020-01-10 15:51:59 +03:00
Alex S
2753285b77
config editing through database
2020-01-10 15:51:59 +03:00
Ivan Tashkinov
6c94b7498b
[ #1478 ] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
2020-01-10 10:52:21 +03:00
Maksim Pechnikov
70410dfafd
fix create service actor
2020-01-08 16:40:49 +03:00
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
2020-01-05 17:38:51 +03:00
Maksim Pechnikov
fa7d8e77e6
fixed Metadata.Utils.scrub_html_and_truncate
2020-01-03 16:28:13 +03:00
Ivan Tashkinov
badd0a96ea
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
2020-01-02 13:03:33 +03:00
Maksim Pechnikov
933dc12043
added code of mr#2067
2019-12-25 15:12:43 +03:00
Maksim Pechnikov
385356aad0
fix oauth scopes for AdminApi#reports_update
2019-12-24 20:51:52 +03:00
Maksim Pechnikov
bdd71669da
update test
2019-12-22 21:21:31 +03:00
Maksim
4c505bc615
Apply suggestion to lib/pleroma/web/twitter_api/views/remote_follow_view.ex
2019-12-22 17:58:54 +00:00
Maksim
c9a44ec4a6
Apply suggestion to lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
2019-12-22 17:58:45 +00:00
Maksim Pechnikov
5b84156013
moved remote follow in separate controller
2019-12-21 21:27:42 +03:00
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
2019-12-21 11:56:24 +00:00
Maxim Filippov
e71a13ad57
Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"
...
This reverts merge request !2076
2019-12-21 11:41:19 +00:00
Mark Felder
06ae56a3ae
Posts without media attachments should get the Summary TwitterCard
2019-12-20 16:32:04 -06:00
a54aa5af43
Merge branch 'feature/status-counts-by-scope' into 'develop'
...
Stats: return status counts by scope
See merge request pleroma/pleroma!2076
2019-12-20 16:30:26 +00:00
Maksim Pechnikov
7bd0bca2ab
fixed remote follow
2019-12-20 16:33:44 +03:00
Maxim Filippov
5fc84552d3
Fix all count
2019-12-19 19:52:55 +03:00
Ivan Tashkinov
ead2d18826
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
2019-12-19 17:24:08 +03:00
Ivan Tashkinov
455e072d27
[ #2068 ] Introduced proper OAuth tokens usage to controller tests.
2019-12-19 17:23:27 +03:00
Egor Kislitsyn
34d85f8a54
Return 404 if account to filter notifications from is not found
2019-12-19 20:45:44 +07:00
Egor Kislitsyn
432b3067d4
Do not crash when remote user follower and following counters are hidden
2019-12-19 19:26:46 +07:00
Maxim Filippov
404a9ccb9a
Stats: return status counts by scope
2019-12-18 23:17:34 +03:00
Maksim Pechnikov
b53573a837
add tag feeds
2019-12-18 09:19:37 +03:00
d2f1c4f658
Add ActivityPub Object Event type support
...
Adds Event support in the same way Video objects are handled, with the
name of the object as message header.
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-12-17 16:16:21 +01:00
Egor Kislitsyn
6c39fa20b1
Add support for account_id param to filter notifications by the account
2019-12-17 17:00:46 +07:00
Egor Kislitsyn
8f79f433bc
Hide follower counter when hiding is activated
2019-12-17 13:34:07 +07:00
Maksim Pechnikov
a879c396bb
Merge branch 'develop' into feature/tag_feed
2019-12-17 09:24:08 +03:00
Egor Kislitsyn
b9a87b1baa
Merge branch 'develop' into feature/custom-runtime-modules
2019-12-16 22:34:21 +07:00
