nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
10802 commits 2 branches 0 tags 272 MiB
Commit graph

1015 commits

Author SHA1 Message Date
lain 5b1eeb06d8 Revert "Merge branch 'revert-2b5d9eb1' into 'develop'" 
This reverts merge request !2784
 2020-07-21 22:18:17 +00:00
lain 696c13ce54 Revert "Merge branch 'linkify' into 'develop'" 
This reverts merge request !2677
 2020-07-21 22:17:34 +00:00
lain 2b5d9eb105 Merge branch 'linkify' into 'develop' 
AutoLinker --> Linkify, update to latest version

See merge request pleroma/pleroma!2677
 2020-07-21 19:35:43 +00:00
Mark Felder 20a496d2cb Expose the post formats in /api/v1/instance 2020-07-17 10:45:41 -05:00
Alex Gleason 38425ebdbf
Merge remote-tracking branch 'upstream/develop' into linkify 2020-07-16 14:51:36 -05:00
Mark Felder b2d398b1d0 Merge branch 'develop' into refactor/gun-pool-registry 2020-07-15 13:34:27 -05:00
Mark Felder 9d30bacace Merge branch 'develop' into refactor/notification_settings 2020-07-15 09:30:23 -05:00
rinpatch 007843b75e Add documentation for new connection pool settings and remove some 
`:retry_timeout` and `:retry` got removed because reconnecting on failure is
something the new pool intentionally doesn't do.

`:max_overflow` had to go in favor of `:max_waiting`, I didn't reuse the key because
the settings are very different in their behaviour.

`:checkin_timeout` got removed in favor of `:connection_acquisition_wait`,
I didn't reuse the key because the settings are somewhat different.

I didn't do any migrations/deprecation warnings/changelog entries because
these settings were never in stable.
 2020-07-15 15:26:35 +03:00
feld 3f65f2ea79 Merge branch 'feature/1922-media-proxy-whitelist' into 'develop' 
Support for hosts with scheme in MediaProxy whitelist setting

Closes #1922

See merge request pleroma/pleroma!2754
 2020-07-14 18:07:44 +00:00
