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 |
|
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 |
|
|
|
77412d5dd2
|
Merge branch 'features/docker-updates' into 'develop'
Features/docker updates
See merge request pleroma/pleroma!2105
|
2020-01-14 21:36:52 +00:00 |
|
jp
|
a58a0a7b1b
|
Remove forked test branch matching
|
2020-01-14 13:47:36 -05:00 |
|
jp
|
ff15d6ef13
|
Remove artifacts passing by setting dependencies: []
|
2020-01-14 13:45:47 -05:00 |
|
lain
|
b4532277b1
|
Merge branch 'features/docker-updates' into 'develop'
Features/docker updates
See merge request pleroma/pleroma!2104
|
2020-01-14 17:48:58 +00:00 |
|
jp
|
964d188a96
|
Add allow_failure to docker jobs
|
2020-01-14 12:43:28 -05:00 |
|
jp
|
fe57e5139f
|
Remove cache from docker jobs. Split devlop and stable branches into their own jobs
|
2020-01-14 12:32:36 -05:00 |
|
Alexander Strizhakov
|
a9c7cd341b
|
Merge branch 'develop' into admin-be
|
2020-01-14 19:56:33 +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 |
|
lain
|
d150c598d7
|
Merge branch 'warnings-fix' into 'develop'
compilation warnings fix
See merge request pleroma/pleroma!2102
|
2020-01-14 16:11:36 +00:00 |
|
Alexander Strizhakov
|
0d331f3d23
|
compilation warnings fix
|
2020-01-14 15:49:52 +03:00 |
|
Alexander Strizhakov
|
41c7f34905
|
short labels and fixes for typos
|
2020-01-14 15:00:38 +03:00 |
|
Alexander Strizhakov
|
70c7a26de8
|
Merge branch 'develop' into admin-be
|
2020-01-14 14:52:00 +03:00 |
|
lain
|
12b28c8925
|
Merge branch 'feature/ci-registry' into 'develop'
Update Dockerfile with labels. Update gitlab-ci for registry usage
See merge request pleroma/pleroma!2098
|
2020-01-13 15:25:41 +00:00 |
|
|
|
a431e8c9f7
|
Merge branch 'feature/attachments-cleanup' into 'develop'
Delete attachments when status is deleted
See merge request pleroma/pleroma!2036
|
2020-01-12 18:48:59 +00: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 |
|
|
|
6cc5341d26
|
Merge branch 'config/benchmark' into 'develop'
Benchmark env uses test database so we should be able to use test.secret.exs
See merge request pleroma/pleroma!2057
|
2020-01-12 18:31:10 +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 |
|
rinpatch
|
ecb8fe183c
|
Merge branch 'patch-1' into 'develop'
docs: API: update Mastodon API link
See merge request pleroma/pleroma!2100
|
2020-01-11 17:38:12 +00:00 |
|
rinpatch
|
a0bf928c98
|
Merge branch 'remove/remove-mdii-uploader' into 'develop'
Remove MDII uploader
See merge request pleroma/pleroma!2099
|
2020-01-11 17:19:54 +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 |
|
|
|
e1308f10bd
|
docs: API: update Mastodon API link
|
2020-01-11 05:06:40 +00:00 |
|
jp
|
2ef8f0be6c
|
Update Dockerfile with labels. Update gitlab-ci for registry usage
|
2020-01-10 14:09:14 -05: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 |
|
Alexander Strizhakov
|
00aff5f78c
|
syncing new setting to descriptions.exs
|
2020-01-10 17:54:54 +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 |
|
lain
|
9b5cd8b1b7
|
Merge branch 'oauth-scopes-tweaks-and-tests' into 'develop'
OAuth tweaks and tests rework
See merge request pleroma/pleroma!2068
|
2020-01-10 13:07:20 +00:00 |
|
Alexander Strizhakov
|
6395ad942c
|
Update AdminFE build
|
2020-01-10 15:52:02 +03: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 |
|
