Commit graph

1190 commits

Author SHA1 Message Date
Ivan Tashkinov
61180ab6f4 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
#	config/config.exs
#	lib/pleroma/web/media_proxy/media_proxy.ex
#	lib/pleroma/web/media_proxy/media_proxy_controller.ex
2020-07-02 16:36:54 +03:00
lain
d884b6f704 Merge branch 'feature/update-description' into 'develop'
Update settings descriptions and labels

See merge request pleroma/pleroma!2709
2020-07-02 08:43:32 +00:00
Angelina Filippova
df2d6564d5 Add labels, update descriptions and labels 2020-07-01 03:01:15 +03:00
Alex Gleason
8daacc9114
AutoLinker --> Linkify, update to latest version
https://git.pleroma.social/pleroma/elixir-libraries/linkify
2020-06-30 16:39:15 -05:00
lain
0313520cd2 Config: Reduce default preloaders to configuration endpoints.
Fetching the timeline is a bit heavy to do by default.
2020-06-27 12:18:37 +02:00
Alexander Strizhakov
f89390110b
added tab & labels for mrf policies 2020-06-27 12:18:34 +03:00
Alexander Strizhakov
e7bc0273e5
additional data to MRF policies in descriptions 2020-06-26 15:22:08 +03:00
Alexander Strizhakov
91cd023720
Pleroma.Upload.Filter.Mogrify args description 2020-06-26 09:03:07 +03:00
feld
8288419686 Merge branch 'preload-data' into 'develop'
Preload data into index.html

Closes #1660

See merge request pleroma/pleroma!2381
2020-06-25 21:35:39 +00:00
lain
1d0804b49f Merge branch 'chore/remove-reference-to-distsn' into 'develop'
Remove reference to defunct distsn.org

See merge request pleroma/pleroma!2675
2020-06-25 10:42:57 +00:00
lain
f585622f85 Apply suggestion to config/description.exs 2020-06-25 10:17:16 +00:00
Maksim Pechnikov
439a1a0218 added wrapper Pleroma.HTTP for ExAws.S3 2020-06-25 07:12:29 +03:00
Maksim Pechnikov
cc837f9d15 fixed config/descpiption.exs 2020-06-24 21:21:33 +03:00
Maksim Pechnikov
721fc7c554 added wrapper Pleroma.HTTP for Tzdata.HTTPClient 2020-06-24 09:12:32 +03:00
Haelwenn
c7d69e9256 Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
Moving mrf settings from instance to separate mrf group

Closes #1631

