Commit Graph

11951 Commits

Author SHA1 Message Date
lain
c1d51944c7 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads 2020-08-25 11:44:51 +02:00
lain
5722b0e2e5 Merge branch 'docs/update-clients' into 'develop'
clients.md: Remove Nekonium, Twidere-iOS, Feather; Add DashFE and BloatFE

See merge request pleroma/pleroma!2914
2020-08-25 07:41:25 +00:00
Maksim
b267b751d4 Apply 1 suggestion(s) to 1 file(s) 2020-08-25 05:38:25 +00:00
Haelwenn (lanodan) Monnier
16f777a7b2
clients.md: Remove Nekonium, Twidere-iOS, Feather; Add DashFE and BloatFE 2020-08-24 23:14:07 +02:00
feld
3d5940da3e Merge branch 'feature/add-preload-to-description' into 'develop'
Add Pleroma.Web.Preload to description.exs

See merge request pleroma/pleroma!2913
2020-08-24 20:41:33 +00:00
Angelina Filippova
6e5678b5af Add Pleroma.Web.Preload to description.exs 2020-08-24 22:43:37 +03:00
feld
d39abd02ac Merge branch 'relay-fix-admin-fe' into 'develop'
Relay fix for admin-fe

See merge request pleroma/pleroma!2902
2020-08-24 17:03:18 +00:00
Maksim Pechnikov
14ec12ac95 added tests 2020-08-24 15:01:45 +03:00
Mark Felder
98f8851f29 Use the image thumbnail for rich metadata (OGP/Twittercards) 2020-08-22 15:12:11 -05:00
Maksim Pechnikov
0922791e4d updated errors on add emoji 2020-08-22 10:56:26 +03:00
Maksim Pechnikov
f5845ff033 upload emoji zip file 2020-08-22 10:42:02 +03:00
href
edde0d9b54 Remove newline for linter 2020-08-21 17:40:49 +00:00
Mark Felder
4e6eb22b4a Try to warm the cache with the preview image if preview proxy enabled 2020-08-21 12:19:35 -05:00
href
967afa064b Fix truncated images 2020-08-21 17:02:57 +00:00
lain
e1c8c599ff Merge branch 'features/validators-event' into 'develop'
Pipeline Ingestion: Event

See merge request pleroma/pleroma!2909
2020-08-21 16:10:30 +00:00
lain
02db6c596e Merge branch 'feature/2071-actor-type' into 'develop'
Adding actor type in user show

Closes #2071

