1ae976ac51
Merge branch 'develop' into '1427-oauth-admin-scopes'
...
# Conflicts:
# CHANGELOG.md
2019-12-10 13:34:54 +00:00
701815e64c
[ActivityPub] Configurable ActivityPub actor type
2019-12-10 13:19:26 +00:00
835ac2157c
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
...
# Conflicts:
# CHANGELOG.md
2019-12-10 08:55:14 +03:00
c098dec473
Merge branch 'develop' into feature/custom-runtime-modules
2019-12-10 00:16:43 +07:00
d237e9b11d
docs: drop CentOS 7 install guide
2019-12-09 20:11:39 +03:00
8dbe2dfde1
docs: use tabs and improve grammar in OTP install guide
2019-12-09 20:09:47 +03:00
0a8b32a661
docs: remove overoptimistic OTP benefits and use tabs in migration from source
2019-12-09 20:08:31 +03:00
b0505b2cc7
docs: fix incorrect display in digest task docs
2019-12-09 20:07:43 +03:00
2b821036c4
Merge branch 'develop' into issue/1383
2019-12-09 19:41:43 +03:00
e4ea0e20b3
Merge branch 'issue/1342' into 'develop'
...
[#1342 ] Added privacy option to push notifications
See merge request pleroma/pleroma!1920
2019-12-09 14:30:35 +00:00
4692919ea6
Update pleroma_api.md
2019-12-09 14:15:59 +00:00
990cd7ef5d
Merge branch 'feat/docs-otp-source-picker' into 'develop'
...
docs: add OTP/From source tabs to CLI tasks
See merge request pleroma/pleroma!2046
2019-12-09 10:27:43 +00:00
b4027e7187
Document `with_move` parameter of the notification API
2019-12-09 14:46:06 +07:00
eb9ea8475b
docs: add OTP/From source tabs to CLI tasks
2019-12-09 04:07:16 +03:00
e260a16c05
update docs
2019-12-08 22:09:15 +03:00
6fbafb1cdc
Merge branch 'develop' into issue/1276
2019-12-08 20:14:28 +03:00
5876a9cb79
Merge branch 'develop' into issue/1383
2019-12-08 19:52:46 +03:00
00c38cf28d
Docs
2019-12-08 11:29:33 +03:00
93a80ee915
[ #1427 ] Bugfix for `enforce_oauth_admin_scope_usage`. Admin API documentation entry.
2019-12-06 16:56:23 +03:00
157bceeda9
Move runtime configuration from `:instance` to `:modules`
2019-12-06 15:04:46 +07:00
48ae3c4347
Add support for custom modules
2019-12-05 20:18:25 +07:00
49bb0a130f
Merge branch 'develop' into issue/1276
2019-12-05 12:22:19 +03:00
9487995e8b
Cheat Sheet: Addg chat_limit information.
2019-12-04 12:51:06 +01:00
29a98b86b7
Merge branch 'develop' into issue/1383
2019-12-04 09:34:44 +03:00
4b60d41db9
Add report notes
2019-12-04 00:26:37 +09:00
7722e5a67a
Merge branch 'feature/move-activity' into 'develop'
...
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
2019-12-02 16:26:19 +00:00
b7c449118b
Merge branch 'develop' into issue/1383
2019-11-28 21:27:01 +03:00
1fc28a4b44
Add a view for the move notification
2019-11-27 17:52:02 +07:00
0e9be6bafa
moved OAuth.Token.CleanWorker to Oban Periodic jobs
2019-11-25 14:32:20 +03:00
e2dc89069d
move documentation section for http client
2019-11-25 11:26:42 +00:00
d3656c2725
add ability to set a custom user-agent string
2019-11-25 09:53:11 +00:00
bd62946020
Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'
...
AdminAPI: Confirm user account, resend confirmation email
See merge request pleroma/pleroma!1994
2019-11-22 15:39:19 +00:00
c2ad9fd5f9
Merge branch 'list-users' into 'develop'
...
Add CLI list users command
See merge request pleroma/pleroma!1990
2019-11-21 20:33:11 +00:00
fbc379d689
Add CLI list users command
2019-11-21 21:07:06 +01:00
46eb160135
AdminAPI: Confirm user account, resend confirmation email
2019-11-19 20:14:02 +09:00
36686f5245
Support authentication via `x-admin-token` HTTP header
2019-11-19 15:58:20 +07:00
adacf1b5e1
Remove deprecated endpoint from docs that is fully removed from backend now
2019-11-18 16:16:27 +00:00
9e3868425a
Merge branch 'mix-task-warning' into 'develop'
...
Documentation: Add warning about database mix tasks.
See merge request pleroma/pleroma!1984
2019-11-15 19:38:52 +00:00
234c27cb20
Documentation: Add warning about database mix tasks.
2019-11-15 14:30:59 +01:00
29f49bf5fa
docs: document MRF ObjectAgePolicy
2019-11-14 19:47:54 -06:00
1afeaf82fa
Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'
...
Admin API: Grouped reports, update multiple reports in one query
Closes admin-fe#43
See merge request pleroma/pleroma!1815
2019-11-14 13:35:41 +00:00
3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
2019-11-14 16:39:45 +07:00
6085c71bd1
Merge branch 'reactions' into 'develop'
...
Emoji Reactions
See merge request pleroma/pleroma!1662
2019-11-14 08:47:10 +00:00
3350cd8d96
Fix formatting in OpenBSD install manual
2019-11-13 18:49:29 +07:00
e6d7e27bd6
Add `allow_following_move` setting to User
2019-11-12 18:45:28 +07:00
04473677cc
docs: move static-fe docs under a proper category
2019-11-11 23:24:15 +03:00
2cc043591c
Merge branch 'feature/static-fe' into 'develop'
...
Static frontend
See merge request pleroma/pleroma!1917
2019-11-11 19:10:44 +00:00
ab2e61238e
Add a warning about Pg version to the RUM related docs
2019-11-11 19:13:07 +07:00
46787b9fe1
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
2019-11-11 19:18:12 +09:00
31343e4321
Code style fixes
2019-11-11 19:06:09 +09:00
a88e834dba
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
2019-11-10 11:32:50 +00:00
6ef8049664
Add changelog entry, cheatsheet docs, and alphabetize.
2019-11-09 18:09:29 -08:00
518b0193a1
Big config cheatsheet revamp
...
Categorize things, remove old deprecation warnings, consistently place
dots in unordered lists, fix links, etc.
2019-11-10 03:33:36 +03:00
b22ee9d966
Merge remote-tracking branch 'origin/develop' into reactions
2019-11-08 13:27:11 +01:00
b14bf9044f
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
2019-11-08 18:30:49 +09:00
7888803ffe
Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`
2019-11-07 08:26:24 +03:00
43ea16870f
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
2019-11-05 02:12:48 +03:00
ab5c8ec9fa
Update docs
2019-11-01 20:27:16 +03:00
58da7f6620
updated docs\changelog
2019-10-31 17:34:17 +03:00
ee04fbc35a
[ #1304 ]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
2019-10-20 22:29:56 +03:00
c6fdfbc4f1
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
2019-10-20 20:43:18 +03:00
e8843974cb
[ #1304 ] Moved remaining fields from User.Info to User.
...
Misc. fixes / improvements.
2019-10-20 13:42:42 +03:00
f01dbc450c
Merge branch 'feature/mastofe-pwa' into 'develop'
...
MastoFE: Add PWA manifest.
See merge request pleroma/pleroma!1834
2019-10-19 20:11:58 +00:00
52ed2f8f2d
Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversations as read
2019-10-19 15:24:06 +03:00
Jill H.
df3c2dfd8b
Add documentation for PWA manifest configuration.
2019-10-19 12:15:16 +02:00
2473702be2
Merge branch 'develop' into feature/relay-list
2019-10-18 10:24:29 +02:00
da0e4879bc
DELETE /api/pleroma/admin/users now accepts nicknames array
2019-10-15 17:33:29 +02:00
3b1bc079af
Merge branch 'exclude-visibilities-for-timelines' into 'develop'
...
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
See merge request pleroma/pleroma!1818
2019-10-14 19:40:40 +00:00
0e9243e8a2
Preparations for renaming `master` to `stable`
2019-10-14 18:38:51 +03:00
a97b642289
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
2019-10-14 02:57:21 +03:00
cc6875b582
Add `GET /api/pleroma/admin/relay` endpoint - lists all followed relays
2019-10-11 19:12:29 +03:00
aaa4252f41
Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
2019-10-11 15:58:45 +03:00
f5104f36bb
Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it
2019-10-11 00:24:31 +03:00
ad42837244
Ability to toggle activation status and permission group for a group of users
2019-10-09 17:03:54 +03:00
35068baf65
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
2019-10-07 15:41:41 +03:00
7aceaa517b
Admin API: Reports, grouped by status
2019-10-07 15:39:07 +03:00
6c278cfe09
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
2019-10-07 12:31:51 +00:00
4b3f77a99f
Extract RSS Feed functionality from OStatus
2019-10-07 12:20:41 +00:00
61097ba6ab
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
2019-10-06 08:11:47 +00:00
8249924485
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
2019-10-05 20:12:00 +03:00
1ed8fbc4d9
Merge remote-tracking branch 'origin/develop' into reactions
2019-10-05 15:10:57 +02:00
e07e9cb75e
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
...
This reverts merge request !1737
2019-10-05 10:00:05 +00:00
d9aaea44ff
Merge remote-tracking branch 'origin/develop' into reactions
2019-10-05 10:42:29 +02:00
5c04e81724
Merge branch 'user-info-unread-direct-conversation' into 'develop'
...
Add the `unread_conversation_count` field to the user info
See merge request pleroma/pleroma!1737
2019-10-04 17:33:18 +00:00
795ea5dfc2
Move HTTP verb to the header (admin_api.md)
2019-10-04 18:58:44 +03:00
27110793a7
Merge branch 'featrue/job-monitor' into 'develop'
...
Add Pleroma.JobQueueMonitor
Closes #1274
See merge request pleroma/pleroma!1721
2019-10-04 12:52:11 +00:00
e4ab9a05dd
cheatsheet.md: link to pleroma-fe docs for :frontend_configurations
2019-10-04 00:10:28 +02:00
06d9df79c5
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
2019-10-04 00:53:23 +03:00
69784eb75a
Add a missing language specification
2019-10-03 15:10:04 +03:00
1cae564b5d
Move config task docs to a separate file and mark it as WIP
2019-10-03 14:12:57 +03:00
6baa037903
Move database maintenance tasks docs to a separate file
2019-10-03 11:17:29 +03:00
8e08d5b233
MkDocs does not like if a paragraph doesn't have a newline after it
2019-10-03 11:02:07 +03:00
2656f41818
Remove silent mode note as it's no longer relevant
2019-10-03 10:57:27 +03:00
aefb4dcff5
Cheatsheet: Use note/warning blocks instead of bold text
2019-10-03 10:54:41 +03:00
e560d65db3
Fix a typo in activity expirations
2019-10-03 10:45:40 +03:00
25849157aa
Remove fe settings from :instance as they no longer do anything
2019-10-03 10:43:38 +03:00
4e70009490
Move bold text in RemoveIp description into a proper warning
2019-10-03 10:39:53 +03:00
cb162678df
Add missing language spec
2019-10-03 10:37:34 +03:00
66450f8615
Cheatsheet: Move the deprecated config warning into a warning block
2019-10-03 10:36:01 +03:00
2cbe2dcbde
Oops
2019-10-03 10:31:59 +03:00
b4ca864c6b
Move user tasks docs to a separate file
2019-10-03 10:15:24 +03:00
8fd47a4a5a
Use consistent command signature
2019-10-03 09:38:24 +03:00
f5372bfb4a
Fix up some headings
2019-10-03 09:36:35 +03:00
d39ccc2e7f
Move uploads task docs to a separate file
2019-10-03 09:35:21 +03:00
808d0a0170
Move relay docs to a separate file
2019-10-03 09:10:31 +03:00
6435ba83cd
Move instance CLI task docs to a text file
2019-10-03 09:06:06 +03:00
a54739a530
Improve styling of CLI tasks
2019-10-03 08:51:57 +03:00
869ea2ab90
Move digest email docs to a separate file and improve styling
2019-10-03 01:10:36 +03:00
bd9c7807fb
Move emoji task docs to a separate file
2019-10-03 01:03:47 +03:00
2767c413fb
Remove a reference to inline docs since everything it describes is
...
described in the cheatsheet already and add A TODO
2019-10-03 00:36:18 +03:00
0ba5c1a9d7
Fix more links
2019-10-03 00:22:14 +03:00
b8e5e46fa8
Fix references to other pages
2019-10-03 00:18:32 +03:00
74d682a09e
Remove Small customizations as it's contents have been integrated into
...
static_dir.md
2019-10-03 00:02:01 +03:00
838ff12ec5
Remove "General tips for customizing Pleroma FE" because it's no longer
...
relevant and we have actual fe docs now
2019-10-02 23:58:57 +03:00
03e1898917
Rename "Configuration" to "Configuration Cheat Sheet" and explain a bit
...
about how Pleroma Configuration works
2019-10-02 23:54:55 +03:00
acc62f327d
Rename some directories because MkDocs uses them for categories
2019-10-02 23:28:45 +03:00
0e41951eab
Pleroma API Readme: Document unreaction endpoint.
2019-10-02 18:20:40 +02:00
93f966ea4b
Update CHANGELOG and pleroma_api.md
2019-10-02 14:51:30 +07:00
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
lain
Hakaba Hitoyo
Ivan Tashkinov
Egor Kislitsyn
rinpatch
Maksim Pechnikov
Maxim Filippov
Sadposter
Alex Schroeder
feld
Ariadne Conill
Phil Hagelberg
eugenijm
Haelwenn
Jill H.
Sergey Suprunenko
Haelwenn (lanodan) Monnier
kPherox
Ekaterina Vaartis
Rachel Fae Fox
Alex S
Angelina Filippova
AkiraFukushima
ultem
aries
x0rz3q
Pierce McGoran
Roman Chvanikov
Sachin Joshi
Mike Verdone
Mark Felder
tom79
tallship
RX14
Ivan Tashkinov
Ivan Tashkinov