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
lain
x0rz3q
Pierce McGoran
Alexander Strizhakov
Roman Chvanikov
Egor Kislitsyn
Sachin Joshi
Mike Verdone
kaniini
aries
Maxim Filippov
feld
Mark Felder
tom79
tallship
RX14
Ivan Tashkinov
Ivan Tashkinov
Eugenij
Maksim
Haelwenn
rinpatch
deorsum
Yuji Nakao
William Pitcock
Julien Wehmschulte
kaniini