tobias/friendica
1
0
Fork 0
Code Pull requests Activity
36296 commits 2 branches 61 tags 203 MiB
Commit graph

36296 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael c471a78b05 Issue 12358: Allow blocking of every contact 2023-01-23 21:44:30 +00:00
Michael d0373ab414 Issue 12603: Support quote in the api / Issue 12654: prevent privacy leakage 2023-01-23 21:24:50 +00:00
Michael 3c14cd65fa Merge remote-tracking branch 'upstream/develop' into api2 2023-01-23 19:00:34 +00:00
Michael ff28044cf6 Issue 12603: Support quotes in the API 2023-01-23 19:00:20 +00:00
Hypolite Petovan 1d0b3e34bc
Merge pull request #12724 from annando/api 
Issue 12682: Fix ids of reshared posts
 2023-01-23 13:28:50 -05:00
Michael 5a01fb0521 Don't show reblogged on single post 2023-01-23 17:56:45 +00:00
Michael 0364972242 Merge remote-tracking branch 'upstream/develop' into api 2023-01-23 17:52:54 +00:00
Hypolite Petovan e959d9e454
Merge pull request #12720 from annando/issue-12702 
Issue 12702: Let the user decide how to handle spoiler texts
 2023-01-23 08:40:47 -05:00
Michael 87e9dafc56 Removed duplicated "be" 2023-01-23 06:48:42 +00:00
Michael 492ba45aa8 Merge remote-tracking branch 'upstream/develop' into issue-12702 2023-01-23 06:44:50 +00:00
Michael 75cac38fe3 Updated messages.po 2023-01-23 06:43:13 +00:00
Michael 557553a856 Updated messages.po 2023-01-23 06:37:45 +00:00
Michael Vogel 807c2dfe6a
Update src/Module/Settings/Connectors.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2023-01-23 04:52:41 +01:00
Hypolite Petovan 6fe85d9e2c
Merge pull request #12718 from annando/config 
More configs moved to key values
 2023-01-22 16:31:17 -05:00
Michael Vogel 9e9aa4b108
Update src/Module/Admin/Summary.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2023-01-22 21:35:24 +01:00
Hypolite Petovan d7f8b77e1d
Merge pull request #12719 from annando/andstatus 
Fetch data from basic auth when one of the parameters is missing
 2023-01-22 15:18:38 -05:00
Michael b2d7c4ec43 Merge remote-tracking branch 'upstream/develop' into api 2023-01-22 19:11:21 +00:00
Michael 8e4e2eecb7 Issue 12702: Let the user decide how to handle spoiler texts 2023-01-22 17:10:31 +00:00
Michael 575fb52438 Fetch data from basic auth when one of the parameters is missing 2023-01-22 14:44:57 +00:00
Michael 415e592886 Debug message removed 2023-01-22 13:58:28 +00:00
Michael 70d942bd8b Updated database.sql 2023-01-22 13:47:33 +00:00
Michael d76963944a More configs moved to key values 2023-01-22 13:40:08 +00:00
Hypolite Petovan 2db935fae2
Merge pull request #12717 from annando/blocked-gserver 
Improved block check for redirects
 2023-01-22 07:57:39 -05:00
Michael edf3e9c4b6 Improved block check for redirects 2023-01-22 12:33:38 +00:00
Michael 2ecc797541 API: Show different ids on reshares / don't check for client secret 2023-01-22 11:25:31 +00:00
Philipp ced77ccbce
Merge pull request #12697 from MrPetovan/bug/deprecated 
Fix a few PHP8.2 deprecation messages
 2023-01-21 23:00:32 +01:00
Hypolite Petovan cbbadbb782
Merge pull request #12712 from nupplaphil/feat/BaseUrl 
Remove BaseURL Auto-Check
 2023-01-21 16:58:56 -05:00
Philipp Holzer cf78f1baea
Fix missing values in sample files 2023-01-21 22:24:00 +01:00
Philipp Holzer 98da37076d
Add more transparent errors and make it possible to see them in logs 2023-01-21 21:07:20 +01:00
Philipp Holzer 8082b68185
Remove another URL check at App 2023-01-21 21:07:20 +01:00
Philipp Holzer 3de78fc60b
Remove BaseURL Auto-Check 2023-01-21 21:07:20 +01:00
Hypolite Petovan 73c8720d41 Declare history property in Mastodon\Card 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1383173055
 2023-01-21 14:25:21 -05:00
Hypolite Petovan c79cec2652 Replace deprecated uses of ${var} in strings 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1383147421
 2023-01-21 14:25:21 -05:00
Hypolite Petovan 7e618856ab Replace deprecated use of "self" in callables 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1383147421
 2023-01-21 14:25:21 -05:00
Hypolite Petovan 881cb456e2 Throw an exception when parse_url fails in HttpClient->request 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1383147421
 2023-01-21 14:25:21 -05:00
Hypolite Petovan 9ff3aca3b2
Merge pull request #12711 from nupplaphil/bug/config_toString 
Config Fixings & Dice update
 2023-01-21 14:25:01 -05:00
Philipp Holzer a7c4a3023a
Add "Database::INSERT_IGNORE" for the initial value check 2023-01-21 20:02:40 +01:00
Philipp Holzer eefd0b1143
fix PHP-CS 2023-01-21 19:47:47 +01:00
Philipp ac0e2aa901
Update tests/src/Core/Config/Util/ConfigFileTransformerTest.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2023-01-21 19:44:27 +01:00
Philipp Holzer 9627af924a
Add support for toString/Serializable 2023-01-21 19:42:48 +01:00
Philipp Holzer 5a9e9cc41b
Replace Level-2 Dice patch with new release 2023-01-21 19:42:47 +01:00
Philipp 62a6a5614d
Merge pull request #12707 from MrPetovan/bug/contact-page 
Fix connection acknowledgement not appearing on contact page
 2023-01-21 19:38:59 +01:00
Hypolite Petovan c3381c8b05 Updated main translation file after removing strings 2023-01-21 09:29:08 -05:00
Hypolite Petovan d3ef2b23cc Don't select deleted contact when in Contact::createFromProbeForUser 2023-01-21 09:18:17 -05:00
Hypolite Petovan 6749ace4b7 Reset pending value when unfollowing a contact 2023-01-21 09:18:17 -05:00
Hypolite Petovan 5519b50900 Apply changes to user-contact table first in Contact::update 
- The truncateFieldsForTable call in the same method was potentially restricting the fields that could be updated in the user-contact table
 2023-01-21 09:18:17 -05:00
Hypolite Petovan dcfb8bb73e Fix connection acknowledgement not appearing on contact page 
- Remove obsolete template variables
- Move contact_edit vier template to base template
 2023-01-21 09:18:17 -05:00
Hypolite Petovan 0681f94334
Merge pull request #12700 from Quix0r/features/blocklist-gserver 
Blocked domains flood gserver entries
 2023-01-20 22:39:12 -05:00
Roland Häder 27969e8ca6
Continued: 
- moved if() block to suggested position by MrPetovan, for me I want to have all
  conditions checked at the start of the method, e.g. no unwanted null
  references or (in this case) if the URL is blacklisted
- normalized URLs are without SSL, means http://host/path/file.ext so they exist
  only once for contacts and servers (aka. instances)
- documented returned type `void`
 2023-01-21 01:07:14 +01:00
Roland Häder ba08692403
Continued: 
- just for consistency ...
 2023-01-20 02:43:59 +01:00