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 |
|
Ivan Tashkinov
|
ca3b4de2c9
|
[#1521] AdminApiControllerTest: fixed create report test (OAuth).
|
2020-01-20 20:04:25 +03: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 |
|
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
|
2199d63ddc
|
StatusControllerTest: Fix typo
|
2020-01-20 15:31:14 +01: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 (lanodan) Monnier
|
5c533e10e7
|
Bump credo to 1.1.5
|
2020-01-20 12:17:14 +01:00 |
|
rinpatch
|
dc0498ab2b
|
Check for unapplied migrations on startup
Closes #1328
|
2020-01-20 12:20:26 +03: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 |
|
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
|
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 |
|
Ivan Tashkinov
|
5304c8cd21
|
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
|
2020-01-15 18:12:08 +03:00 |
|
Alexander Strizhakov
|
59ba5c80b9
|
little cleanup
|
2020-01-15 17:10:33 +03:00 |
|
Egor Kislitsyn
|
023b7f605b
|
Fix notification controller test
|
2020-01-15 16:51:09 +04:00 |
|
Egor Kislitsyn
|
3849053c6a
|
Merge branch 'develop' into notifications-from-account
|
2020-01-15 16:49:45 +04:00 |
|
Alexander Strizhakov
|
a9c7cd341b
|
Merge branch 'develop' into admin-be
|
2020-01-14 19:56:33 +03:00 |
|
Alexander Strizhakov
|
0d331f3d23
|
compilation warnings fix
|
2020-01-14 15:49:52 +03: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
|
e64059d218
|
Assign token that can write to follows
|
2020-01-12 12:14:09 -06: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
|
d933fd3d61
|
more renamings
|
2020-01-10 19:51:32 +03:00 |
|
Alexander Strizhakov
|
7d128ca208
|
dynamic_configuration renaming
and moving it from instance settings
|
2020-01-10 19:34:19 +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
|
e412d2f152
|
test fixes after rebase
|
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 |
|