See merge request pleroma/pleroma!2910
2020-08-21 08:36:56 +00:00
Alexander Strizhakov
1f8c32b773
adding actor type in user show 2020-08-21 10:38:56 +03:00
Ivan Tashkinov
aa0a5ffb48 [#2497] Media preview proxy: added quality config setting, adjusted width/height defaults. 2020-08-21 08:59:08 +03:00
Haelwenn (lanodan) Monnier
36c125a071
Pipeline Ingestion: Event 2020-08-20 21:49:26 +02:00
Ivan Tashkinov
02ad1cd8e9 [#2497] Media preview proxy: added Content-Disposition header with filename to response. 2020-08-20 09:58:50 +03:00
Ivan Tashkinov
4ee15e991e [#2497] Media preview proxy config refactoring & documentation. 2020-08-19 21:36:26 +03:00
lain
5c2b6922e1 Merge branch 'features/validators-audio2' into 'develop'
Pipeline Ingestion: Audio (Part 2)

See merge request pleroma/pleroma!2903
2020-08-19 12:59:41 +00:00
lain
c1277be041 AudioHandlingTest: Make mock explicit 2020-08-19 14:36:42 +02:00
lain
9aae342e7a Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators-audio2 2020-08-19 14:10:11 +02:00
lain
5054a6aa9a Merge branch 'fix-arm64' into 'develop'
CI: Fix release builds once more.

See merge request pleroma/pleroma!2907
2020-08-19 11:41:00 +00:00
lain
d833d2c1fd CI: Fix release builds once more. 2020-08-19 13:37:33 +02:00
lain
4681771af4 Merge branch 'email-tests' into 'develop'
Fix for sometimes failing email tests

See merge request pleroma/pleroma!2906
2020-08-19 10:56:07 +00:00
Alexander Strizhakov
c68bcae362
fix for sometimes failing tests 2020-08-19 12:57:29 +03:00
lain
1c6303f620 Merge branch 'mix-task-fixes' into 'develop'
Fixes for mix tasks

See merge request pleroma/pleroma!2905
2020-08-19 09:48:40 +00:00
Alexander Strizhakov
4727030f59
fixes for mix tasks
- fix for `mix pleroma.database update_users_following_followers_counts`
- raise error, if fetch was unsuccessful in emoji tasks
- fix for `pleroma.digest test` task
2020-08-19 11:06:03 +03:00
Alexander Strizhakov
13f6029b4b
additional changelog entry 2020-08-19 08:55:03 +03:00
Alexander Strizhakov
fa23d5d3d3
changelog entry 2020-08-19 08:41:39 +03:00
Alexander Strizhakov
7dc275b69b
relay fix for admin-fe 2020-08-19 08:41:39 +03:00
Maksim Pechnikov
7794d7c694 added Pleroma.Web.PleromaAPI.EmojiFileController 2020-08-19 06:50:20 +03:00
Haelwenn (lanodan) Monnier
5316e231b0
Pipeline Ingestion: Audio (Part 2) 2020-08-19 00:06:31 +02:00
Haelwenn
3d5d8c05c9 Merge branch '2064-image-blanking' into 'develop'
Resolve "Make default image description blank"

Closes #2064

See merge request pleroma/pleroma!2899
2020-08-18 19:02:33 +00:00
feld
fa8a87eca1 Merge branch 'improve/freebsd-rc-script' into 'develop'
Improve FreeBSD rc script

See merge request pleroma/pleroma!2901
2020-08-18 15:57:43 +00:00
Mark Felder
dfcb1401c7 Improve FreeBSD rc script
Passes rclint now, $HOME is dynamic, and properly matches process name for signalling shutdown.
2020-08-18 10:24:34 -05:00
Ivan Tashkinov
da116d81fb [#2497] Added video preview proxy. Switched from exexec to Port. 2020-08-18 18:23:27 +03:00
Ivan Tashkinov
27e7999a15 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy 2020-08-18 18:02:09 +03:00
lain
8d70692abf Merge branch 'freebsd-docs' into 'develop'
FreeBSD installation process

See merge request pleroma/pleroma!2887
2020-08-18 12:56:28 +00:00
lain
83cef25794 Merge branch 'chore/improve-descriptions' into 'develop'
Improve description for mediaproxy cache invalidation settings

See merge request pleroma/pleroma!2891
2020-08-18 12:56:07 +00:00
lain
52a79506c7 Test config: Default to filename for descriptions 2020-08-18 14:37:35 +02:00
lain
67ec8e87ff Merge branch 'features/validators-audio' into 'develop'
Pipeline Ingestion: Audio

See merge request pleroma/pleroma!2897
2020-08-18 12:27:45 +00:00
lain
f0a8d723bb Transmogrifier Test: Extract audio tests. 2020-08-18 13:37:28 +02:00
lain
3998ef9d64 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators-audio 2020-08-18 13:31:42 +02:00
lain
566749f77a Merge branch 'purge-user' into 'develop'
Purge a local user upon deletion, fixes #2062

Closes #2062

See merge request pleroma/pleroma!2898
2020-08-18 11:31:13 +00:00
lain
757410a177 Changelog: Add info about upload description changes 2020-08-18 13:24:39 +02:00
lain
368fd04b47 Cheatsheet: Add information about filename descriptions 2020-08-18 13:22:00 +02:00
lain
aabc26a573 Pleroma.Upload: Set default upload name / description based on config. 2020-08-18 13:21:30 +02:00