See merge request pleroma/pleroma!2320
2020-06-23 16:38:27 +00:00
Mark Felder
54039100fe Remove reference to defunct distsn.org 2020-06-23 11:17:26 -05:00
Maksim Pechnikov
a8d967762e migrate to oban 2.0-rc1 2020-06-23 15:09:01 +03:00
Henry Jameson
593edd3c41 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (53 commits)
  Add warning against parsing/reusing MastoFE settings blob
  Update NotificationOperation spec
  Add `is_muted` to notifications
  Translated using Weblate (Italian)
  Added translation using Weblate (Italian)
  Add include for the "Further reading" section
  HellthreadPolicy: Restrict to Notes and Articles.
  Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
  proper error codes for error in adminFE
  Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
  cheatsheet.md: no_attachment_links → attachment_links
  fix for packs pagination
  Stop filling conversation field on incoming objects (legacy, unused)
  Only accounts with Service actor_type are considered as bots
  Add support for bot field in update_credentials
  README: Add some troubleshooting info for compilation issues.
  [#1873] Fixes missing :offset pagination param support. Added pagination support for hashtags search.
  default page size for files
  changelog entry
  adding overall count for packs and files
  ...
2020-06-23 01:35:40 +03:00
Mark Felder
bf8310f380 Add missing default config value for :instance, instance_thumbnail
Follows up on b7fc61e17b
2020-06-22 17:35:02 -05:00
Henry Jameson
ce6f690a85 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (276 commits)
  Remove `poll` from `notification_type` OpenAPI spec
  credo fix
  CHANGELOG.md: mention minimal elixir version update
  Update OTP releases to official images of 1.10.3
  Chunk the notification type backfill migration
  moving custom ecto types in context folders
  Upgrade to Elixir 1.9
  naming
  fix attemps to merge map
  fix for updated hackney
  Mogrify args as custom tuples
  Fix tests
  Changelog: Add info about conversation view changes.
  Conversations: Return last dm for conversation, not last message.
  Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page
  ControllerHelper: Always return id field.
  Apply suggestion to lib/pleroma/web/controller_helper.ex
  Remove use of atoms in MRF.UserAllowListPolicy
  Fix atom leak in Rich Media Parser
  Return an empty map from Pleroma.Web.RichMedia.Parsers.OGP.parse/2
  ...
2020-06-19 15:17:00 +03:00
Mark Felder
3462d4b995 Merge branch 'develop' into issue/1855 2020-06-17 12:50:06 -05:00
Alexander Strizhakov
ed189568f3
moving mrf settings from instance to separate group 2020-06-16 18:32:18 +03:00
href
f124f68205 Switch from gen_magic to majic, use Majic.Plug, remove Pleroma.MIME 2020-06-16 15:27:27 +02:00
href
ec1452fd1c Pleroma.MIME: use gen_magic 2020-06-16 15:15:50 +02:00
Maksim Pechnikov
579763126f Merge branch 'develop' into issue/1855 2020-06-15 15:24:55 +03: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
2e8a236cef fix invalidates media url's 2020-06-14 21:02:57 +03:00
href
cb7be6eef2 Remove use of atoms in MRF.UserAllowListPolicy 2020-06-13 12:08:46 +03:00
Mark Felder
26f710b9e3 Merge branch 'develop' into preload-data 2020-06-12 16:52:52 -05:00
Egor Kislitsyn
697cf92024
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers 2020-06-12 18:25:29 +04:00
lain
4655407451 Apply suggestion to config/description.exs 2020-06-12 14:03:33 +00:00
Egor Kislitsyn
1f35acce54
Merge OGP parser with TwitterCard 2020-06-11 17:57:31 +04:00
Egor Kislitsyn
da22119c2f
Merge branch 'develop' into global-status-expiration 2020-06-08 17:21:47 +04:00
stwf
75e886b506 fix config 2020-06-03 17:32:03 -04:00
stwf
906ac57ba8 Merge branch 'preload-data' of git.pleroma.social:stwf/pleroma into preload-data
# Conflicts:
#	lib/pleroma/web/preload/status_net.ex
2020-06-03 17:25:53 -04:00
stwf
5677b21e82 clean up 2020-06-03 17:24:35 -04:00
stwf
3b8180d7d1 add status_net/config 2020-06-03 16:34:03 -04:00
stwf
29ae5bb771 preload data into index.html 2020-06-03 16:34:03 -04:00
stwf
aa26dc6a13 add status_net/config 2020-06-03 13:40:48 -04:00
lain
6977500ef7 Merge branch 'tagline' into 'develop'
Update default instance description

See merge request pleroma/pleroma!2600
2020-06-02 14:10:53 +00:00
Egor Kislitsyn
a7627bdc7a
Merge remote-tracking branch 'origin/develop' into global-status-expiration 2020-06-01 15:48:51 +04:00
lain
ac31f687c0 Config: Default to Hackney again
Gun needs some server setting changes (files) and has problems with
OTP 23 (wildcards), so use Hackney as a default again for now.
2020-06-01 13:35:39 +02:00
stwf
d67b302810 preload data into index.html 2020-05-29 14:15:24 -04:00
Alex Gleason
d4a18d44fe
Update default instance description 2020-05-28 11:56:30 -05:00
lain
337ca33e5e Config: Restore old new background image
Became lost in a settings restructure
2020-05-26 16:00:56 +02:00
Henry Jameson
8676f39421 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  Apply suggestion to lib/pleroma/web/common_api/utils.ex
  Update CHANGELOG and docs
  Add filename_display_max_length config
  priv/static: Add a warning discouraging admins from modifying the static files directly
  Fix notifications mark as read API
  EmojiReactionController: Return more appropriate error.
  Credo fixes for the credo god.
  AnnounceValidator: Check for announcability
  Credo fixes.
  Announcements: Fix all tests.
  SideEffects: Builed out Announce effects.
  Pipeline: Don't federate if federation is disabled.
  Announcements: Handle through common pipeline.
  CommonAPI: Change public->private implicit addressing.
  AnnounceValidator: Validate for existing announce
  ObjectValidators: Add basic Announce validator.
  TransmogrifierTest: Fix tests.
  Transmogrifier Test: Extract Announce handling.
2020-05-23 02:33:15 +03:00
Roman Chvanikov
8eb1dfadca Update CHANGELOG and docs 2020-05-22 18:30:13 +03:00
Roman Chvanikov
cc82229ba7 Add filename_display_max_length config 2020-05-22 18:19:25 +03:00
Henry Jameson
f20479ded8 fix 2020-05-22 00:37:24 +03:00
Henry Jameson
2a06b66daf fix 2020-05-22 00:33:59 +03:00