b2d398b1d0
Merge branch 'develop' into refactor/gun-pool-registry
2020-07-15 13:34:27 -05:00
9d30bacace
Merge branch 'develop' into refactor/notification_settings
2020-07-15 09:30:23 -05:00
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
48983e9421
Merge remote-tracking branch 'upstream/develop' into by-approval
2020-07-14 18:56:40 -05:00
20d24741af
AdminAPI: Add `PATCH /api/pleroma/admin/users/approve` endpoint
2020-07-14 18:02:44 -05:00
33f1b29b2c
AdminAPI: Filter users by `need_approval`
2020-07-14 14:29:03 -05:00
b750129da1
AdminAPI: Return `approval_pending` with users
2020-07-14 13:47:05 -05:00
a1570ba6ad
AdminAPI: Return `registration_reason` with users
2020-07-14 13:08:39 -05:00
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
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
8d56fb6d22
Migrate in-db config after updating to Oban 2.0
2020-07-14 13:15:46 +03:00
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
3062f86613
added generated `pleroma.env`
2020-07-14 09:05:34 +03:00
80c21100db
Merge branch 'develop' into refactor/notification_settings
2020-07-13 13:32:21 -05:00
442fe3cd45
Show examples for both OTP and source
2020-07-13 09:56:05 -05:00
51ab8d0128
Add `account_approval_required` instance setting
2020-07-12 20:27:58 -05:00
0871e8b8fe
Make the query more precise
2020-07-12 10:43:24 -05:00
133004e22d
Improve database config migration and add documentation
2020-07-12 10:38:07 -05:00
b376442325
MediaProxy whitelist setting now supports hosts with scheme
...
added deprecation warning about using bare domains
2020-07-12 12:41:40 +03:00
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
d885540590
docs: API: fix update_credentials endpoints path, clarify update/verify_credentials endpoints paths
2020-07-11 11:02:13 +00:00
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
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
b39eb6ecc5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
2020-07-10 12:26:53 +02:00
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
b1b8f5f11a
docs and descriptions for s3 settings
2020-07-10 09:16:53 +03:00
c2edfd16e0
fix for user revoke invite task
2020-07-09 18:59:15 +03:00
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
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
6465257e1f
missed `:` (colon) before mrf_steal_emoji
2020-07-09 09:23:21 +00:00
6e54972252
added link to changelog, removed repetition
2020-07-09 03:15:51 +00:00
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
31fef95e35
Add changelog and documentation
2020-07-08 06:29:24 +02:00
312fc55f14
Add [:instances_favicons, :enabled] setting, defaults to false
2020-07-08 06:28:40 +02:00
20461137a3
[ #1895 ] Documentation hints on private instances and instance/restrict_unauthenticated setting.
2020-07-07 20:44:16 +03:00
3e08e77151
[ #1895 ] Made hashtag timeline respect `:restrict_unauthenticated` instance setting.
2020-07-07 20:37:11 +03:00
1adda637d3
Docs: Document resetting of images
2020-07-07 16:53:12 +02:00
729506c56a
Docs: document instance differences
2020-07-06 11:16:58 +02:00
2e21ae1b6d
Docs: Add description limits to cheat sheet
2020-07-06 11:08:53 +02:00
01695716c8
Docs: Document `accepts_chat_messages` setting.
2020-07-03 15:55:18 +02:00
b374fd622b
Docs: Document the added `accepts_chat_messages` user property.
2020-07-03 14:24:54 +02:00
02d855b2b9
Document the new API extension of /api/v1/instance
2020-07-02 12:59:45 -05:00
8daacc9114
AutoLinker --> Linkify, update to latest version
...
https://git.pleroma.social/pleroma/elixir-libraries/linkify
2020-06-30 16:39:15 -05:00
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
efb5d64e50
differences_in_mastoapi_responses: Update account fields
2020-06-29 02:40:32 +02:00
69848d5c97
Rename notification "privacy_option" setting
2020-06-26 12:45:46 -05:00
fd5e797379
Simplify notification filtering settings further
2020-06-26 11:24:28 -05:00
b950fb01db
Merge branch 'develop' into refactor/notification_settings
2020-06-26 10:23:19 -05:00
433c01b370
Merge branch 'develop' into refactor/notification_settings
2020-06-25 14:26:21 -05:00
28d4e60f66
MastoAPI differences: Document not implemented features
2020-06-25 12:32:06 -05:00
637bae42b4
Docs: Document added parent_visible field.
2020-06-24 13:31:42 +02:00
1471b70ef1
Merge develop
2020-06-23 20:56:55 +03:00
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
59e2a1018a
Merge branch 'fix_1586_provide_index_md' into 'develop'
...
Fix 1586 provide index md
See merge request pleroma/pleroma!2669
2020-06-23 10:06:47 +00:00
31489bc864
Merge branch 'docs_use_include_for_install_further_reading' into 'develop'
...
Add include for the "Further reading" section
See merge request pleroma/pleroma!2667
2020-06-22 12:35:00 +00:00
8b5bdd164e
Merge branch 'fix/1825-admin-api-error-codes' into 'develop'
...
Proper error codes for error in adminFE
Closes #1825
See merge request pleroma/pleroma!2665
2020-06-22 12:25:12 +00:00
499324f7be
Removed a space that was too much
2020-06-22 14:22:23 +02:00
1e089cdf29
I forgot to git add some files, oops (should be squashed with MR)
2020-06-22 14:18:55 +02:00
a3b10a4f64
Fix 1586 Docs: provide a index.md
...
* I renamed the introduction.md to index.md
* I moved over the FE parts to an index file in the FE repo (will do an MR in the FE repo to actually add it)
* While I was at it, I also fixed some broken links
2020-06-22 14:13:30 +02:00
9f7ee5dfa2
Add include for the "Further reading" section
...
* I added an include and use this include for the installation guides that already had this section
* I added the "Further reading" section as well as te "Questions" section to the English guides that didn't have it yet
* I added a first point "How Federation Works/Why is my Federated Timeline empty?" to link to lains blogpost about this because we still get this question a lot in the #pleroma support channel
* I reordered the list a bit
2020-06-22 11:41:22 +02:00
93ae1c8bd3
Merge branch 'feature/1854-emoji-pagination' into 'develop'
...
Emoji and packs pagination
Closes #1854
See merge request pleroma/pleroma!2658
2020-06-22 08:41:09 +00:00
c5863438ba
proper error codes for error in adminFE
2020-06-20 13:53:57 +03:00
15ba539258
cheatsheet.md: no_attachment_links → attachment_links
2020-06-20 11:39:06 +02:00
02ca8a363f
default page size for files
2020-06-19 14:46:38 +03:00
3e3f9253e6
adding overall count for packs and files
2020-06-19 10:17:24 +03:00
4975ed86bc
emoji pagination for pack show action
2020-06-18 18:50:03 +03:00
abfb1c756b
Apply suggestion to docs/API/admin_api.md
2020-06-17 12:56:17 +00:00
90613348ed
Apply suggestion to docs/API/admin_api.md
2020-06-17 12:56:13 +00:00
b66e6eb521
fixes for tests
2020-06-16 19:03:45 +03:00
ed189568f3
moving mrf settings from instance to separate group
2020-06-16 18:32:18 +03:00
579763126f
Merge branch 'develop' into issue/1855
2020-06-15 15:24:55 +03:00
efdfc85c2d
update docs
2020-06-15 15:24:00 +03:00
2e8a236cef
fix invalidates media url's
2020-06-14 21:02:57 +03:00
cb7be6eef2
Remove use of atoms in MRF.UserAllowListPolicy
2020-06-13 12:08:46 +03:00
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
34593d6aa5
Merge branch 'develop' into features/mix-task-reset-mfa
2020-06-12 08:43:50 -05:00
40970f6bb9
New mix task: pleroma.user reset_mfa <nickname>
2020-06-11 22:54:48 +02:00
7c47f791a8
Add command to reload emoji packs from cli for OTP users
...
Not useful for source releases as we don't have a way to automate connecting to the running instance.
2020-06-10 13:02:08 -05:00
604a83ae3e
merge develop
2020-06-08 19:21:07 +03:00
da22119c2f
Merge branch 'develop' into global-status-expiration
2020-06-08 17:21:47 +04:00
89b85f6529
ChatController: Remove nonsensical pagination.
2020-06-08 11:09:53 +02:00
1a2acce7c5
Docs: Document new mandatory parameter.
2020-06-07 20:23:17 +02:00
680fa5fa36
Docs: Update docs on mark as read.
2020-06-07 15:41:46 +02:00
c5e3f2454c
Docs: Unify parameters in examples.
2020-06-06 10:35:38 +02:00
a8ca030d85
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-05 16:53:56 +02:00
6e103a18af
Docs: Document WebPush changes.
2020-06-04 14:49:36 +02:00
286bd8eb83
Docs: Add `mark_message_as_read` to docs
2020-06-03 19:24:37 +02:00
c16315d055
Add OpenAPI spec for AdminAPI.ReportController
2020-06-03 19:17:05 +04:00
030240ee8f
docs: clients.md: Add Husky
2020-06-03 04:36:09 +00:00
127ccc4e1c
NotificationController: Don't return chat_mentions by default.
2020-06-02 14:05:53 +02:00
a7627bdc7a
Merge remote-tracking branch 'origin/develop' into global-status-expiration
2020-06-01 15:48:51 +04:00
6ff079ca9f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-30 12:31:12 +02:00
32ba2b7f9f
Merge branch 'media-docs' into 'develop'
...
Docs: Attachement limitations in MastoAPI differences
See merge request pleroma/pleroma!2607
2020-05-29 21:20:36 +00:00
81db758e8e
Merge branch 'mix/database-vacuum-options' into 'develop'
...
Database vacuum mix task
See merge request pleroma/pleroma!2599
2020-05-29 15:33:35 +00:00
1b586ff3ae
Document new database vacuum tasks
2020-05-29 10:17:06 -05:00
32431ad1ee
Docs: Also add the streaming docs to the Chat api doc.
2020-05-29 16:07:40 +02:00
b08baf905b
Docs: Document streaming differences
2020-05-29 16:03:55 +02:00
af6d01ec93
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-29 12:36:17 +02:00
394258d548
Docs: Attachement limitations in MastoAPI differences
2020-05-28 16:11:33 -05:00
f6ddf0cc50
Merge branch 'feature/1792-update-actor-type' into 'develop'
...
Validate actor type
See merge request pleroma/pleroma!2593
2020-05-28 16:58:28 +00:00
Mark Felder