b923842e96
Merge remote-tracking branch 'origin/develop' into reactions
2019-09-30 13:57:54 +02:00
1d7cbdaf7b
change new scrobble endpoint
2019-09-30 10:39:48 +00:00
a6e1469767
router: change scrobble timeline route from now-playing to scrobbles
2019-09-30 10:39:48 +00:00
5fd29edac4
docs: add scrobble API description
2019-09-30 10:39:17 +00:00
717cb4f933
admin_api.md: Put data-type info as the values
...
Similar to how the other responses examples are done,
this also makes it proper JSON (as it doesn’t have comments).
2019-09-29 02:14:53 +02:00
0e59d1dc04
Update admin_api.md
2019-09-29 00:01:35 +03:00
f9380289eb
Add `remote_ip` plug
2019-09-27 21:59:23 +00:00
c4fbb56984
Merge branch 'patch-2' into 'develop'
...
Minor corrections and clarification for Alpine standard v.3.10
See merge request pleroma/pleroma!1594
2019-09-27 03:50:36 +00:00
0e280354d9
Merge branch 'update/docs-jp' into 'develop'
...
Update Japanese document to follow English document
See merge request pleroma/pleroma!1615
2019-09-27 03:49:00 +00:00
01a7e20c32
Merge branch 'list-packs-docs' into 'develop'
...
Add list_from endpoint to the pleroma_api docs
See merge request pleroma/pleroma!1720
2019-09-27 03:46:53 +00:00
8df3a63ce9
Merge branch 'patch-1' into 'develop'
...
Fix code block for admin api document
See merge request pleroma/pleroma!1722
2019-09-27 03:46:34 +00:00
39a4892929
Add docs
2019-09-26 19:20:47 +03:00
f249b2381f
Fix code block for admin api document
2019-09-26 16:10:34 +00:00
fc16bec317
Add list_from endpoint to the pleroma_api docs
2019-09-26 09:50:53 +02:00
5e9759cd7d
Merge branch 'develop' into feature/return-link-for-password-reset
2019-09-24 13:00:48 +03:00
29dd8ab9c0
Merge branch 'feature/force-password-reset' into 'develop'
...
Admin API: Add ability to require password reset
See merge request pleroma/pleroma!1705
2019-09-23 22:42:34 +00:00
19263f30c3
Merge branch 'support-rel-ugc' into 'develop'
...
Add support for `rel="ugc"`
Closes #1255
See merge request pleroma/pleroma!1679
2019-09-23 22:41:31 +00:00
63af6951fa
add tunable for stream uploads, as needed for jortage to work.
2019-09-23 20:38:53 +00:00
fd48bd80eb
Merge branch 'better-emoji-packs' into 'develop'
...
Shareable emoji packs
Closes #833 and #1096
See merge request pleroma/pleroma!1551
2019-09-23 18:20:08 +00:00
02bbcd6180
Merge branch 'develop' into feature/return-link-for-password-reset
2019-09-22 16:58:39 +03:00
f89fe3ac06
Update docs
2019-09-22 16:45:38 +03:00
6f25668215
Admin API: Add ability to force user's password reset
2019-09-22 16:08:07 +03:00
fe4db3b94e
API Docs: Document conversation ids.
2019-09-19 21:01:05 +02:00
c1e011624d
Merge branch 'docs/clients-update' into 'develop'
...
docs/clients.md: Update source code urls
See merge request pleroma/pleroma!1697
2019-09-19 18:01:49 +00:00
cf3041220a
Add support for `rel="ugc"`
2019-09-19 14:56:10 +07:00
c3856bed0c
docs/clients.md: Update source code urls
2019-09-18 23:17:15 +02:00
86795d5ac2
Document emoji pack listing in the api docs
2019-09-19 00:16:33 +03:00
43022c347f
Apply suggestion to docs/api/pleroma_api.md
2019-09-19 00:16:33 +03:00
8aed05ac15
Apply suggestion to docs/api/pleroma_api.md
2019-09-19 00:16:33 +03:00
d51e5e447e
Move emoji reloading to admin api
2019-09-19 00:16:33 +03:00
dd818bdd48
Add documentation for the emoji endpoints
2019-09-19 00:16:33 +03:00
ee620ecbf1
Add caching for emoji pack sharing
2019-09-19 00:16:33 +03:00
ab2ca3038f
Merge branch 'hide-follower-following-count' into 'develop'
...
Add a setting to hide follows/followers stats from the user profile
See merge request pleroma/pleroma!1663
2019-09-18 21:13:15 +00:00
a18f1e7cd7
namings
2019-09-18 10:49:14 +03:00
17ff63b3c3
docs fix
2019-09-18 10:49:14 +03:00
4faf2b1555
post for creating invite tokens in admin api
2019-09-18 10:49:14 +03:00
ef2e2c5e12
Merge branch 'feature/return-total-for-reports' into 'develop'
...
Admin API: Return total for reports
See merge request pleroma/pleroma!1628
2019-09-17 19:09:56 +00:00
450bf7a63c
Mastodon API: Add a setting to hide follow/follower count from the user view (`hide_follows_count` and `hide_followers_count`)
2019-09-17 14:45:47 +03:00
d6ab78e610
Set `account_field_value_length` limit to 2048 by default
2019-09-16 21:48:01 +07:00
219dca1b00
Merge branch 'develop' into feature/return-total-for-reports
2019-09-16 14:40:17 +03:00
3b8ec98b0e
[ #1149 ] Reinstated docs/config.md changes.
2019-09-15 10:15:57 +03:00
c625fe6f09
config.md back
2019-09-13 19:03:39 +03:00
a7f31bf06c
Merge remote-tracking branch 'origin/develop' into reactions
2019-09-13 16:31:27 +02:00
f649a2e972
Pleroma API Docs: Documented Emoji reaction endpoints.
2019-09-13 16:19:50 +02:00
0d9609894f
Merge branch 'feature/change-email' into 'develop'
...
Add email change endpoint
Closes #1156
See merge request pleroma/pleroma!1580
2019-09-13 12:46:16 +00:00
f884987ace
Merge branch 'admin-config-description' into 'develop'
...
Admin config description
Closes #1178 and #1209
See merge request pleroma/pleroma!1611
2019-09-13 12:36:24 +00:00
7b5c81b391
Add a note about compatibility with Mastodon
2019-09-13 13:09:37 +07:00
25d8216804
Add email change endpoint
2019-09-13 13:09:35 +07:00
528a88a686
Fix admin api docs for creating users
2019-09-13 03:31:16 +00:00
aa7fb22008
placeholder for config.md
2019-09-11 09:25:33 +03:00
ab4960cc7f
deleting old config.md file
2019-09-11 09:25:33 +03:00
30f0cec49a
Add note about limit to the doc
2019-09-10 13:39:45 +07:00
b40b10b53d
Add an endpoint to get multiple statuses by IDs
2019-09-10 13:39:45 +07:00
11e12b5761
Add Pleroma.Plugs.Cache
2019-09-09 18:53:08 +00:00
af746fa4a8
Return total for reports
2019-09-04 20:08:13 +03:00
3face45467
Mastodon API: Add `pleroma.thread_muted` to Status entity
...
Needed for pleroma-fe!941
2019-09-04 14:17:23 +03:00
328b2612cd
Clarify that read notifications are returned
2019-09-04 13:39:39 +03:00
377aa9fb90
Apply suggestion to docs/api/pleroma_api.md
2019-09-04 10:37:43 +00:00
c2b6c1b089
Extend `/api/pleroma/notifications/read` to mark multiple notifications
...
as read and make it respond with Mastoapi entities
2019-09-04 12:38:27 +03:00
7808eee9aa
Update Japanese document to follow English document
2019-08-31 16:23:15 +09:00
880307e0d5
minor: Fix version dot
2019-08-30 19:41:31 +00:00
fd076def0a
Fix typo
2019-08-27 02:24:14 +07:00
66c1966688
Disable rate limiter by default
2019-08-26 20:36:44 +07:00
37dd3867bb
Log admin/moderator actions
2019-08-25 19:39:37 +00:00
24994f3e0c
Activity expiration: Fix docs.
2019-08-24 17:28:19 +02:00
cc6c0b4ba6
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
2019-08-24 15:48:33 +02:00
ef9930ed80
Minor corrections and clarification for Alpine standard v.3.10
2019-08-24 10:16:27 +00:00
e5f76a54e6
Fix default config of account fields length
2019-08-23 21:28:52 +00:00
8340fe8fcc
Merge branch 'digest-template' into 'develop'
...
Improve digest email template
See merge request pleroma/pleroma!1565
2019-08-20 12:55:51 +00:00
ef43016b2c
Merge branch 'feature/custom-fields' into 'develop'
...
Add custom profile fields
See merge request pleroma/pleroma!1488
2019-08-20 12:44:14 +00:00
158231cd20
Add configurable colors and logo for the digest template
2019-08-16 18:32:25 +07:00
560dbad538
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
2019-08-14 15:30:40 +02:00
a2e1db5632
Increase max account fields limits
2019-08-14 14:58:38 +07:00
e457fcc479
Add `:max_remote_account_fields` config option
2019-08-14 14:58:06 +07:00
2c35d4b0b0
Add configurable account field name length limit
2019-08-14 14:52:54 +07:00
db3c05f6b4
Add configurable account field value length limit
2019-08-14 14:52:54 +07:00
e0ac5c7a66
Add custom profile fields
2019-08-14 14:52:54 +07:00
9ef31767f2
Merge branch 'feature/mrf-vocabulary' into 'develop'
...
MRF Vocabulary
See merge request pleroma/pleroma!1559
2019-08-13 22:51:15 +00:00
5983f98f26
docs tweak
2019-08-13 22:40:18 +00:00
83a3de8cc4
Merge branch 'length-limit-bio' into 'develop'
...
Add configurable length limits for `User.bio` and `User.name`
See merge request pleroma/pleroma!1515
2019-08-13 22:40:13 +00:00
3cfaac39e2
docs: document mrf_vocabulary module settings
2019-08-13 20:55:42 +00:00
f46cd7e9c7
config: remove legacy activitypub accept_blocks setting
...
Anyone who is interested in dropping blocks can write their own MRF
policy at this point. This setting predated the MRF framework.
Disabling the side effect (unsubscription) is still a config option
per policy.
2019-08-13 02:15:21 +00:00
60231ec7bd
Conversation: Add endpoint to get a conversation by id.
2019-08-12 13:58:04 +02:00
11d08c2de0
tests for Pleroma.Uploaders
2019-08-10 18:46:26 +00:00
29807ef6a5
Merge branch 'feature/digest-email' into 'develop'
...
Feature/digest email
See merge request pleroma/pleroma!1078
2019-08-08 14:38:33 +00:00
a2b98f6d58
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
2019-08-08 16:04:20 +02:00
a49c92f6ae
Participation: Setting recipients will always add the owner.
2019-08-06 14:51:17 +02:00
ddabe7784b
Pleroma Conversations: Document differences.
2019-08-05 15:58:14 +02:00
3411f506b3
Replace "impode" with "implode" for
2019-08-04 14:35:45 +00:00
9b9453ceaf
Fix some typos and rework a few lines in howto_mediaproxy.md
2019-08-04 03:12:38 +00:00
de0f3b73dd
Admin fixes
2019-08-03 18:16:09 +00:00
9d4f34fbcb
Merge branch 'develop' into feature/digest-email
2019-08-02 18:16:04 +03:00
9ca4506355
Add configurable length limits for `User.bio` and `User.name`
2019-08-01 15:53:37 +07:00
51b3b6d816
Admin changes
2019-07-30 16:36:05 +00:00
242f5c585e
add account confirmation email resend in mastodon api
2019-07-28 20:30:10 +00:00
2c83eb0b15
Revert "squash! Expose expires_at datetime in mastoAPI only for the activity actor"
...
This reverts commit 2981821db8
2019-07-24 17:09:59 +02:00
2981821db8
squash! Expose expires_at datetime in mastoAPI only for the activity actor
...
NOTE: rewrite the commit msg
2019-07-24 16:51:09 +02:00
d2da3d30f3
Merge branch 'develop' into feature/digest-email
2019-07-24 16:37:52 +03:00
3cb471ec06
Expose expires_at datetime in mastoAPI only for the activity actor
...
In the "pleroma" section of the MastoAPI for status activities you can
see an expires_at item that states when the activity will expire, or
nothing if the activity will not expire.
The expires_at date is only visible to the person who posted the
activity. This is the conservative approach in case some attacker
decides to write a logger for expiring posts. However, in the future of
OCAP, signed requests, and all that stuff, this attack might not be that
likely. Some other pleroma dev should remove the restriction in the code
at that time, if they're satisfied with the security implications of
doing so.
2019-07-24 14:47:22 +02:00
704960b3c1
Add support for activity expiration to common and Masto API
...
The "expires_at" parameter accepts an ISO8601-formatted date which
defines when the activity will expire.
At this point the API will not give you any feedback about if your post
will expire or not.
2019-07-24 14:45:14 +02:00
378f5f0fbe
Add activity expiration worker
...
This is a worker that runs every minute and deletes expired activities.
It's based heavily on the scheduled activities worker.
2019-07-24 13:14:52 +02:00
0be548b90a
Merge branch 'Fix-static-dir-doc' into 'develop'
...
Fix static_dir docs
See merge request pleroma/pleroma!1465
2019-07-24 01:59:41 +00:00
9638da43e9
Add text about gitignore
2019-07-24 01:50:56 +00:00
f46805bb40
Merge branch 'develop' into feature/admin-api-user-statuses
2019-07-24 02:42:28 +03:00
03471151d6
AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses)
2019-07-24 01:51:36 +03:00
5e72554f3c
Admin config fix
2019-07-23 19:17:00 +00:00
1e7d68e8bf
Fix the sentence and add the setting example
2019-07-23 09:55:58 +09:00
63924ee712
Fix static_dir docs
2019-07-22 18:46:32 +09:00
8292331b35
Merge branch 'develop' into feature/digest-email
2019-07-20 16:41:58 +03:00
36049f08ef
Merge develop
2019-07-20 01:03:25 +03:00
93df0796f0
Merge branch 'feature/matstodon-statuses-by-name' into 'develop'
...
Feature/matstodon statuses by name
See merge request pleroma/pleroma!1211
2019-07-19 21:59:18 +00:00
9169f331b6
Merge branch 'develop' into feature/matstodon-statuses-by-name
2019-07-19 16:55:10 -05:00
33729bbb28
Merge branch 'feature/richmedia-ttl' into 'develop'
...
add the rich media ttl based on image exp time
See merge request pleroma/pleroma!1438
2019-07-19 21:36:36 +00:00
5c4a555b1d
Fix domain for the contact clients.md
2019-07-19 08:40:47 +00:00
b0b9eca37d
Update clients.md for Fedilab
...
- Change owner (@fedilab@framapiaf.org), Source code: Framagit, Add some other supported features
2019-07-19 08:39:22 +00:00
581756ccc5
update the docs
2019-07-19 11:50:47 +05:45
de9906ad56
change the structure of image ttl parsar
2019-07-19 11:43:42 +05:45
9570a5be40
Merge branch 'develop' into feature/admin-api-user-statuses
2019-07-18 23:38:38 +03:00
f9a0014681
Merge branch 'feature/signed-object-fetches' into 'develop'
...
signed object fetches
See merge request pleroma/pleroma!1446
2019-07-18 13:27:50 +00:00
129078eddc
Fix redirect setting not working
2019-07-18 21:08:31 +09:00
cffe8229a5
Update clients.md - added Homepage for Fedilab Android app
2019-07-17 23:03:46 +00:00
cdecef2a08
Update otp_en.md - Added creation of initial admin user
2019-07-17 22:35:16 +00:00
b2a8ccf37f
config: add sign_object_fetches option
2019-07-17 21:38:06 +00:00
ce73d5f6a5
Merge branch 'feature/mention-mrf' into 'develop'
...
Add MRF MentionPolicy for dropping posts which mention specific actors
See merge request pleroma/pleroma!1439
2019-07-17 15:28:41 +00:00
96a2890a9e
Add MRF MentionPolicy for dropping posts which mention specific actors
2019-07-17 15:16:55 +01:00
18234cc44e
add the rich media ttl based on image exp time
2019-07-17 00:20:34 +05:45
2ba07b63f4
Apply suggestion to docs/config.md
2019-07-16 16:59:02 +00:00
889dc17abd
[ #1094 ] Rate-limited follow & unfollow actions.
2019-07-16 19:18:30 +03:00
9bca70b10a
Merge develop
2019-07-16 16:19:19 +03:00
520ee6c591
Add `pleroma.deactivated` to the Account entity (Mastodon API)
2019-07-16 11:14:46 +00:00
ffb4eb9779
Merge branch 'develop' into feature/matstodon-statuses-by-name
2019-07-15 17:10:27 -05:00
345a38778e
Remove dead link from the installation docs
2019-07-15 21:43:04 +00:00
0c66bb5857
Update documentation
2019-07-15 14:27:56 +07:00
64a946643e
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-07-15 14:11:54 +07:00
c729883936
Merge branch 'develop' into feature/digest-email
2019-07-14 21:43:30 +03:00
7af27c143d
changelog & docs
2019-07-14 09:23:43 +03:00
418ae6638d
Merge branch 'develop' into feature/admin-api-user-statuses
2019-07-14 00:39:06 +03:00
a9459ff98f
Admin API: Endpoint for fetching latest user's statuses
2019-07-14 00:37:26 +03:00
0cc638b968
docs: note that exclusions usage will be included in the transparency metrics if used
2019-07-13 19:00:03 +00:00
80c46d6d8b
nodeinfo: implement MRF transparency exclusions
2019-07-13 18:53:14 +00:00
b74d11e20a
[ #1041 ] Added documentation on existing rate limiters.
2019-07-13 15:13:26 +03:00
360e4cdaa2
Move these to pleroma namespace in Mastodon API
2019-07-12 11:25:58 -05:00
eae991b06a
merge develop
2019-07-12 18:08:27 +03:00
846ad9a463
admin api configure changes
2019-07-11 13:02:13 +00:00
182f7bbb11
Merge branch 'develop' into feature/addressable-lists
2019-07-11 13:26:59 +07:00
beba7bbc85
removing synchronization worker
2019-07-10 17:42:18 +03:00
12b1454245
[ #1062 ] added option to disable send email
2019-07-10 05:34:21 +00:00
371d39e160
Merge develop
2019-07-09 21:21:09 +03:00
c91b5c87ff
Docs/more mastodon api
2019-07-09 18:20:36 +00:00
9a9b60cfbc
Merge branch 'develop' into feature/allow-user-query-via-id
2019-07-09 12:49:04 -05:00
d6b0fce6e9
Fix/1019 correct count remote users
2019-07-09 17:36:35 +00:00
dd5a41e2a4
Apply suggestion to docs/config.md
2019-07-09 10:39:36 +00:00
9f23502856
Fix docs
2019-07-06 15:16:56 +03:00
ad8d86e7c6
Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
2019-07-06 10:17:06 +03:00
6c50fbcd14
Admin API: Allow querying user by ID
2019-07-05 19:33:53 +03:00
3b05f834f4
Merge branch 'fix/docs-dry-run' into 'develop'
...
OTP Release install docs: Remove --dry-run in cron certbot command
See merge request pleroma/pleroma!1366
2019-07-01 04:52:42 +00:00
611f6665ac
Update changelog and admin API docs with tags, display_name, avatar additions
2019-07-01 03:36:42 +03:00
d2cb18b2a3
Merge branch 'develop' into feature/digest-email
2019-06-30 21:23:35 +03:00
a799418573
[ #161 ] Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
...
# Conflicts:
# CHANGELOG.md
2019-06-30 16:05:00 +03:00
2b9d914089
[ #161 ] Refactoring, documentation.
2019-06-30 15:58:50 +03:00
044eb039c2
OTP Release install docs: Remove --dry-run in cron certbot command
2019-06-30 13:06:10 +03:00
acd20f166b
[ #1026 ] Filter.AnonymizeFilename added ability to retain file extension with custom text
2019-06-30 07:28:35 +00:00
4c40ada7a5
Add a caveat for docker deployment in the config docs
2019-06-29 21:14:11 +10:00
eddcebf8ae
Add a warning about service files assuming installation paths
2019-06-29 11:35:42 +03:00
b6cfc8f98b
Merge branch 'patch-3' into 'develop'
...
Move all upload contents despite upload folder itself.
See merge request pleroma/pleroma!1352
2019-06-29 06:01:33 +00:00
ab6de9b478
Move all upload contents despite upload folder itself.
2019-06-29 04:24:44 +00:00
b2548e65db
Update migrating_from_source_otp_en.md: Replace `reload-daemon` with `daemon-reload`.
2019-06-29 04:17:49 +00:00
074ffee0b2
docs: add documentation for MediaProxyWarmingPolicy
2019-06-28 23:20:17 +00:00
657277ffc0
Resolve conflicts
2019-06-29 00:52:50 +03:00
e556c96661
Update docs/installation/arch_linux_en.md, docs/installation/centos7_en.md, docs/installation/debian_based_en.md, docs/installation/debian_based_jp.md, docs/installation/gentoo_en.md files
2019-06-28 18:25:21 +00:00
2286f62a36
Merge branch 'release-docs' into 'develop'
...
Docs on OTP releases
See merge request pleroma/pleroma!1315
2019-06-28 15:26:09 +00:00
eeb419e3a0
Add a note about the develop branch
2019-06-28 09:42:45 +03:00
4f44732100
Add a note on what OTP releases are
2019-06-27 09:45:13 +03:00
c6705144a2
don't delete config settings on admin update
2019-06-27 04:19:44 +00:00
f5f1bb35c3
Instructions on getting the flavour
2019-06-26 15:24:06 +03:00
877f91c0c4
Do not assume ~pleroma == /opt/pleroma
2019-06-26 15:20:22 +03:00
e404335af8
Add all the remaining sections to Switching to OTP releases
2019-06-26 11:34:58 +03:00
9f8e645dce
Merge branch 'feature/configurable-pack-extensions' into 'develop'
...
Make default pack extensions configurable and default to png and gif
See merge request pleroma/pleroma!1338
2019-06-26 05:34:02 +00:00
41e4752950
Make default pack extensions configurable and default to png and gif
2019-06-26 06:48:59 +03:00
ec01b7c934
Apply suggestion to docs/config.md
2019-06-26 03:23:26 +00:00
4ad15ad2a9
add ignore hosts and TLDs for rich_media
2019-06-25 22:25:37 +03:00
44aa895b78
Add a note that OTP releases don't contain revision history
2019-06-25 05:50:25 +03:00
57d18b06ab
Remove the useless specification of test size and make the main points bold
2019-06-25 04:55:41 +03:00
687f0aee51
Basic skeleton of "Switching a from-source install to OTP releases"
2019-06-24 11:51:02 +03:00
550302c041
Apply suggestion to docs/config.md
2019-06-24 01:09:28 +00:00
7fc226e0fe
Remove the warning about alpine as the issue is now solved
2019-06-24 02:50:28 +03:00
7daaaf84f1
Fix markdown mistakes
2019-06-24 01:28:01 +09:00
4bac13966b
modify config.md for S3
2019-06-24 01:10:55 +09:00
8b7860f12f
Merge branch 'admin-config' into 'develop'
...
Admin config
See merge request pleroma/pleroma!1328
2019-06-23 05:42:37 +00:00
40a62839ff
Use build-base instead of individual packages
2019-06-23 08:35:35 +03:00
982cad0268
support for config groups
2019-06-23 08:16:16 +03:00
1d3c5e434d
releases_en.md -> otp_en.md
2019-06-23 07:44:10 +03:00
66e92dc0ca
Add a Further Reading section to the OTP install guide
2019-06-23 07:43:45 +03:00
299cefa2bd
Add a section on executing mix tasks
2019-06-23 03:05:02 +03:00
18eabca978
Add a section about updating
2019-06-23 02:55:43 +03:00
9d487ba579
Add docs about SSL certificate auto-renew
2019-06-23 02:42:53 +03:00
7a4c4518b8
Remove a note about needing to add RUM to config manually, as it is now
...
in the config generator
2019-06-22 21:18:34 +03:00
ab79a18b77
docs/clients.md: Remove tootdon
...
Of course a proprietary client would send the messages home :D
2019-06-22 19:34:30 +02:00
410add1c30
support for tuples with more than 2 values
2019-06-22 17:30:53 +03:00
e00e4c0e7a
Add a warning about OTP releases on Alpine 3.10
2019-06-22 13:41:17 +03:00
177faf15c2
Correct dependencies for RUM on alpine and remove installcheck
2019-06-22 08:36:36 +03:00
50e3cf9d5e
Correct a typo in the apk command
2019-06-22 08:31:02 +03:00
dd05dc65d3
Do not exit on fail in the one-liner because it closes ssh connection and fix dependencies for alpine
2019-06-22 08:30:32 +03:00
1d2332ce79
Use uname -m instead of arch for more portability
2019-06-22 05:20:36 +03:00
120f84c83d
Executing create is unnecessary after the postgres script is executed
2019-06-22 04:35:22 +03:00
23608149bc
Execute migration commands as the pleroma user and add a note about the need to uncomment the RUM command
2019-06-22 02:21:02 +03:00
d1d648b0ec
Correct the psql command
2019-06-22 02:09:45 +03:00
452d5d3231
Merge branch 'develop' into release-docs
2019-06-22 02:00:18 +03:00
743bd64883
Apply suggestion to docs/installation/releases_en.md
2019-06-21 17:00:12 +00:00
de77d7621a
Apply suggestion to docs/installation/releases_en.md
2019-06-21 16:59:56 +00:00
8b170b96c7
Apply suggestion to docs/installation/releases_en.md
2019-06-21 16:59:48 +00:00
4bec121798
Do not set ownership group in chown commands
2019-06-21 06:39:03 +03:00
e824025c52
Remove a useless echo
2019-06-21 06:37:38 +03:00
16e9304cec
Change to long adduser options because the short ones only work on busybox
2019-06-21 06:32:34 +03:00
4669a56aa3
Add notes on RUM indexes
2019-06-21 06:22:34 +03:00
f9515a3611
Add a note about RUM indexes package on Debian/Ubuntu
2019-06-21 06:14:02 +03:00
d3d98beaad
Correct package names for Debian
2019-06-21 06:04:39 +03:00
dd23888774
OTP release install guide sceleton
2019-06-21 05:48:13 +03:00
630ac6a921
docs: better description for mrf anti link spam
2019-06-20 03:01:03 +00:00
736d8ad6be
implement anti link spam MRF
2019-06-19 15:58:32 +00:00
6745bc951c
Documentation: Document chat token response.
2019-06-15 11:11:45 +02:00
62ffc00a5d
Merge branch 'feature/add-background-image-to-mastoapi' into 'develop'
...
AccountView: Add user background.
See merge request pleroma/pleroma!1280
2019-06-14 16:49:28 +00:00
c2ca1f22a2
it is changed in compile time
...
we can't change module attributes and endpoint settings in runtime
2019-06-14 15:45:05 +00:00
774637a2f4
Mastodon API: Document changes.
2019-06-14 11:24:09 +02:00
4265608097
Merge branch 'chore/tagpolicy_docs' into 'develop'
...
Document TagPolicy in `rewrite_policy` section
See merge request pleroma/pleroma!1271
2019-06-12 09:52:55 +00:00
ced59be1ae
Document TagPolicy in `rewrite_policy` section
2019-06-11 22:15:28 +03:00
6f29865d43
Add option to restrict all users to local content
2019-06-11 21:25:53 +07:00
5d5a9a3a35
Better default parameters for suggestion
2019-06-11 11:34:22 +00:00
ad04d12de6
Replace `MastodonAPIController.account_register/2` rate limiter
2019-06-11 16:06:03 +07:00
2e5affce61
Add RateLimiter
2019-06-11 14:27:41 +07:00
01fe5abad1
Resolve conflicts
2019-06-07 01:20:50 +03:00
f82382de22
[ #943 ] Make the unauthenticated users limitation optional
2019-06-06 12:17:49 +00:00
cfa5572d28
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-06-05 17:53:15 +07:00
3eefb274f4
OAuth consumer: tests fix, comments, Keycloak config notes.
2019-06-05 13:02:13 +03:00
e4babb1c9f
Merge branch 'explicit-addressing' into 'develop'
...
Explicit addressing
See merge request pleroma/pleroma!1239
2019-06-05 08:28:20 +00:00
6ba9055b51
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-06-05 12:54:30 +07:00
b1b1a270e8
Fix conflict
2019-06-05 02:45:21 +03:00
96121315f3
fix merge
2019-06-04 12:41:24 +03:00
9ce928d823
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-06-04 16:28:23 +07:00
4cab98b7bf
Merge remote-tracking branch 'origin/develop' into explicit-addressing
2019-06-04 11:23:46 +02:00
25198d48f7
Docs: Add Explicit addressing to Readme and changelog.
2019-06-04 10:49:57 +02:00
4f2e359687
Merge branch 'develop' into issue/941
2019-06-04 09:49:08 +03:00
9f0d0d0805
Merge branch 'feature/mrf-subchain' into 'develop'
...
MRF: subchain policy
See merge request pleroma/pleroma!1233
2019-06-04 05:49:54 +00:00
9d2563a3de
Merge branch 'generic-fe-settings' into 'develop'
...
Generic settings store for frontend user settings
See merge request pleroma/pleroma!1221
2019-06-04 05:43:43 +00:00
a536f515dd
Merge branch 'ueberauth_config_extension' into 'develop'
...
Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification
See merge request pleroma/pleroma!1234
2019-06-04 05:42:49 +00:00
6ef145b4fc
Merge branch 'develop' into feature/digest-email
2019-06-03 15:29:53 -05:00
f13d6c7f78
update api to set skip_thread_containment
2019-06-03 21:02:57 +03:00
080e1aa70e
add option skip_thread_containment
2019-06-03 16:13:37 +03:00
026b245dbc
Merge branch 'develop' into feature/polls-2-electric-boogalo
2019-06-03 11:14:52 +03:00
83663caa81
Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification.
2019-06-02 17:45:32 +03:00
c724d8df98
docs: document mrf_subchain
2019-06-02 10:14:56 +00:00
65db5e9f52
Resolve merge conflicts
2019-06-01 16:29:58 +03:00
5d3ece2861
Remove now useless flavours switching
2019-06-01 01:44:10 +02:00
10fe02acef
Documentation: Document Settings store mechanism.
2019-05-31 14:59:24 +02:00
88414151b4
Formatting
2019-05-30 21:35:31 +00:00
75a37a68d4
Install docs should clone from master branch
2019-05-30 21:30:42 +00:00
e912f81c82
Update docs to reflect we accept nickname for id for both of these endpoints
2019-05-29 12:22:14 -05:00
ce47017c89
Merge develop
2019-05-29 18:18:22 +03:00
f333041a0a
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-24 21:05:57 +07:00
75e78d4e23
Merge branch 'feature/mrf-user-filter' into 'develop'
...
mrf: add support for filtering users
See merge request pleroma/pleroma!1188
2019-05-22 19:03:14 +00:00
f0516d9114
Merge branch 'ssh-fixes' into 'develop'
...
Ssh fixes
Closes #869 and #925
See merge request pleroma/pleroma!1191
2019-05-22 18:57:34 +00:00
7d9b33b3ce
update documentation for the new MRF features [no-ci]
2019-05-22 18:53:30 +00:00
620908a2db
[ #699 ] add worker to clean expired oauth tokens
2019-05-22 15:44:50 +00:00
714d8d4ef9
Merge branch 'feature/object-pruning' into 'develop'
...
Object pruning
See merge request pleroma/pleroma!1181
2019-05-22 11:04:30 +00:00
b22145cbc4
Documentation: Specify PEM format for SSH keys.
...
Otherwise openssh-client 7.9 will generate a different format that can't be used
by esshd.
2019-05-22 10:44:26 +02:00
79c2cef2fb
Merge branch 'mongooseim-support' into 'develop'
...
MongooseIM: Add basic integration endpoints.
See merge request pleroma/pleroma!1172
2019-05-22 04:06:54 +00:00
16b260fb19
add mix task to prune the object database using a configured retention period
2019-05-21 21:38:56 +00:00
d378b342ba
MongooseIM: Add documentation.
2019-05-21 18:57:36 +02:00
76a7429bef
Add poll limits to /api/v1/instance and initial state
2019-05-21 09:13:10 +03:00
943d1b2f26
Merge branch 'feature/user-configurable-mascot' into 'develop'
...
Feature: user configurable mascot
See merge request pleroma/pleroma!1177
2019-05-20 18:17:42 +00:00
5aa107d912
Document MRF.Simple :report_removal
2019-05-21 00:59:12 +08:00
daeae8e2e7
Move default mascot configuration to `config/`
2019-05-20 16:12:55 +01:00
54e9cb5c2d
Add API endpoints for a custom user mascot
2019-05-20 12:39:23 +01:00
557f0e33a7
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-17 19:57:14 +07:00
412a3d8a0f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
2019-05-17 12:26:59 +02:00
bf84d50c76
Merge branch 'feature/890-add-report-uri' into 'develop'
...
Feature/890 add report uri
Closes #890
See merge request pleroma/pleroma!1164
2019-05-16 20:11:12 +00:00
e2b3a27204
Add Reports to Admin API
2019-05-16 19:09:18 +00:00
fc7246d715
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-16 17:54:24 +07:00
8355d0607e
trailing spaces
2019-05-16 17:03:12 +07:00
9d14214eb9
Merge branch 'develop' into feature/890-add-report-uri
2019-05-16 12:54:06 +07:00
aa11fa4864
add report uri and report to
2019-05-16 12:49:40 +07:00
a2771869a3
Merge branch 'docs/update_debian_instructions' into 'develop'
...
Added package to dependency list documentation
See merge request pleroma/pleroma!1161
2019-05-16 05:03:37 +00:00
107c83ab2b
Note that nicknames is an array
2019-05-16 01:48:53 +03:00
0641e685c1
Note that nicknames is an array
2019-05-16 01:46:43 +03:00
1d2923e5d0
Update tag/untag docs
2019-05-16 01:36:26 +03:00
0ae15c2306
Added package to dependency list
...
Added the erlang-ssh package to the dependency list and the installation
command instructions. The project wouldn't build otherwise.
2019-05-15 15:36:20 -07:00
f1e67bdc31
Search: Add optional rum indexing / searching.
2019-05-15 15:28:01 +02:00
a7a8f3bc2c
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-15 14:31:24 +07:00
fc9b4410c4
Add documentation
2019-05-14 20:27:40 +07:00
5e2b491276
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-05-14 18:15:56 +07:00
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
2019-05-13 18:35:45 +00:00
f01f995816
make url uniform in admin api
2019-05-11 14:46:00 +05:45
f1f7a11222
Merge develop
2019-05-11 14:45:54 +07:00
bfeb33e951
Merge develop
...
Merge conflict in lib/pleroma/activity.ex
2019-05-08 14:34:36 +00:00
b6b5b16ba4
Merge develop
2019-05-08 17:08:06 +07:00
1557b99beb
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-05-07 16:51:11 +07:00
f46295faa7
unused config paramater
2019-05-07 09:07:06 +07:00
1040caf096
fix format
...
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
2019-05-06 17:51:03 +00:00
aacac9da0b
Merge branch 'feature/bbs' into 'develop'
...
BBS / SSH
See merge request pleroma/pleroma!997
2019-05-06 17:17:03 +00:00
ce6ca0fefe
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
2019-05-06 16:45:22 +00:00
6ad8ddfd29
Merge remote-tracking branch 'origin/develop' into feature/bbs
2019-05-04 15:00:45 +02:00
2982061dfa
Fix syntax highlighting + clarify :frontend_configuration
2019-05-01 01:26:14 +02:00
0f0cc2703b
Merge develop
2019-04-30 20:17:52 +07:00
ce3789e39a
Add default_scope to /api/v1/update_credentials
2019-04-27 23:55:54 +03:00
48f68fd133
Merge branch 'feature/mastoapi-new-config' into 'develop'
...
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
This patch:
- Fixes `rights` in TwitterAPI ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
See merge request pleroma/pleroma!1093
2019-04-26 02:41:35 +00:00
24c3e2db2c
Add mediaproxy whitelist capability
2019-04-25 18:11:47 -05:00
dfc8425659
Move settings to Source subentity
2019-04-25 10:31:14 +03:00
c157e27a00
Merge branch 'develop' into feature/disable-account
2019-04-25 13:41:10 +07:00
4baea6e6d9
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
...
This patch:
- Fixes `rights` in twitterapi ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
2019-04-24 20:01:42 +03:00
9dd36e5bcb
Extend Mastodon API with public endpoint for getting Favorites timeline of any user ( #789 )
2019-04-23 02:47:43 +00:00
10c40e13d2
Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop'
...
Add `in_reply_to_account_acct` to MastoAPI status entity
See merge request pleroma/pleroma!1086
2019-04-23 02:43:53 +00:00
7dcac0bac0
Merge branch 'develop' into 'develop'
...
Add shortcode_globs setting to documentation
See merge request pleroma/pleroma!1087
2019-04-23 02:41:21 +00:00
74ef14b04e
Add :emoji settings to config.md
2019-04-22 19:42:02 +02:00
d35246c449
added healthcheck setting to instance config
2019-04-22 17:00:06 +07:00
c876b04aeb
Add shortcode_globs setting to documentation
2019-04-22 11:17:53 +02:00
f60d072bbb
Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity
2019-04-22 11:54:27 +03:00
88f0be9693
Feature/826 healthcheck endpoint
2019-04-22 07:19:53 +00:00
e8c2f9a73a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-04-22 13:08:30 +07:00
7fcbda702e
Merge branch 'rework-emoji-management' into 'develop'
...
Remove finmoji and add a way to download emojis in packs
Closes #817 and #821
See merge request pleroma/pleroma!1073
2019-04-22 02:07:19 +00:00
b87ad13803
Move comments for email_notifications config to docs
2019-04-21 19:36:31 +07:00
d086319733
differences_in_mastoapi_responses.md: `content_type` parameter of post submission
2019-04-21 12:48:40 +02:00
8f93d4c423
Remove most finmoji mentions where appropriate
2019-04-20 15:42:14 +03:00
31cff7dbca
Document the pleroma.emoji task
2019-04-20 15:06:07 +03:00
8166cefa21
Include explicit warning for emerge config line as it will vary more widely based on current version of postgres
2019-04-20 07:11:06 +00:00
ada384207b
typo fix
...
docs for RelMe provider
2019-04-19 07:50:21 +00:00
1aa4994f6d
Do not require authentication for user search in MastoAPI
2019-04-18 12:44:25 -05:00
73df3046e0
Merge branch 'feature/788-separate-email-addresses' into 'develop'
...
Feature/788 separate email addresses
Closes #788
See merge request pleroma/pleroma!1040
2019-04-16 18:44:07 +00:00
10096bbf2b
add extra_cookie_attrs option to config
...
Allow instance admins to set their own SameSite cookie policy from
the config. Default value in the config is `Lax`.
2019-04-16 22:20:56 +08:00
088f378408
Custom Emoji docs: Make it clear that config.exs is not for lewd.
2019-04-15 15:51:17 +02:00
38926a063a
add `/api/pleroma/disable_account` to `docs/api/pleroma_api.md`
2019-04-15 16:39:42 +07:00
48982169dc
docs/installation/arch_linux_en.md: Remove useless ODBC
...
See [1] for confirmation.
1: https://git.pleroma.social/pleroma/pleroma/merge_requests/1050#note_24402
2019-04-13 22:41:54 +02:00
c349573791
Merge develop to 788-separate-email-addresses
...
Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs
2019-04-13 12:24:38 +07:00
184ae60b21
Merge branch 'bugfix/pleroma-email-naming' into 'develop'
...
Make the filename and module name of Pleroma.Emails.* orthogonal
See merge request pleroma/pleroma!1029
2019-04-12 10:41:09 +00:00
fe511a6c65
Merge branch 'develop' into feature/788-separate-email-addresses
2019-04-10 18:06:54 +07:00
fe13a1d78c
adding notify_email setting for trigger emails
2019-04-10 17:57:41 +07:00
e5d553aa45
Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
...
Feature/767 multiple use invite token
See merge request pleroma/pleroma!1032
2019-04-10 10:10:08 +00:00
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
2019-04-10 10:44:54 +01:00
c8440b5e0c
Merge branch 'fix/emoji-api-nonsense' into 'develop'
...
Change response format of /api/pleroma/emoji so it makes sense
See merge request pleroma/pleroma!1038
2019-04-10 06:22:51 +00:00
1791ee8ec4
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
2019-04-10 06:33:19 +02:00
97395e013e
Merge branch 'notification-pleroma-settings' into 'develop'
...
Notification controls
Closes #738
See merge request pleroma/pleroma!988
2019-04-10 02:10:31 +00:00
b57b43027c
Change response format of /api/pleroma/emoji to the one that actually makes sense
2019-04-09 23:20:31 +03:00
012bb5dcc9
renaming expire_at -> expires_at
...
keyword style change
2019-04-08 16:01:28 +07:00
b810aac117
added docs to docs/api/admin_api.md
...
code style and little renamings
2019-04-07 19:48:52 +07:00
e6778003ab
JSON need quotes!
2019-04-06 16:24:21 +01:00
c05fe4da0a
Document subscription endpoints, fix typos
...
Also adds a quick error case on the subscription endpoints
to avoid 500s
2019-04-06 16:20:06 +01:00
da64a5aece
Document the admin API endpoints for controlling follow/unfollow
2019-04-05 11:29:34 -05:00
3b12eeda19
Add ability to ship logs to a Slack channel
2019-04-04 19:52:22 +00:00
79cb34a4b0
Fix preview not being usable in form data
2019-04-02 23:07:16 +03:00
a79ce94dd4
Merge branch 'feature/fake-statuses' into 'develop'
...
Add fake status submit
See merge request pleroma/pleroma!995
2019-04-02 14:17:43 +00:00
fdb4357e9b
Rename fake param to preview and make the tests check that the object was not inserted to the db
2019-04-02 14:31:18 +03:00
lain
Ariadne Conill
Haelwenn (lanodan) Monnier
Maxim Filippov
minibikini
kPherox
Ekaterina Vaartis
Rachel Fae Fox
rinpatch
Haelwenn
feld
Alex S
eugenijm
Ivan Tashkinov
Angelina Filippova
AkiraFukushima
ultem
aries
Maksim
x0rz3q
Pierce McGoran
Roman Chvanikov
Sachin Joshi
Mike Verdone
Mark Felder
tom79
tallship
RX14
Ivan Tashkinov
Ivan Tashkinov
deorsum
Yuji Nakao
William Pitcock
Julien Wehmschulte
kaniini
Hakaba Hitoyo
Roman Chvanikov
Roman Chvanikov
Aaron Tinio
Sadposter
Sergey Suprunenko
PolymerWitch
xse
ilja
witches.live
Hakurei Reimu