1
1
Fork 0
Commit graph

8031 commits

Author SHA1 Message Date
1bb25de287 Applied change from PR #10763 2021-09-26 12:17:30 +00:00
0bb169b4ed Check for reply existence before using its values in Model\Mail
- Address https://github.com/friendica/friendica/issues/10474#issuecomment-925263894
2021-09-26 08:15:07 -04:00
9d77958247 Ensure parent exists before adding reply to elements in OStatus and Feed
- Address https://github.com/friendica/friendica/issues/10474#issuecomment-927118628
2021-09-26 08:15:07 -04:00
e08c5ca2e0 Another try ... 2021-09-26 04:16:21 +00:00
1e583b4f35 Space removed 2021-09-26 04:07:02 +00:00
171cbf0512 Removed spaces 2021-09-26 04:05:46 +00:00
96055cafff Merge remote-tracking branch 'upstream/develop' into conversation-moved 2021-09-26 03:57:31 +00:00
a2532ad755 Merge remote-tracking branch 'upstream/develop' into user-contact 2021-09-26 03:07:59 +00:00
d8febbe45e Add new hook to support unfollow contacts on non-native networks 2021-09-25 16:15:06 -04:00
1f96742695 Merge remote-tracking branch 'upstream/develop' into conversation-moved 2021-09-25 18:38:50 +00:00
3fddf3807a Merge remote-tracking branch 'upstream/develop' into user-contact 2021-09-25 18:34:55 +00:00
d4fd151227 Partly reverting formatting to cause a code style checker error 2021-09-25 08:06:38 +00:00
5cfb0cb58a Last style stuff ... 2021-09-24 04:52:34 +00:00
943f1961ea Style again 2021-09-24 04:50:47 +00:00
8fd8241797 Style again 2021-09-24 04:46:30 +00:00
64d181c1cc Code style 2021-09-24 04:35:27 +00:00
f696fce824 Reformatting 2021-09-23 21:53:52 +00:00
26fa5e8b3f Moved functions 2021-09-23 21:29:36 +00:00
0ad904c185 The conversation functionality moved to a class 2021-09-23 21:18:36 +00:00
7f7f0eb10c Improve compacting error logging in Util\JsonLD
- Exceptions thrown by friendica/json-ld are nested and their string representation shows all the exception chain
2021-09-22 23:09:46 -04:00
840d9823d4 Log unexpected value 2021-09-22 03:25:01 +00:00
7ac76639c5 AVoid warning when fetching page data 2021-09-22 02:41:24 +00:00
be3fb5f205
Merge pull request #10730 from annando/public-contact-list
Display the public contacts for profile visitors
2021-09-19 17:32:51 -04:00
325342a886 Renamed variable 2021-09-19 17:56:44 +00:00
9c73e49db7 Make posts on the profile page writable 2021-09-19 10:53:19 +00:00
f032f66b38 Display the public contacts for profile visitors 2021-09-19 10:06:42 +00:00
3dddea96fa Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact 2021-09-18 20:27:24 +00:00
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
c00da77c67
Add feedback 2021-09-18 12:55:17 +02:00
fd22906d70
Add feedback 2021-09-18 12:51:10 +02:00
6893e2c3f7
Add feedback / revert fix for $item['post-type'] 2021-09-18 12:51:09 +02:00
462f76352e
Add feedback :-) 2021-09-18 12:51:09 +02:00
89a085a12c
Check DBA::count() result 2021-09-18 12:51:08 +02:00
644f312896
Fix various Notices 2021-09-18 12:51:06 +02:00
a91e3f5dbc Issue 10720: Use different path scheme for user avatars 2021-09-17 18:36:20 +00:00
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
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
b18f92ea72 Fixed indendation 2021-09-14 20:46:59 +00:00
f99c4ca704 Removing unused variable 2021-09-14 08:08:50 +00:00
72fa4e9970 Better handling of displaying peertube videos 2021-09-14 07:52:53 +00:00
d33fea1993 Fix: Use the $uid 2021-09-14 02:00:40 +00:00
e3413cf959 Issue 10706: Publish public custom fields in AP 2021-09-14 01:28:58 +00:00
2926282f8d More fields added to "user-contact" 2021-09-13 14:20:20 +00:00
5abc1543fd Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact 2021-09-13 12:31:30 +00:00
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
a65fbcebe7
Fixing #10699 (prohibits blocking and ignoreing from the photo menu) 2021-09-12 21:20:12 +02:00
3eea4b1130 Use "rel" for "self" instead of using a separate field 2021-09-12 19:04:27 +00:00
19c3e55ca8 Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact 2021-09-12 12:36:04 +00:00
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
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
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
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
6579a3a106 Use post type "photo" for multiple photos as well 2021-09-12 01:58:29 +00:00
9191daf12f Fix commenting on public posts 2021-09-12 01:52:10 +00:00
eeec6aaeb9 Removed unused "use" 2021-09-11 13:02:36 +00:00
1e123ace12 Only fetch, not probe 2021-09-11 13:00:12 +00:00
10cb52bc00 Only add user contacts, alternate way to fetch public contact id 2021-09-11 12:43:46 +00:00
5702944116
Add the possibility to use a different configuration directory 2021-09-11 14:33:26 +02:00
5113987031 Added update function to add user-contact entry 2021-09-11 07:59:46 +00:00
f33a98578d Capitalization 2021-09-10 23:59:33 +00:00
b170dd765d Insert and update some more fields 2021-09-10 20:53:10 +00:00
2486c8031b update for user-contact is added 2021-09-10 20:22:24 +00:00
9c14eb0c6b Use centralized function to update contact entries 2021-09-10 18:21:19 +00:00
8b450be09b Move unsecured GET endpoint handlers before security token check in Module\Contact 2021-09-10 12:05:43 -04:00
75d3f5094b
Merge pull request #10683 from annando/proxify
Make the proxy functionality optional
2021-09-10 10:24:17 -04:00
a4b0ab90b1 Insert a user-contact for every contact 2021-09-10 13:05:16 +00:00
634db1ec85 Changed text 2021-09-10 00:30:11 +00:00
bdb5aa6bd9 Make the proxy functionality optional 2021-09-09 12:40:19 +00:00
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
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
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
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
7ee88c3457 Improve documentation of $old_fields possible values in DBA::update and Database->update 2021-09-05 14:54:50 -04:00
bd09f5f665
Merge pull request #10669 from annando/no-rino
Remove all traces of "rino"
2021-09-05 14:53:46 -04:00
52ca3e5417 Remove all traces of "rino" 2021-09-05 18:34:44 +00:00
fc46744183
Fix Photo::delete() 2021-09-05 19:20:43 +02:00
d89f004a2a Issue 10651: Improved logging 2021-09-04 04:51:20 +00:00
ce6f6978bd Use the correct function is adviced ... 2021-09-03 04:20:32 +00:00
307cfef12b Select all fields 2021-09-03 04:09:02 +00:00
6bb8b63da0 Adding gravity to avoid notices 2021-09-03 04:05:29 +00:00
1852ea98cf
Merge pull request #10657 from annando/self-unfollow
Don't offer to unfollow yourself
2021-09-02 20:04:16 -04:00
4140a59332
Merge pull request #10658 from nupplaphil/feat/storage_naming
Rename Storage Backend labels
2021-09-02 19:55:15 -04:00
687e6841bc
Rename Storage Backend labels 2021-09-02 23:27:35 +02:00
547a13661a Don't offer to unfollow yourself 2021-09-02 19:38:10 +00:00
64fd94fc74 Issue 10651: remote comments appeared as own posts 2021-09-02 05:57:50 +00:00
58abaf5c53 Merge remote-tracking branch 'upstream/2021.09-rc' into issue-10640-c 2021-09-01 18:34:24 +00:00
c8d2c87af0 Issue 10640 - Inverse user display settings 2021-09-01 18:29:45 +00:00
728e82d8b0
Improve translation for Storage module 2021-09-01 14:00:23 +02:00
1665b54c6f
Fix variable assignment alignment in Module\Admin\Site 2021-08-31 16:01:20 -04:00
13ae96e9e1 Some more "enable" 2021-08-31 19:54:05 +00:00
85e2328b23 Issue 10640: Some more inversed settings 2021-08-31 19:26:17 +00:00
80b13ec232 Fix translations for singular/plural strings 2021-08-31 05:51:08 +00:00
3944e5d38e Disable mail setting when imap support is disabled 2021-08-30 21:17:03 +00:00
e3c7cd25e1 Issue 10640: Use consistent settings to enable protocol support 2021-08-30 19:46:10 +00:00
2bae4dde1f Avoid notices 2021-08-30 12:29:09 +00:00
4f7142198e
Merge pull request #10642 from annando/url-change
Set contact to failed when url changed
2021-08-30 08:12:10 -04:00
9135ff5124 Set contact to failed when url changed 2021-08-29 20:25:21 +00:00