Alexander Strizhakov
7dc275b69b
relay fix for admin-fe
2020-08-19 08:41:39 +03: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
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
368fd04b47
Cheatsheet: Add information about filename descriptions
2020-08-18 13:22:00 +02:00
lain
34b099fffa
Merge branch 'issue/1936' into 'develop'
...
[#1936 ] Ability to search for banned MediaProxy URLs 
See merge request pleroma/pleroma!2873
2020-08-17 13:05:20 +00:00
lain
e154fcf525
Merge branch '2046-default-restrict-unauthenticated-basing-on-instance-privacy' into 'develop'
...
[#2046 ] Defaulted pleroma/restrict_unauthenticated basing on instance privacy
Closes #2046
See merge request pleroma/pleroma!2890
2020-08-17 12:26:53 +00:00
Ivan Tashkinov
60ac83a4c1
[ #2046 ] Added test for pleroma/restrict_unauthenticated defaults on private instance. Updated docs and changelog.
2020-08-15 18:30:20 +03:00
rinpatch
4fcf272717
Docs: Fix the way tabs are declared
...
Since python doesn't have a way to lock deps for a particlar project
by default, I didn't bother with it. This resulted in mkdocs updating at
some point, bringing a breaking change to how tabs are declared and
broken tabs on docs-develop.pleroma.social. I've learned my lesson
and locked deps with pipenv in pleroma/docs!5. This MR updates Pleroma
docs to use the new tab style, fortunately my editor did most of it.
Closes #2045
2020-08-15 09:55:59 +03:00
Farhan Khan
e8c20c42cd
minor changes
2020-08-14 00:21:42 -04:00
Farhan Khan
a5144f05c2
Removed a trailing comment
2020-08-13 22:49:50 -04:00
Farhan Khan
816c04abdc
Updates
2020-08-13 22:38:23 -04:00
Farhan Khan
b0c456d18d
more acme.sh updates
2020-08-13 22:18:33 -04:00
Farhan Khan
f2665547f5
acme updates
2020-08-13 21:24:08 -04:00
Farhan Khan
24eb917dbc
Rearranging acme
2020-08-13 20:58:46 -04:00
Farhan Khan
cba9f368af
Added comment
2020-08-13 19:34:04 -04:00
Farhan Khan
b5f48275c5
Minor patch update
2020-08-13 19:08:13 -04:00
Farhan Khan
33ea430f3b
acme.sh and netbsd to freebsd updates
2020-08-13 18:59:14 -04:00
Farhan Khan
53c4215ef1
Updated some more instruction specifics.
2020-08-13 18:59:14 -04:00
Farhan Khan
f6686a64af
Updated ssl and domain name updates
...
Removed the reference to niaa
2020-08-13 18:59:14 -04:00
Farhan Khan
da5aca27a8
Minor reorganization
2020-08-13 18:59:13 -04:00
Farhan Khan
07376bd21a
Adding installation documentation for FreeBSD + rc.d script
2020-08-13 18:59:13 -04:00
feld
14a06e63f6
Merge branch 'fix/activity-expirations-again' into 'develop'
...
Fix activity expirations again
See merge request pleroma/pleroma!2866
2020-08-13 17:38:19 +00:00
Maksim Pechnikov
56470647de
Merge branch 'develop' into issue/1936
2020-08-13 09:00:25 +03:00
feld
a94210c70b
Merge branch 'docs_improve_static_dir_documentation' into 'develop'
...
Improve static_dir documentation
See merge request pleroma/pleroma!2864
2020-08-12 16:39:19 +00:00
feld
3aa7969ff9
Update robots_txt.md
2020-08-12 16:19:34 +00:00
Mark Felder
091da10832
Add the ActivityExpirationPolicy MRF to docs and clarify post expiration criteria.
2020-08-12 11:00:01 -05:00
Maksim Pechnikov
644effc63b
update docs
2020-08-12 08:51:09 +03:00
lain
93fbf39954
Merge branch 'revert-a6d3bb5f' into 'develop'
...
Revert "Merge branch 'issue/1023' into 'develop'"
Closes #2033
See merge request pleroma/pleroma!2868
2020-08-10 13:59:38 +00:00
lain
73af60d02f
Merge branch 'develop' into 'develop'
...
docs: add cmake to other installation guides
Closes #2039
See merge request pleroma/pleroma!2870
2020-08-10 13:47:02 +00:00
Alibek Omarov
a2f2ba3fbb
docs: add cmake to other installation guides
2020-08-10 16:24:45 +03:00
lain
4d76c0ec8b
Docs: Add cmake dependency
2020-08-10 15:12:45 +02:00
lain
5c4548d5e7
Revert "Merge branch 'issue/1023' into 'develop'"
...
This reverts merge request !2763
2020-08-10 13:05:13 +00:00
Ilja
bd7bf6cd19
Apply 1 suggestion(s) to 1 file(s)
2020-08-10 11:29:54 +00:00
Ilja
a4a2d38640
Apply 1 suggestion(s) to 1 file(s)
2020-08-10 11:29:40 +00:00
Egor Kislitsyn
e5557bf8ba
Add mix task to add expiration to all local statuses
2020-08-08 16:29:40 +04:00
Ilja
e0dee833f2
Improve static_dir documentation
...
* It was still written for From Source installs. Now it's both OTP and From Source
* I linked to the cheatsheet where it was about configuration
* I moved the mix tasks of the robot.txt section to the CLI tasks and linked to it
* i checked the code at https://git.pleroma.social/pleroma/pleroma/-/blob/develop/lib/mix/tasks/pleroma/robotstxt.ex and it doesn't seem to more than just this one command with this option
* I also added the location of robot.txt and an example to dissallow everything, but allow the fediverse.network crawlers
* The Thumbnail section still linked to distsn.org which doesn't exist any more. I changed it to a general statemant that it can be used by external applications. (I don't know any that actually use it.)
* Both the logo and TOS need an extra `static` folder. I've seen confusion about that in #pleroma so I added an Important note.
2020-08-08 12:21:44 +02:00
Alex Gleason
4af1b80381
Clean up account aliases
2020-08-07 17:37:15 -05:00
Alex Gleason
1a5a7ba6e8
Merge remote-tracking branch 'upstream/develop' into aliases
2020-08-07 16:35:15 -05:00
Mark Felder
54e2af8293
Merge branch 'develop' into fix/ldap-auth-issues
2020-08-07 14:55:22 -05:00
lain
60fe0a08f0
Docs: Remove wrong / confusing auth docs.
2020-08-07 17:59:55 +02:00
lain
199ad47c22
Docs: Add OTP commands to frontend docs.
2020-08-07 17:04:44 +02:00
Mark Felder
6ddea8ebe8
Add a note about the proper value for uid
2020-08-07 09:42:10 -05:00
lain
532d6f94ae
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
2020-08-04 15:10:36 +02:00
lain
28584bb224
Merge branch 'email-blacklist' into 'develop'
...
Add email blacklist, fixes #1404
Closes #1404
See merge request pleroma/pleroma!2837
2020-08-04 11:00:30 +00:00
lain
e3953923ac
Merge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' into 'develop'
...
fixes 1957 Add option to send user chatmessage instead of dm
Closes #1957
See merge request pleroma/pleroma!2782
2020-08-03 21:01:56 +00:00
lain
8b1da33a54
Docs: Add info about installing from a local path.
2020-08-03 17:50:53 +02:00
lain
5c2745725e
Docs: Document installation of frontends
...
Co-authored-by: Roman Chvanikov <chvanikoff@pm.me>
2020-08-03 17:44:59 +02:00
lain
56b5b9aa27
Merge branch 'follower-mrf-again' into 'develop'
...
Follower mrf again
See merge request pleroma/pleroma!2833
2020-08-03 14:22:11 +00:00
Alex Gleason
dc88b6f091
Add email blacklist, fixes #1404
2020-08-02 14:53:42 -05:00
swentel
0012894d4e
Add indigenous to clients
2020-08-02 19:33:22 +02:00
Ilja
f671d7e68c
Add welcome chatmessages
...
* I added the option in config/config.exs
* created a new module lib/pleroma/user/welcome_chat_message.ex
* Added it to the registration flow
* added to the cheatsheet
* added to the config/description.ex
* added to the Changelog.md
2020-08-02 15:54:59 +02:00
lain
4b18a07392
Revert "Merge branch 'revert-1ac0969c' into 'develop'"
...
This reverts merge request !2825
2020-07-31 15:18:04 +00:00
lain
010d77ec85
Revert "Merge branch 'mrf-silence-2' into 'develop'"
...
This reverts merge request !2820
2020-07-31 15:17:09 +00:00
lain
1ac0969c72
Merge branch 'mrf-silence-2' into 'develop'
...
MRF silencing alternative solution
See merge request pleroma/pleroma!2820
2020-07-31 14:43:33 +00:00
lain
37b9e5e138
Apply 1 suggestion(s) to 1 file(s)
2020-07-31 10:29:16 +00:00
Mark Felder
052833f8ee
Fix example json response
2020-07-30 15:57:41 -05:00
Mark Felder
24169ae2e6
Merge branch 'develop' into fix/configdb-otp-instructions
2020-07-30 13:04:49 -05:00
Mark Felder
cfc6484c40
OTP users need Pleroma running to execute pleroma_ctl, so reorganize instructions.
2020-07-30 12:37:56 -05:00
Mark Felder
1f24186036
Attempt to fix markdown formatting
2020-07-30 12:01:46 -05:00
lain
873ff5ce14
Merge branch 'hide-reactions' into 'develop'
...
Let favourites and emoji reactions optionally be hidden
See merge request pleroma/pleroma!2804
2020-07-30 12:41:47 +00:00
Mark Felder
33f0427809
Expose seconds_valid in Pleroma Captcha API endpoint
2020-07-29 16:07:22 -05:00
Alex Gleason
702f0fb822
Merge remote-tracking branch 'upstream/develop' into mrf-silence
2020-07-29 13:01:16 -05:00
Alex Gleason
93638935d7
SimpleMRF: :silence --> :followers_only
2020-07-29 12:58:08 -05:00
Alex Gleason
d8a01c9432
Merge remote-tracking branch 'upstream/develop' into hide-reactions
2020-07-29 12:43:39 -05:00
lain
dc36d6e9d2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin
2020-07-29 16:24:22 +02:00
lain
a6d3bb5f30
Merge branch 'issue/1023' into 'develop'
...
[#1023 ] added generated `pleroma.env`
See merge request pleroma/pleroma!2763
2020-07-29 13:45:15 +00:00
lain
79f9ddd8b7
Merge branch 'by-approval' into 'develop'
...
Registrations "by approval" mode
Closes #1931
See merge request pleroma/pleroma!2757
2020-07-29 11:27:26 +00:00
lain
54afb35685
Cheatsheet: Update frontends information.
2020-07-29 13:06:51 +02:00
Alex Gleason
3c90f7f715
SimpleMRF: Let instances be silenced
2020-07-28 19:06:42 -05:00
Alex Gleason
3b7c454418
Let favourites and emoji reactions optionally be hidden
2020-07-28 14:58:30 -05:00
lain
81350faa8e
Cheatsheet: Add even more info.
2020-07-28 17:50:32 +02:00
lain
393128fb02
Cheatsheet: Add more info.
2020-07-28 17:48:35 +02:00
lain
08732e8a03
Docs: Add frontend info to cheat sheet.
2020-07-28 17:46:37 +02:00
Alex Gleason
520dce857e
Add :registration_reason_length to description.exs
2020-07-27 15:24:20 -05:00
Alex Gleason
6747bf2e16
Merge remote-tracking branch 'upstream/develop' into by-approval
2020-07-27 12:29:18 -05:00
Alex Gleason
6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval
2020-07-26 15:46:14 -05:00
Maksim Pechnikov
67ab9a7928
Merge branch 'develop' into issue/1934-welcome-email
2020-07-23 16:36:27 +03:00
Maksim Pechnikov
5879d36854
fix sender for welcome email
2020-07-22 15:34:47 +03:00
Maksim Pechnikov
8d6f7aec21
Merge branch 'develop' into issue/1023
2020-07-22 09:24:16 +03:00
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
Maksim Pechnikov
3edaecae96
added welcome email
2020-07-21 09:25:53 +03:00
Alex Gleason
d0eb43b58b
Add account aliases
2020-07-17 16:17:49 -05: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
Maksim Pechnikov
5fcb3e8738
fix docs
2020-07-16 16:35:09 +03:00
Maksim Pechnikov
6c59fe259d
Merge branch 'develop' into issue/1023
2020-07-16 08:53:21 +03: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
Alex Gleason
48983e9421
Merge remote-tracking branch 'upstream/develop' into by-approval
2020-07-14 18:56:40 -05:00
Alex Gleason
20d24741af
AdminAPI: Add PATCH /api/pleroma/admin/users/approve
endpoint
2020-07-14 18:02:44 -05:00
Alex Gleason
33f1b29b2c
AdminAPI: Filter users by need_approval
2020-07-14 14:29:03 -05:00
Alex Gleason
b750129da1
AdminAPI: Return approval_pending
with users
2020-07-14 13:47:05 -05:00
Alex Gleason
a1570ba6ad
AdminAPI: Return registration_reason
with users
2020-07-14 13:08:39 -05: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
Maksim Pechnikov
3062f86613
added generated pleroma.env
2020-07-14 09:05:34 +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
Alex Gleason
51ab8d0128
Add account_approval_required
instance setting
2020-07-12 20:27:58 -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
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
lain
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
lain
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
lain
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
Ilja
499324f7be
Removed a space that was too much
2020-06-22 14:22:23 +02:00
Ilja
1e089cdf29
I forgot to git add some files, oops (should be squashed with MR)
2020-06-22 14:18:55 +02:00
Ilja
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
Ilja
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
lain
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
Alexander Strizhakov
c5863438ba
proper error codes for error in adminFE
2020-06-20 13:53:57 +03:00
Haelwenn (lanodan) Monnier
15ba539258
cheatsheet.md: no_attachment_links → attachment_links
2020-06-20 11:39:06 +02:00
Alexander Strizhakov
02ca8a363f
default page size for files
2020-06-19 14:46:38 +03:00
Alexander Strizhakov
3e3f9253e6
adding overall count for packs and files
2020-06-19 10:17:24 +03:00
Alexander Strizhakov
4975ed86bc
emoji pagination for pack show action
2020-06-18 18:50:03 +03:00
Maksim
abfb1c756b
Apply suggestion to docs/API/admin_api.md
2020-06-17 12:56:17 +00:00
Maksim
90613348ed
Apply suggestion to docs/API/admin_api.md
2020-06-17 12:56:13 +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
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
Maksim Pechnikov
efdfc85c2d
update docs
2020-06-15 15:24:00 +03: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
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
Mark Felder
34593d6aa5
Merge branch 'develop' into features/mix-task-reset-mfa
2020-06-12 08:43:50 -05:00
Haelwenn (lanodan) Monnier
40970f6bb9
New mix task: pleroma.user reset_mfa <nickname>
2020-06-11 22:54:48 +02:00
Mark Felder
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
Roman Chvanikov
604a83ae3e
merge develop
2020-06-08 19:21:07 +03:00
Egor Kislitsyn
da22119c2f
Merge branch 'develop' into global-status-expiration
2020-06-08 17:21:47 +04:00
lain
89b85f6529
ChatController: Remove nonsensical pagination.
2020-06-08 11:09:53 +02:00
lain
1a2acce7c5
Docs: Document new mandatory parameter.
2020-06-07 20:23:17 +02:00
lain
680fa5fa36
Docs: Update docs on mark as read.
2020-06-07 15:41:46 +02:00
lain
c5e3f2454c
Docs: Unify parameters in examples.
2020-06-06 10:35:38 +02:00
lain
a8ca030d85
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-05 16:53:56 +02:00
lain
6e103a18af
Docs: Document WebPush changes.
2020-06-04 14:49:36 +02:00
lain
286bd8eb83
Docs: Add mark_message_as_read
to docs
2020-06-03 19:24:37 +02:00
Egor Kislitsyn
c16315d055
Add OpenAPI spec for AdminAPI.ReportController
2020-06-03 19:17:05 +04:00
Alibek Omarov
030240ee8f
docs: clients.md: Add Husky
2020-06-03 04:36:09 +00:00
lain
127ccc4e1c
NotificationController: Don't return chat_mentions by default.
2020-06-02 14:05:53 +02:00
Egor Kislitsyn
a7627bdc7a
Merge remote-tracking branch 'origin/develop' into global-status-expiration
2020-06-01 15:48:51 +04:00
lain
6ff079ca9f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-30 12:31:12 +02:00
rinpatch
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
feld
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
Mark Felder
1b586ff3ae
Document new database vacuum tasks
2020-05-29 10:17:06 -05:00
lain
32431ad1ee
Docs: Also add the streaming docs to the Chat api doc.
2020-05-29 16:07:40 +02:00
lain
b08baf905b
Docs: Document streaming differences
2020-05-29 16:03:55 +02:00
lain
af6d01ec93
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-29 12:36:17 +02:00
Alex Gleason
394258d548
Docs: Attachement limitations in MastoAPI differences
2020-05-28 16:11:33 -05:00
lain
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
Egor Kislitsyn
800e624058
Update installation guides
2020-05-28 19:32:56 +04:00
Mark Felder
9eea800026
Refactor notification settings
2020-05-28 10:16:09 -05:00
Alexander Strizhakov
3249141588
validate actor type
2020-05-27 10:14:22 +03:00
lain
af3568a6d9
Docs: sql -> SQL
2020-05-25 19:26:07 +02:00
lain
f7cb3f4cfc
Apply suggestion to docs/installation/otp_en.md
2020-05-25 17:11:35 +00:00
lain
6a85fe1f9d
Docs: Document reasonable Postgres settings.
2020-05-25 15:53:14 +02:00
lain
ee35bb5ac2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-25 13:57:27 +02:00
Roman Chvanikov
8eb1dfadca
Update CHANGELOG and docs
2020-05-22 18:30:13 +03:00
lain
578ed3a37f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-21 15:35:13 +02:00
lain
a42a0716ec
Merge branch 'features/emoji_stealer' into 'develop'
...
MRF.StealEmojiPolicy: New Policy
See merge request pleroma/pleroma!2385
2020-05-21 13:31:49 +00:00
lain
f166316f50
Merge branch 'openapi/pleroma-api/pleroma' into 'develop'
...
Add OpenAPI spec for PleromaAPI.PleromaAPIController
See merge request pleroma/pleroma!2564
2020-05-21 13:30:09 +00:00
lain
283fb1e05b
Merge branch 'issue/749' into 'develop'
...
[#749 ] unsubscribes of friends when user deactivated
See merge request pleroma/pleroma!2513
2020-05-21 13:27:44 +00:00
lain
814c3e5171
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-21 15:00:05 +02:00
lain
4ae2f75c3e
Apply suggestion to docs/administration/CLI_tasks/user.md
2020-05-21 10:27:06 +00:00
Maksim Pechnikov
9bc5e18ade
rename mix task: pleroma.user unsubscribe
-> pleroma.user deactivate
2020-05-21 08:06:57 +03:00
lain
265746b21f
Merge branch 'openapi/pleroma-api/emojis' into 'develop'
...
Add OpenAPI spec for EmojiPackController
See merge request pleroma/pleroma!2549
2020-05-20 12:08:28 +00:00
Egor Kislitsyn
490a3a34b6
Add OpenAPI spec for PleromaAPI.PleromaAPIController
2020-05-20 15:15:13 +04:00
Haelwenn
94ba5a7802
Merge branch 'exposed-background-image' into 'develop'
...
InstanceView: Expose background image link.
See merge request pleroma/pleroma!2545
2020-05-20 10:53:54 +00:00
lain
6dd1575c64
Merge branch 'issue/1509' into 'develop'
...
[#1509 ] purge media from cache after delete
See merge request pleroma/pleroma!2539
2020-05-20 10:35:36 +00:00
lain
5b8105928b
Docs: Add background_image in instance
2020-05-20 12:13:57 +02:00
Egor Kislitsyn
e4c720f14c
Fix typo
2020-05-19 14:59:50 +04:00
Haelwenn
58ccd2bbfd
Merge branch 'openapi/pleroma-api/mascot' into 'develop'
...
Add OpenAPI spec for MascotController
See merge request pleroma/pleroma!2553
2020-05-19 09:41:57 +00:00
Maksim Pechnikov
ed442a225a
removed Quantum from docs
2020-05-19 06:15:42 +03:00
Maksim Pechnikov
5f0a3ac74d
added tests
2020-05-19 06:05:09 +03:00
Egor Kislitsyn
d4a7577cde
Fix API documentation
2020-05-18 22:01:38 +04:00
lain
0d417e005d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-18 18:38:32 +02:00
lain
15c7e3b4bf
Merge branch 'docs/storing-remote-media' into 'develop'
...
Document how to store remote media permanently
See merge request pleroma/pleroma!1871
2020-05-18 11:59:07 +00:00
Roman Chvanikov
01bd6a1e54
Merge branch 'develop' into feature/admin-api-status-count-per-instance
2020-05-18 11:56:27 +03:00
Maksim Pechnikov
c33a4315fb
updated docs
2020-05-18 06:48:19 +03:00
lain
f012c3a202
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-15 13:33:04 +02:00
lain
1d18721a3c
Chats: Add updated_at to Schema and docs.
2020-05-15 13:18:41 +02:00
Stephanie Wilde-Hobbs
80308c5c26
Add config migration disclaimer to config whitelist documentation
2020-05-14 15:56:14 +01:00
Stephanie Wilde-Hobbs
20cbfb5cb5
Allow whitelisting whole groups
2020-05-14 12:43:53 +01:00
lain
41db52729e
Apply suggestion to docs/configuration/storing_remote_media.md
2020-05-14 09:14:59 +00:00
Haelwenn (lanodan) Monnier
e688d4ee69
MRF.StealEmojiPolicy: New Policy
...
Inspired by https://git.pleroma.social/moonman/emoji-stealer-mrf/-/blob/master/steal_emoji_policy.ex
2020-05-14 09:59:56 +02:00
lain
0f0acc740d
Chat: Allow posting without content if an attachment is present.
2020-05-13 15:31:28 +02:00
Stephanie Wilde-Hobbs
620247a015
Add database configuration whitelist
2020-05-12 17:12:27 +01:00
lain
a61120f497
Documention: Add chat message deletion docs
2020-05-12 13:25:25 +02:00
lain
8cc8d960af
Documentation: Add GET /chats/:id
2020-05-10 13:27:40 +02:00
lain
17be3ff669
Documentation: Add last_message to chat docs.
2020-05-10 13:01:20 +02:00
lain
e297d8c649
Documentation: Add attachment docs
2020-05-10 12:34:12 +02:00
Roman Chvanikov
4c19702390
Add docs
2020-05-09 14:32:08 +03:00
lain
7637ef4203
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-08 13:13:37 +02:00
Maksim Pechnikov
b078e0567d
Merge branch 'develop' into issue/1276-2
2020-05-08 08:51:09 +03:00
lain
fb2d284d28
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-07 15:05:40 +02:00
Maksim
3d0c567fbc
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
2020-05-07 08:14:54 +00:00
lain
1748e26948
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-06 17:36:08 +02:00
Mark Felder
d7537a37c7
Add :chat to cheatsheet
2020-05-06 08:55:09 -05:00
Maksim Pechnikov
bd261309cc
added unread_notifications_count
for /api/v1/accounts/verify_credentials
2020-05-06 15:08:38 +03:00
lain
205313e541
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-06 11:44:30 +02:00
Maksim Pechnikov
fb38b7339c
Merge branch 'develop' into issue/1276-2
2020-05-06 05:55:39 +03:00
lain
42a2acac46
Merge branch 'feature/1720-status-view' into 'develop'
...
Admin API fetch status by id
Closes #1720
See merge request pleroma/pleroma!2475
2020-05-05 13:40:12 +00:00
Alexander Strizhakov
e7d8ab8303
admin_api fetch status by id
2020-05-05 16:18:56 +03:00
Egor Kislitsyn
cc922e7d8c
Document configuration for Pleroma.Web.ApiSpec.CastAndValidate
2020-05-05 15:01:33 +04:00
Egor Kislitsyn
decaa64f75
Merge branch 'develop' into global-status-expiration
2020-05-05 14:28:54 +04:00
lain
7ff2a7dae2
Docs: Add Chat mark_as_read docs
2020-05-04 13:12:21 +02:00
lain
c40afe5ba0
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-04 10:43:20 +02:00
Maksim Pechnikov
fe7a0d660e
Merge branch 'develop' into issue/1276-2
2020-05-04 06:08:49 +03:00
lain
095635453a
Replace deprecated Roma by Fedi.
2020-05-02 18:10:50 +00:00
rinpatch
3126f8a334
Merge branch 'feature/1710-consolidate-instance-info' into 'develop'
...
Feature/1710 consolidate instance info
Closes #1710
See merge request pleroma/pleroma!2430
2020-05-02 16:44:55 +00:00
lain
2008fa9c7f
Merge branch 'fix/captcha' into 'develop'
...
Fix account registration when captcha is enabled but not provided
Closes #1712
See merge request pleroma/pleroma!2438
2020-05-01 11:47:58 +00:00
Maksim Pechnikov
a92c713d9c
Merge branch 'develop' into issue/1276-2
2020-05-01 06:21:59 +03:00
Alexander Strizhakov
631e8c1feb
docs update
2020-04-30 16:09:23 +03:00
Alexander Strizhakov
1fd40532ae
docs fix
2020-04-30 16:09:23 +03:00
Alexander Strizhakov
1c1b7e22af
list of options for pack metadata
2020-04-30 16:09:22 +03:00
Alexander Strizhakov
ddb757f743
emoji api packs changes in routes with docs update
2020-04-30 16:09:18 +03:00
Alexander Strizhakov
95759310ab
docs update
2020-04-30 15:45:56 +03:00
Alexander Strizhakov
5839e67eb8
return data only for updated emoji
2020-04-30 15:24:02 +03:00
lain
528ea779a6
Apply suggestion to docs/API/chats.md
2020-04-29 17:56:24 +00:00
Egor Kislitsyn
8148d76ec5
Document captcha_answer_data
parameter
2020-04-29 21:26:07 +04:00
lain
0c491b904d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-29 13:19:04 +02:00
Ivan Tashkinov
908cf22a6c
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
...
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
2020-04-28 19:56:20 +03:00
lain
30ea6bb167
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-28 17:48:05 +02:00
Mark Felder
4b3298133b
Document DELETE /api/v1/notifications/destroy_multiple
2020-04-28 10:13:58 -05:00
lain
b5dc59c8fa
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-28 14:16:21 +02:00
Egor Kislitsyn
764b4f95a8
Merge branch 'develop' into global-status-expiration
2020-04-28 14:13:53 +04:00
Maksim Pechnikov
270c3fe446
fix markdown format
2020-04-28 06:45:59 +03:00
lain
b550ef5611
Docs: Align chat api changes with docs.
2020-04-27 17:52:16 +02:00
lain
4cadaf7e96
Docs: Add /api/v1/instance
information
2020-04-27 14:33:21 +02:00
lain
e62f8542a1
Docs: Add chat motivation and api description.
2020-04-27 13:48:09 +02:00
Egor Kislitsyn
f1ca917bb0
Merge branch 'develop' into openapi/account
2020-04-27 14:33:00 +04:00
lain
c86143ed73
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-27 12:07:08 +02:00
Alex Gleason
1bd9749a8f
Let blob: pass CSP
2020-04-26 00:29:42 -05:00
Egor Kislitsyn
c56c0a3d23
Merge branch 'develop' into global-status-expiration
2020-04-24 18:37:58 +04:00
lain
8480f84615
Update differences_in_mastoapi_responses.md
2020-04-24 15:43:54 +03:00
Alexander
be34672d67
formatting
2020-04-24 15:43:54 +03:00
Alexander
6e625a427c
reply filtering
2020-04-24 15:43:49 +03:00
lain
a51cdafc01
Docs: Add documentation about chatmessages
2020-04-23 16:55:50 +02:00
Egor Kislitsyn
1b06a27746
Update Flake ID description
2020-04-22 20:20:19 +04:00
Ivan Tashkinov
0062116e07
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
...
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
2020-04-22 18:51:59 +03:00
Ivan Tashkinov
2958a7d246
Fixed OAuth restrictions for :api routes. Made auth info dropped for :api routes if OAuth check was neither performed nor explicitly skipped.
2020-04-22 18:50:25 +03:00
lain
c466e739b6
Merge branch 'docs/debian-packages' into 'develop'
...
debian_based_*.md: Use erlang-nox metapackage
See merge request pleroma/pleroma!2268
2020-04-22 12:10:27 +00:00
lain
568f48435e
Apply suggestion to docs/installation/debian_based_en.md
2020-04-22 12:10:20 +00:00
Ivan Tashkinov
f685cbd309
Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
2020-04-21 16:29:19 +03:00
Egor Kislitsyn
364eecc49f
Merge branch 'develop' into global-status-expiration
2020-04-20 20:37:56 +04:00
Alex Gleason
bedc558809
Merge remote-tracking branch 'upstream/develop' into accept-deletes
2020-04-20 10:15:40 -05:00
Alex Gleason
b54c8813d6
Add :reject_deletes option to SimplePolicy
2020-04-20 10:11:06 -05:00
lain
617a9f6208
Merge branch 'mrf-docs-update' into 'develop'
...
Expand MRF SimplePolicy docs
See merge request pleroma/pleroma!2370
2020-04-20 12:57:45 +00:00
Haelwenn
a17bfb5fab
Merge branch 'feature/1584-client-captcha-options' into 'develop'
...
Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252
2020-04-17 09:19:35 +00:00
Alexander Strizhakov
72ef6cc4f2
added need_reboot endpoint to admin api
2020-04-16 16:03:26 +03:00
Maksim Pechnikov
4b3b1fec4e
added an endpoint for getting unread notification count
2020-04-15 21:19:43 +03:00
Ilja
aa0a4a1e78
small fix in the rewrite_policy example
2020-04-15 19:03:27 +02:00
lain
4576520461
Revert "Merge branch 'issue/1276' into 'develop'"
...
This reverts merge request !1877
2020-04-14 16:32:22 +00:00
Maksim Pechnikov
a16b3dbcbf
Merge branch 'develop' into issue/1276
2020-04-13 21:19:27 +03:00
Alex Gleason
ed894802d5
Expand MRF SimplePolicy docs
2020-04-12 18:46:47 -05:00
Egor Kislitsyn
7f692343c8
Merge branch 'develop' into global-status-expiration
2020-04-10 14:20:48 +04:00
lain
b87b798ca1
Merge branch 'fix/1658-invite-send' into 'develop'
...
Error improvement for email_invite endpoint
See merge request pleroma/pleroma!2344
2020-04-09 10:42:43 +00:00
Alexander Strizhakov
c8bfbf511e
Apply suggestion to docs/API/admin_api.md
2020-04-09 10:17:24 +00:00
Maksim Pechnikov
2b7d7bbd2d
Merge branch 'develop' into issue/1276
2020-04-07 14:09:43 +03:00
lain
1d4ab06505
Merge branch 'featureflag/emoji_reactions' into 'develop'
...
Add emoji reactions to features in nodeinfo
See merge request pleroma/pleroma!2313
2020-04-06 12:51:35 +00:00