Michael
3dddea96fa
Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact
2021-09-18 20:27:24 +00:00
Hypolite Petovan
24ecf5954c
Merge pull request #10721 from annando/issue-10720-avatar
...
Issue 10720: Use different path scheme for user avatars
2021-09-18 09:30:08 -04:00
Philipp
c00da77c67
Add feedback
2021-09-18 12:55:17 +02:00
Philipp
fd22906d70
Add feedback
2021-09-18 12:51:10 +02:00
Philipp
6893e2c3f7
Add feedback / revert fix for $item['post-type']
2021-09-18 12:51:09 +02:00
Philipp
462f76352e
Add feedback :-)
2021-09-18 12:51:09 +02:00
Philipp
89a085a12c
Check DBA::count() result
2021-09-18 12:51:08 +02:00
Philipp
644f312896
Fix various Notices
2021-09-18 12:51:06 +02:00
Michael
a91e3f5dbc
Issue 10720: Use different path scheme for user avatars
2021-09-17 18:36:20 +00:00
Hypolite Petovan
9a0c3cc834
Simplify max_data parameter for Temporal::getDateTimeField
2021-09-15 15:56:44 -04:00
Michael Vogel
695df7507a
Merge pull request #10713 from MrPetovan/task/10672-contact-module-security-token
...
Use CSRF token as name and value for contact deletion confirm form
2021-09-15 07:55:34 +02:00
Hypolite Petovan
44ec4de14c
Use CSRF token as name and value for contact deletion confirm form
2021-09-14 17:28:42 -04:00
Michael Vogel
a689db7b64
Update src/Protocol/ActivityPub.php
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-09-14 23:22:57 +02:00
Michael
b18f92ea72
Fixed indendation
2021-09-14 20:46:59 +00:00
Michael
f99c4ca704
Removing unused variable
2021-09-14 08:08:50 +00:00
Michael
72fa4e9970
Better handling of displaying peertube videos
2021-09-14 07:52:53 +00:00
Michael
d33fea1993
Fix: Use the $uid
2021-09-14 02:00:40 +00:00
Michael
e3413cf959
Issue 10706: Publish public custom fields in AP
2021-09-14 01:28:58 +00:00
Michael
2926282f8d
More fields added to "user-contact"
2021-09-13 14:20:20 +00:00
Michael
5abc1543fd
Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact
2021-09-13 12:31:30 +00:00
Hypolite Petovan
d78661817e
Merge pull request #10693 from nupplaphil/feat/config_dir
...
Add the possibility to use a different configuration directory
2021-09-13 07:02:52 -04:00
Philipp
a65fbcebe7
Fixing #10699 (prohibits blocking and ignoreing from the photo menu)
2021-09-12 21:20:12 +02:00
Michael
3eea4b1130
Use "rel" for "self" instead of using a separate field
2021-09-12 19:04:27 +00:00
Michael
19c3e55ca8
Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact
2021-09-12 12:36:04 +00:00
Philipp
27e4586597
Move path determination logic into the ConfigFactory
2021-09-12 13:44:29 +02:00
Michael Vogel
5246b9c4b0
Merge pull request #10697 from MrPetovan/bug/10692-api-expand-entities
...
Prevent expandTags to be performed on existing links in Module\Api\Mastodon\Statuses
2021-09-12 06:47:51 +02:00
Hypolite Petovan
e3a2f17f9f
Merge pull request #10696 from annando/photo-type
...
Use post type "photo" for multiple photos as well
2021-09-12 00:19:47 -04:00
Hypolite Petovan
8e99b7f775
Refine BBCode::expandTags regular expression
...
- Now requires the tag to be preceded by either a non-word character or a start of a line
- Added corresponding tests
2021-09-12 00:06:14 -04:00
Hypolite Petovan
5a93bb6eff
Prevent expandTags to be performed on existing links in Module\Api\Mastodon\Statuses
...
- We never need to expand tags inside of an already existing BBCode url tag
2021-09-12 00:05:22 -04:00
Michael
6579a3a106
Use post type "photo" for multiple photos as well
2021-09-12 01:58:29 +00:00
Michael
9191daf12f
Fix commenting on public posts
2021-09-12 01:52:10 +00:00
Michael
eeec6aaeb9
Removed unused "use"
2021-09-11 13:02:36 +00:00
Michael
1e123ace12
Only fetch, not probe
2021-09-11 13:00:12 +00:00
Michael
10cb52bc00
Only add user contacts, alternate way to fetch public contact id
2021-09-11 12:43:46 +00:00
Philipp
5702944116
Add the possibility to use a different configuration directory
2021-09-11 14:33:26 +02:00
Michael
5113987031
Added update function to add user-contact entry
2021-09-11 07:59:46 +00:00
Michael
f33a98578d
Capitalization
2021-09-10 23:59:33 +00:00
Michael
b170dd765d
Insert and update some more fields
2021-09-10 20:53:10 +00:00
Michael
2486c8031b
update for user-contact is added
2021-09-10 20:22:24 +00:00
Michael
9c14eb0c6b
Use centralized function to update contact entries
2021-09-10 18:21:19 +00:00
Hypolite Petovan
8b450be09b
Move unsecured GET endpoint handlers before security token check in Module\Contact
2021-09-10 12:05:43 -04:00
Hypolite Petovan
75d3f5094b
Merge pull request #10683 from annando/proxify
...
Make the proxy functionality optional
2021-09-10 10:24:17 -04:00
Michael
a4b0ab90b1
Insert a user-contact
for every contact
2021-09-10 13:05:16 +00:00
Michael
634db1ec85
Changed text
2021-09-10 00:30:11 +00:00
Michael
bdb5aa6bd9
Make the proxy functionality optional
2021-09-09 12:40:19 +00:00
Hypolite Petovan
e9aa27b19f
Add form security token to contact actions
...
- Add token to batch POST actions
- Add token to individual GET actions
2021-09-06 12:30:38 -04:00
Hypolite Petovan
d20b53607d
Distinguish between public and private contact in contact actions
...
- Block and ignore is done relating to a public contact (uid = 0)
- Update and drop is done relating to a private contact (uid !=0)
- Method documentation has been improved to precise the contact type it needs
- Public and private contact ids are retrieved before acting on contacts
2021-09-06 11:50:46 -04:00
Hypolite Petovan
5262843e63
Add redirect URL parameter to contact batch
...
- This allows redirection to the correct contact tab after a batch action
2021-09-05 14:54:51 -04:00
Hypolite Petovan
6e358bfacf
Remove user-controlled contact archival feature
...
- Archival is managed at the system level for failed probing and doesn't make sense for a user to decide on it
2021-09-05 14:54:50 -04:00
Hypolite Petovan
7ee88c3457
Improve documentation of $old_fields possible values in DBA::update and Database->update
2021-09-05 14:54:50 -04:00