alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
11,834 Commits 1 Branch 0 Tags 177 MiB
Commit Graph

11834 Commits

Author SHA1 Message Date
Haelwenn b536e57124 Merge branch '1866-last-status-stuff' into 'develop' 
Resolve "/api/v1/conversations returns the wrong `last_status`"

Closes #1866

See merge request pleroma/pleroma!2647
 2020-06-16 18:10:00 +00:00
Alexander Strizhakov b66e6eb521
fixes for tests 2020-06-16 19:03:45 +03:00
Alexander Strizhakov ed189568f3
moving mrf settings from instance to separate group 2020-06-16 18:32:18 +03:00
Alexander Strizhakov 3c2cee33ad
moving custom ecto types in context folders 2020-06-16 17:50:33 +03:00
rinpatch 8bfacffabc Merge branch 'elixir-1.9' into 'develop' 
Upgrade to Elixir 1.9

See merge request pleroma/pleroma!2651
 2020-06-16 13:18:29 +00:00
Steven Fuchs aca6a7543a Upgrade to Elixir 1.9 2020-06-16 13:18:29 +00:00
lain 4baf5ffe73 Merge branch 'fix/1787-mogrify-args' into 'develop' 
Mogrify args in adminFE

Closes #1787

See merge request pleroma/pleroma!2616
 2020-06-16 13:17:52 +00:00
Alexander Strizhakov 32c6576b60
naming 2020-06-16 15:54:22 +03:00
Alexander Strizhakov e1603ac8fe
fix attemps to merge map 2020-06-16 15:54:22 +03:00
Alexander Strizhakov 23decaab81
fix for updated hackney 
warning: :hackney_connect.partial_chain/1 is undefined or private
 2020-06-16 15:54:22 +03:00
Alexander Strizhakov 9a4fde9766
Mogrify args as custom tuples 2020-06-16 15:53:28 +03:00
lain 015f9258a9 Transmogrifier: Extract user update handling tests. 2020-06-16 14:48:46 +02:00
lain 4733f6a337 Changelog: Add info about `only_media` changes. 2020-06-16 13:09:28 +02:00
lain 1eb6cedaad ActivityPub: When restricting to media posts, only show 'Creates'. 2020-06-16 13:08:27 +02:00
Maksim Pechnikov b023110799 fixed a visibility of functions 2020-06-15 20:48:22 +03:00
stwf faba1a6e33 fix tests 2020-06-15 12:25:03 -04:00
lain 1e49bfa9ac Merge branch 'merge-ogp-twitter-parsers' into 'develop' 
Merge OGP parser with TwitterCard

Closes #1835

See merge request pleroma/pleroma!2642
 2020-06-15 12:41:48 +00:00
lain e1ee8bc1da User: update_follower_count refactor. 2020-06-15 14:29:34 +02:00
Maksim Pechnikov 579763126f Merge branch 'develop' into issue/1855 2020-06-15 15:24:55 +03:00
Maksim Pechnikov efdfc85c2d update docs 2020-06-15 15:24:00 +03:00
Egor Kislitsyn bd63089a63
Fix tests 2020-06-15 16:20:05 +04:00
Egor Kislitsyn 58e4e3db8b
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers 2020-06-15 16:03:40 +04:00
Maksim Pechnikov 62b8c31b7a added tests 2020-06-15 14:55:00 +03:00
lain 1092b36500 Changelog: Add info about conversation view changes. 2020-06-15 12:30:11 +02:00
lain b7df7436c8 Conversations: Return last dm for conversation, not last message. 2020-06-15 12:27:13 +02:00
lain 448e93ce2c Merge branch 'notifications-filtering' into 'develop' 
Mastodon API return full result set in notifications

See merge request pleroma/pleroma!2552
 2020-06-15 07:57:58 +00:00
Maksim Pechnikov 2e8a236cef fix invalidates media url's 2020-06-14 21:02:57 +03:00
eugenijm b15cfc3d36 Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page 2020-06-14 18:27:11 +03:00
rinpatch 271ea5068f Merge branch '1851-favorites-pagination' into 'develop' 
StatusController: Correctly paginate favorites.

Closes #1851

See merge request pleroma/pleroma!2636
 2020-06-13 17:20:43 +00:00
lain 1d625c29a0 ControllerHelper: Always return id field. 2020-06-13 13:12:43 +02:00
lain 4b865bba10 Apply suggestion to lib/pleroma/web/controller_helper.ex 2020-06-13 10:37:15 +00:00
href cb7be6eef2 Remove use of atoms in MRF.UserAllowListPolicy 2020-06-13 12:08:46 +03:00
Egor Kislitsyn 520367d6fd Fix atom leak in Rich Media Parser 2020-06-13 12:08:46 +03:00
rinpatch f891e2b2f1 Merge branch 'release/2.0.7' into 'stable' 
Release/2.0.7

See merge request pleroma/secteam/pleroma!8
 2020-06-13 09:07:02 +00:00
Mark Felder 26f710b9e3 Merge branch 'develop' into preload-data 2020-06-12 16:52:52 -05:00
Haelwenn e2793744c5 Merge branch 'patch-1' into 'develop' 
Update pleroma.nginx to support TLSv1.3

See merge request pleroma/pleroma!2644
 2020-06-12 21:46:16 +00:00
rinpatch d050d21103 Apply suggestion to CHANGELOG.md 2020-06-12 20:06:49 +00:00
rinpatch ffd12d3a1e CHANGELOG.md: add 2.0.7 entry 2020-06-12 21:09:40 +03:00
rinpatch 9046f85ced mix.exs: bump to 2.0.7 2020-06-12 21:09:28 +03:00
feld 90676bdfe3 Merge branch 'fix/csp-mediaproxy-base-url' into 'develop' 
HTTP security plug: add media proxy base url host to csp

See merge request pleroma/pleroma!2638
 2020-06-12 20:43:59 +03:00
rinpatch cd2df734dd Merge branch 'bugfix/csp-unproxied' into 'develop' 
http_security_plug.ex: Fix non-proxied media

See merge request pleroma/pleroma!2610
 2020-06-12 20:43:36 +03:00
Haelwenn (lanodan) Monnier e313aa0977 static-fe.css: Restore and move to /priv/static/static-fe 2020-06-12 20:42:43 +03:00
Haelwenn 4115701f71 Merge branch 'recipients-experiments' into 'develop' 
ActivityPub: Don't show announces of your own objects in timeline.

See merge request pleroma/pleroma!2637
 2020-06-12 16:57:13 +00:00
href 8efd1614ec Remove use of atoms in MRF.UserAllowListPolicy 2020-06-12 18:57:46 +03:00
Egor Kislitsyn 8b8b8599e9 Fix atom leak in Rich Media Parser 2020-06-12 18:51:42 +03:00
Egor Kislitsyn 09d31d24de
Return an empty map from Pleroma.Web.RichMedia.Parsers.OGP.parse/2 2020-06-12 18:39:51 +04:00
Egor Kislitsyn 697cf92024
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers 2020-06-12 18:25:29 +04:00
lain e557265a03 Merge branch 'global-status-expiration' into 'develop' 
Global status expiration

See merge request pleroma/pleroma!2208
 2020-06-12 14:14:09 +00:00
lain 4655407451 Apply suggestion to config/description.exs 2020-06-12 14:03:33 +00:00
feld 6d902916dd Merge branch 'features/mix-task-reset-mfa' into 'develop' 
New mix task: pleroma.user reset_mfa <nickname>

See merge request pleroma/pleroma!2643
 2020-06-12 14:01:19 +00:00