Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9,032 Commits 1 Branch 0 Tags 222 MiB
fc4f92c5de
Commit Graph

9032 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
feld
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
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
ilja
e02eb8de3e Add OTP to updating.md 
* I removed the Update section from the OTP install and added it to updating.md
* I also added a link to the updating.md from the OTP install page
* I added a Questions section to the OTP install, similar to the debian_based_en.md
* Restructured the updating.md a bit

I would very much also like to link to the changelog, but I don't know how to do it because I can't find the page in the docs?
 2020-01-15 09:12:24 +01:00
feld
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
Maksim Pechnikov
c9f45edeac Merge branch 'develop' into feature/tag_feed 2020-01-14 21:29:14 +03: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
Maksim Pechnikov
b7908844f2 Merge branch 'develop' into issue/1383 2020-01-13 12:41:07 +03:00
feld
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
feld
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
feld
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
feld
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
feld
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