feld 2909dc873b Merge branch '1940-admin-token-oauthless-auth' into 'develop' 
[#1940] Reinstated OAuth-less `admin_token` authentication

Closes #1940

See merge request pleroma/pleroma!2760
 2020-07-14 16:48:26 +00:00
rinpatch 8d56fb6d22 Migrate in-db config after updating to Oban 2.0 2020-07-14 13:15:46 +03:00
Ivan Tashkinov 9b225db7d8 [#1940] Applied rate limit for requests with bad admin_token. Added doc warnings on admin_token setting. 2020-07-14 11:58:41 +03:00
Mark Felder 80c21100db Merge branch 'develop' into refactor/notification_settings 2020-07-13 13:32:21 -05:00
Mark Felder 442fe3cd45 Show examples for both OTP and source 2020-07-13 09:56:05 -05:00
Mark Felder 0871e8b8fe Make the query more precise 2020-07-12 10:43:24 -05:00
Mark Felder 133004e22d Improve database config migration and add documentation 2020-07-12 10:38:07 -05:00
Alexander Strizhakov b376442325
MediaProxy whitelist setting now supports hosts with scheme 
added deprecation warning about using bare domains
 2020-07-12 12:41:40 +03:00
lain 11dd29ef3f Merge branch 'feature/upload-filter-exiftool' into 'develop' 
Add Pleroma.Upload.Filter.Exiftool

Closes #1935

See merge request pleroma/pleroma!2744
 2020-07-11 11:31:44 +00:00
Alibek Omarov d885540590 docs: API: fix update_credentials endpoints path, clarify update/verify_credentials endpoints paths 2020-07-11 11:02:13 +00:00
Mark Felder 6167593881 Support Exiftool for stripping EXIF data 
We really only want to strip location data anyway, and mogrify strips color profiles.
 2020-07-10 16:46:26 -05:00
feld 167a619432 Merge branch 'fix/1924-s3-descriptions' into 'develop' 
docs and descriptions for s3 settings

Closes #1924

See merge request pleroma/pleroma!2745
 2020-07-10 16:42:35 +00:00
lain b39eb6ecc5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information 2020-07-10 12:26:53 +02:00
lain 48f98a2748 Merge branch 'mix-tasks-improvement' into 'develop' 
Mix tasks improvement

See merge request pleroma/pleroma!2723
 2020-07-10 08:58:44 +00:00
Alexander Strizhakov b1b8f5f11a
docs and descriptions for s3 settings 2020-07-10 09:16:53 +03:00
Alexander Strizhakov c2edfd16e0
fix for user revoke invite task 2020-07-09 18:59:15 +03:00
lain f4469dc741 Merge branch 'features/favicons' into 'develop' 
Add support for remote favicons

See merge request pleroma/pleroma!2261
 2020-07-09 13:09:31 +00:00
lain 393a588265 Merge branch 'patch-1' into 'develop' 
added link to changelog, removed repetition

See merge request pleroma/pleroma!2736
 2020-07-09 09:42:39 +00:00
Dym Sohin 6465257e1f missed : (colon) before mrf_steal_emoji 2020-07-09 09:23:21 +00:00
Dym Sohin 6e54972252 added link to changelog, removed repetition 2020-07-09 03:15:51 +00:00
lain 6335b32aa8 Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop' 
[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting

Closes #1895

See merge request pleroma/pleroma!2731
 2020-07-08 10:55:03 +00:00
Haelwenn (lanodan) Monnier 31fef95e35
Add changelog and documentation 2020-07-08 06:29:24 +02:00
Haelwenn (lanodan) Monnier 312fc55f14
Add [:instances_favicons, :enabled] setting, defaults to false 2020-07-08 06:28:40 +02:00
Ivan Tashkinov 20461137a3 [#1895] Documentation hints on private instances and instance/restrict_unauthenticated setting. 2020-07-07 20:44:16 +03:00
Ivan Tashkinov 3e08e77151 [#1895] Made hashtag timeline respect :restrict_unauthenticated instance setting. 2020-07-07 20:37:11 +03:00
lain 1adda637d3 Docs: Document resetting of images 2020-07-07 16:53:12 +02:00
lain 729506c56a Docs: document instance differences 2020-07-06 11:16:58 +02:00
lain 2e21ae1b6d Docs: Add description limits to cheat sheet 2020-07-06 11:08:53 +02:00
lain 01695716c8 Docs: Document accepts_chat_messages setting. 2020-07-03 15:55:18 +02:00
lain b374fd622b Docs: Document the added accepts_chat_messages user property. 2020-07-03 14:24:54 +02:00
Mark Felder 02d855b2b9 Document the new API extension of /api/v1/instance 2020-07-02 12:59:45 -05: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 577da132da Merge branch '1031-parent-visible' into 'develop' 
Resolve "Add `pleroma.parent_visible` to the status view"

Closes #1031

See merge request pleroma/pleroma!2679
 2020-06-29 08:39:51 +00:00
Haelwenn (lanodan) Monnier efb5d64e50
differences_in_mastoapi_responses: Update account fields 2020-06-29 02:40:32 +02:00
Mark Felder 69848d5c97 Rename notification "privacy_option" setting 2020-06-26 12:45:46 -05:00
Mark Felder fd5e797379 Simplify notification filtering settings further 2020-06-26 11:24:28 -05:00
Mark Felder b950fb01db Merge branch 'develop' into refactor/notification_settings 2020-06-26 10:23:19 -05:00
Mark Felder 433c01b370 Merge branch 'develop' into refactor/notification_settings 2020-06-25 14:26:21 -05:00
Alex Gleason 28d4e60f66
MastoAPI differences: Document not implemented features 2020-06-25 12:32:06 -05:00
lain 637bae42b4 Docs: Document added parent_visible field. 2020-06-24 13:31:42 +02:00
Roman Chvanikov 1471b70ef1 Merge develop 2020-06-23 20:56:55 +03:00