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
|
7518f3877f
|
Update changelog
|
2020-01-20 16:31:12 +01: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
|
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
|
e8759cb5ba
|
Merge branch 'hashtag-benchmarks' into 'develop'
Hashtag benchmarks
See merge request pleroma/pleroma!2116
|
2020-01-20 11:26:07 +00:00 |
|
lain
|
271afcd940
|
Add benchmark of any/all tag options
|
2020-01-20 12:19:15 +01: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 |
|
lain
|
7731f9a447
|
Merge branch 'feat/startup-migration-check' into 'develop'
Check for unapplied migrations on startup
Closes #1328
See merge request pleroma/pleroma!2112
|
2020-01-20 09:56:16 +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
|
0f1fc382d0
|
Add test case for attachment deletion when non-map data.url present in DB
|
2020-01-19 22:04:14 +03:00 |
|
Roman Chvanikov
|
d6a532bf0f
|
Delete attachments asynchronously
|
2020-01-19 19:45:20 +03:00 |
|
rinpatch
|
205e73058d
|
mix.lock: update mock to 0.3.4
This version adds Mock.passthrough/1 which I need to use in a test
|
2020-01-19 13:42:52 +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 |
|
|
|
52a0bf62f5
|
Merge branch 'ci/docker-imaging' into 'develop'
ci/docker imaging
See merge request pleroma/pleroma!2110
|
2020-01-15 22:52:53 +00:00 |
|
jp
|
1e17ad2275
|
Update docker release / stable jobs
|
2020-01-15 17:25:33 -05:00 |
|
jp
|
ffab411327
|
Update docker jobs for release branches and stable branches
|
2020-01-15 16:54:53 -05:00 |
|
jp
|
0c9499bf25
|
Fix only: on docker develop/latest job
|
2020-01-15 16:41:41 -05:00 |
|
jp
|
4d19f38753
|
update only: for release/ branch regex matching. and to avoid running image builds on unnecessary forks
|
2020-01-15 16:23:43 -05:00 |
|
jp
|
cc4c3255fe
|
Fix odd spacing
|
2020-01-15 16:16:29 -05:00 |
|
Maksim Pechnikov
|
a5db044e57
|
Merge branch 'develop' into feature/tag_feed
|
2020-01-15 19:11:13 +03:00 |
|
lain
|
6317183acd
|
Merge branch '1478-oauth-admin-scopes-tweaks' into 'develop'
[#1478] OAuth `admin` scopes tweaks
Closes #1478
See merge request pleroma/pleroma!2081
|
2020-01-15 15:44:49 +00:00 |
|
Ivan Tashkinov
|
d1e9768e10
|
[#1478] Bundled PleromaFE 7397636914a9d3e7fd30373034c25175273ab808.
|
2020-01-15 18:38:18 +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 |
|
lain
|
1b233aa653
|
Merge branch 'notifications-from-account' into 'develop'
[#1470] Add support for `account_id` param to filter notifications by the account
See merge request pleroma/pleroma!2073
|
2020-01-15 14:05:22 +00: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 |
|
