clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
25,756 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

1211 Commits

Author SHA1 Message Date
Michael 98c12006d5 Merge remote-tracking branch 'upstream/develop' into sanitize-gcontact 2019-10-18 18:48:32 +00:00
Michael 4c5b97834b Replaced quotes 2019-10-16 17:13:56 +00:00
Hypolite Petovan 5dcf6bfc58 Remove extra spaces before closing parentheses in src/ 2019-10-16 08:58:09 -04:00
Hypolite Petovan 146646c4d4 Replace deprecated calls to defaults() by ?? and ?: in src/ 2019-10-16 08:38:52 -04:00
Michael f1e7d97b8c Merge remote-tracking branch 'upstream/develop' into sanitize-gcontact 2019-10-15 10:10:12 +00:00
Hypolite Petovan db0630b0f9 Catch missing Certainty bundle exception when checking for exposed password in Model\User 2019-10-12 21:10:03 -04:00
dew-git 811cdcdfcb Fix security vulnerbilities. 
Fix possible length extension attack, predicable generators, timing attacks on hash comparision and improved formatting.
 2019-10-10 15:21:41 -08:00
Michael 11194d6679 Fix: The getGUID function hadn't fetched the GUID from pictures with scale "0" 2019-10-08 04:42:51 +00:00
Philipp 5f80180b47
Merge pull request #7710 from MrPetovan/task/rework-theme-session-vars 
Rework theme session variables
 2019-10-07 18:17:29 +02:00
Michael 4e7d94053e Fix for multiline host-meta, reducement of requests, fix for wordpress 2019-10-06 16:33:39 +00:00
Hypolite Petovan ead0defb48 Rework theme override in Profile::load and App 
- Separate desktop theme from mobile theme in App
 2019-10-06 12:07:06 -04:00
Michael e3431f2d26 Empty line added 2019-10-06 06:08:07 +00:00
Michael 8238081d87 Replace obsolete functionality in "PortableContact" 2019-10-05 23:30:47 +00:00
Michael af5527f896 Unified return value types 2019-10-05 04:50:29 +00:00
Michael aa75e749be Enhanced documentation 2019-10-05 04:22:16 +00:00
Michael 4d1cc44151 Added documentation 2019-10-04 17:29:21 +00:00
Michael cd3dada39c Detect network type via the contacts 2019-10-04 06:33:16 +00:00
Michael a7e518acbd Readded the network parameter 2019-10-04 05:42:54 +00:00
Michael d9a74bd5dd Code transitioning from PortableContacts.php to GServer.php 2019-10-03 23:33:41 +00:00
Michael 2009080327 Remove more test data 2019-10-03 21:39:48 +00:00
Michael 832c765ad5 Hostmeta check, Pleroma version number cleaning 2019-10-03 20:52:04 +00:00
Michael 59b464ade3 PoCo endpoint added 2019-10-03 15:30:07 +00:00
Michael 3eb24d1b5c Nost test code is removed 2019-10-03 14:48:46 +00:00
Michael ae55029028 Additional endpoints added 2019-10-03 13:02:48 +00:00
Michael 25f93cb03a Count known users, check for empty attribute values 2019-10-03 10:44:29 +00:00
Michael 9cbe5c5e0e New class for handling gserver entries 2019-10-03 09:20:36 +00:00
Michael 21e9e9f3c2 Remove obsolete function to guess the base url of a contact 2019-10-02 15:10:42 +00:00
Michael 520c250a41 Some small code adjustments 2019-09-29 19:21:05 +00:00
Michael 5eeca432fe removed unused "f" parameter 2019-09-29 18:59:03 +00:00
Michael c2c1b317e0 Transferring the "addr" value on magic auth 2019-09-29 10:20:53 +00:00
Michael 58fb0beaa3 Delete the cache entry allowing direct login again 2019-09-29 06:26:02 +00:00
Michael 7704758f9c Fix permissionset query 2019-09-28 20:42:33 +00:00
Michael 83b00ef308 New function "isAuthenticated" 2019-09-28 18:09:11 +00:00
Michael 1c26baec46 remote_user is replaced 2019-09-28 09:59:08 +00:00
Michael 6e9026e033 Renamed function, beginning to replace the "remote_user" function 2019-09-28 09:36:41 +00:00
Michael 1ddd2df4b8 Removed obsolete code 2019-09-28 05:37:24 +00:00
Michael 3dd94355b7 Fix permissions when viewing photos, applying same fix to items as well 2019-09-27 05:49:23 +00:00
Michael 704cdf1b5a New function to store the "remote" session value / making the changes work 2019-09-26 04:47:42 +00:00
Michael ec66553032 Reworked "remote" cookie handling 2019-09-25 22:24:17 +00:00
Michael d5c37001cd Empty the "remote" variable, avoid being remote to yourself 2019-09-25 07:02:07 +00:00
Michael 6a376c29d8 Fix session size problems 2019-09-25 05:57:32 +00:00
Michael 87462ec67f Don't use the "url" parameter on redir if it points to the same contact 2019-09-24 21:44:37 +00:00
Michael 5254147ccc Fix "redir" loop 2019-09-23 22:13:20 +00:00
Michael a2105c5dfe Changed documentation 2019-09-21 13:19:00 +00:00
Michael b24ef7247d Don't update the basepath on local check 2019-09-21 13:17:33 +00:00
Michael c364a77d63 Always use direct DFRN transport on local contacts 2019-09-21 12:39:07 +00:00
Michael 64f30d3627 Fix: updateFromProbe failed when updating non-federated networks 2019-09-20 21:01:52 +00:00
Michael 358cbe812a Correction: Must be inverted 2019-09-18 16:37:13 +00:00
Michael 1144863090 Changed "hidewall" behaviour 2019-09-18 05:20:33 +00:00
Hypolite Petovan f5eb8e88f1 Remove obsolete blockquote replacement in Item::prepareBody 2019-09-12 22:18:46 -04:00
Philipp 50cce950f6
Merge pull request #7614 from annando/issue-5721 
Issue 5721: Set permissions of photos in PM
 2019-09-11 22:22:06 +02:00
Michael 4223011a7d Fix a notice about a missing "pending" 2019-09-11 20:03:29 +00:00
Michael a34995a3e5 Issue 5721: Set permissions of photos in PM 2019-09-11 04:08:41 +00:00
Michael b2d6854829 Issue 7285: Perform duplicate check for item URI also with AP 2019-09-10 04:59:12 +00:00
Tobias Diekershoff 3d5d50a25b
Merge pull request #7606 from annando/fix-invalid-url 
Replace not working "redir" link with a working one
 2019-09-10 06:29:55 +02:00
Michael 0a0a961c52 The value is used twice, so use a variable 2019-09-10 04:04:07 +00:00
Michael 8fc8e26e23 Replace not working "redir" link with a working one 2019-09-09 21:37:26 +00:00
Hypolite Petovan 91b0f0465f
Merge pull request #7604 from annando/pending-contacts 
Display pending contacts in the contact list
 2019-09-09 13:49:51 -04:00
Michael 2dbd843ed2 Don't display ignored pending contacts, link to contact request page 2019-09-09 05:29:33 +00:00
Hypolite Petovan 69105928f5 Use destination URL when provided in Contact::magicLink 2019-09-06 08:33:19 -04:00
Michael 33006d8455 Merge remote-tracking branch 'upstream/2019.09-rc' into performance 2019-09-03 15:02:16 +00:00
Michael 52d8b618f0 Type hints 2019-09-03 03:59:46 +00:00
Michael Vogel 046b5a1eac Fix performance issues due to relay contact requests 2019-09-02 15:11:07 +02:00
Michael 6af4c90dff Fix delivery counter / archive relay contacts 2019-09-02 03:25:05 +00:00
Michael 74f12baac2 Follow up to #7582: Only update the contact when needed 2019-08-31 09:27:19 +00:00
Michael Vogel f293e352ec Renamed function parameter 2019-08-30 07:59:18 +02:00
Michael Vogel 3b92f7357c Renamed function 2019-08-30 07:52:21 +02:00
Michael Vogel 438394bc1d Type hints, corrected wrong documentation 2019-08-30 07:38:42 +02:00
Michael Vogel 481376dd6f Avoid not performing unarchiving 2019-08-29 08:41:55 +02:00
Michael Vogel 66eab2b44f Don't handle deleted contacts / removed unneeded parameter 2019-08-29 07:22:29 +02:00
Michael Vogel 503a5be06c Fixed query (not all duplicates had been found) 2019-08-29 06:55:36 +02:00
Michael Vogel ef02a1cb7b Check fpr duplicated contacts upon inserting them 2019-08-29 06:07:07 +02:00
Michael Vogel 40a7d6eb42 Merge remote-tracking branch 'upstream/2019.09-rc' into contact-dba 2019-08-29 04:14:01 +02:00
Michael Vogel 90b9ad8bed New contact table functions with check for duplicates 2019-08-28 22:27:48 +02:00
Hypolite Petovan e6f00455f3
Merge pull request #7578 from annando/archive 
Don't transmit content to already archived contacts
 2019-08-28 11:12:00 -04:00
Michael Vogel 96b895bc3a Changed array name, fixed bug that prevented testing most Diaspora endpoints 2019-08-28 16:54:49 +02:00
Michael Vogel 3c9834922c Check if the Diaspora endpoint is archived 2019-08-28 16:02:19 +02:00
Michael Vogel cf170c9c02 Fixed count, added to-do 2019-08-28 06:44:37 +02:00
Philipp Holzer 4733b1e5e0
Fixing PHP Fatal Error for Model\Contact (usage of non available contact) 2019-08-28 01:40:28 +02:00
Michael Vogel 9b7432781b Don't transmit content to already archived contacts 2019-08-27 21:01:11 +02:00
Michael 7d50a086e0 Issue 7559: Merge contact duplicates 2019-08-26 15:51:56 +00:00
Jeroen De Meerleer cf95e0f856 Translating the vcard 2019-08-20 16:38:46 +02:00
Michael 5a1a5a54dc Delivery count now counts the failed delivery attempts as well 2019-08-20 07:39:13 +00:00
Philipp 0f32ab10d8
Merge pull request #7524 from MrPetovan/bug/7337-check-dead-enumeratePermissions 
Prune unavailable contacts from AP envelope
 2019-08-18 15:17:11 +02:00
Philipp Holzer b63b1570d6
removed superfluous comment 2019-08-18 15:04:36 +02:00
Philipp Holzer 9d3ad8f435
Fix https://github.com/friendica/friendica/issues/7298#issuecomment-522215746 2019-08-18 14:55:24 +02:00
Hypolite Petovan 828368267c Add check_dead parameter to Item::enumeratePermissions 2019-08-16 23:59:48 -04:00
Philipp Holzer 08be92a862
Moved BaseURL to App namespace (because similar type as Arguments/Modules/Modes) 2019-08-15 17:23:00 +02:00
Hypolite Petovan 425876316f
Merge pull request #7508 from nupplaphil/task/arguments_module_class_2 
Add Arguments & Module class (again)
 2019-08-14 07:52:55 -04:00
Michael aab6b739d8 Use the contact id whenever we are following the contact 2019-08-13 15:54:47 +00:00
Philipp Holzer 0af9747c6c
Add Arguments & Modules class 2019-08-13 16:29:11 +02:00
Hypolite Petovan fcb1a78352
Revert "Introduce Arguments / Module class" 2019-08-11 18:01:11 -04:00
Philipp 541cdcd515
Merge pull request #7503 from MrPetovan/bug/fix-private-permissions 
Use contact.network field instead of contact.protocol in Group::expand
 2019-08-11 23:26:34 +02:00
Hypolite Petovan 5feeffbe79 Use network field instead of protocol in Group::expand 
- contact.protocol field isn't systematically populated
 2019-08-11 16:41:00 -04:00
Philipp Holzer 2c5ba7fc15
Introduce Arguments / Module class 
- move from App
- add tests for Arguments/Module class
 2019-08-11 14:24:05 +02:00
Hypolite Petovan 19adb9a1a0 Fix trending tags variable name mistakes in Model\Term 2019-08-06 20:52:54 -04:00
Hypolite Petovan 9e8ae520b8 Move trending tags queries to Model\Term 2019-08-06 07:36:51 -04:00
Michael bdc07b4213 Added support for image descriptions and multiple image posts to external services 2019-08-05 16:27:45 +00:00
Michael cb77b1af8c API: We now transmit the text description there as well 2019-08-04 03:45:23 +00:00
Michael 764c70720c Moved several database stuff out of the transaction to avoid error 1205 2019-08-03 10:36:21 +00:00
Hypolite Petovan e5321ecc7f
Merge pull request #7458 from annando/fix-7449 
Fix issue 7449: Image permissions are now set like before
 2019-08-02 13:26:57 -04:00
Michael bcadf19289 "contact-id" has to be set, after "author-id" had been set 2019-08-02 17:17:51 +00:00
Michael 7c10807d1d Clarified description 2019-08-02 16:59:26 +00:00
Michael 9819d31591 Merge remote-tracking branch 'upstream/develop' into contact-id-new 2019-08-02 16:52:34 +00:00
Michael 418009ffea Improved PR 7452: We now respect the "self" contact 2019-08-02 16:46:26 +00:00
Michael 01ef630322 Fixed description 2019-08-02 16:42:24 +00:00
Michael d95ef96cca Fix issue 7449: Image permissions are now set like before 2019-08-02 16:38:50 +00:00
Hypolite Petovan 2e6b72ba62
Revert "Reworked contact-id generation" 2019-08-01 20:39:42 -04:00
Michael Vogel e8459cce34
Merge pull request #7381 from MrPetovan/task/7309-frio-compose 
[frio] New Compose page
 2019-08-01 08:15:02 +02:00
Michael 88aa777410 Moved user block 2019-07-31 16:09:03 +00:00
Michael c936232575 Added header 2019-07-31 16:07:50 +00:00
Michael cdc44e26de Log level changed 2019-07-31 16:05:28 +00:00
Michael b377906b77 Merge remote-tracking branch 'upstream/develop' into tag-deliver-delete 2019-07-31 14:11:06 +00:00
Michael 0696026380 Improved logging when item had been deliberately deleted after creation 2019-07-31 14:09:27 +00:00
Michael 8ddcd8417d Reworked contact-id generation 2019-07-30 22:02:32 +00:00
Hypolite Petovan f010beaa95 Fix formatting in Model\Group 
- Improve logging call
- Replace removed App->getDatabase call
 2019-07-29 20:31:50 -04:00
Hypolite Petovan 361958ad04 Replace removed Contact::select by Contact::selectToArray 
- Add explicit DBA::close in Model\Group
 2019-07-29 20:31:49 -04:00
Hypolite Petovan c149ba2d59 Replace $uid parameter by $obj['uid'] in Item::enumeratePermissions 2019-07-29 20:31:49 -04:00
Hypolite Petovan 3e6018b3f2 Add meta protocol group for private post support 2019-07-29 20:31:48 -04:00
Hypolite Petovan 4e427f615b Only include natively supported protocol contacts in meta-groups 2019-07-29 20:31:48 -04:00
Hypolite Petovan 0579252362 Add user meta-groups for followers and mutual contacts 
- Both Group::expand and Item::enumeratePermissions now have a user id parameter to expand meta-groups
 2019-07-29 20:31:46 -04:00
Hypolite Petovan 50f3098495 Revert adding DBA::toArray to Item::selectToArray 2019-07-28 00:12:49 -04:00
Hypolite Petovan 3334a3d497 Fix indent in Model\Item 2019-07-28 00:06:05 -04:00
Hypolite Petovan a61ce4fed0 Ensure *toArray returns an array 2019-07-28 00:03:42 -04:00
Philipp Holzer 2f5928f43a
Refactoring Profile:: selectors 2019-07-28 00:19:38 +02:00
Philipp Holzer 7613704d2f
improve Profile model 2019-07-27 23:56:54 +02:00
Philipp Holzer 2a87464c97
Replace q() call with Profile::get() method 2019-07-27 23:54:12 +02:00
Michael f48452dd29 Some more 2019-07-27 16:57:00 +00:00
Michael 580f9cf6c7 Replaced some " with ' 2019-07-27 16:53:48 +00:00
Michael 1a3bf05dfb Changed "Contact::select" to "Contact::selectToArray" 2019-07-27 15:57:23 +00:00
Michael 89454fabdb Changed "Photo::select(" to "Photo::selectToArray(" 2019-07-27 15:52:02 +00:00
Michael ac6bfd3e4c Changed Attach::select to Attach::selectToArray 2019-07-27 15:47:17 +00:00
Michael 2be0ceac6b Added "selectToArray" functions in DBA and Item 2019-07-27 14:33:17 +00:00
Michael e256876ec1 Support for empty nick names 2019-07-24 19:30:36 +00:00
Hypolite Petovan 64b10205bc
Merge pull request #7420 from annando/reshare-contact 
Fix contact issues with fake reshares from Twitter
 2019-07-23 05:05:44 -04:00
Michael 2a213c215e Fix contact issues with fake reshares from Twitter 2019-07-23 04:26:20 +00:00
Hypolite Petovan cd257dc7e8 Enable app-specific password authentication for API login 2019-07-22 07:56:36 -04:00
Hypolite Petovan 1a164b0dc5 Add two-factor app-specific password settings page 
- Add two-factor app-specific model
- Add link to new page from 2fa settings index page
 2019-07-22 07:56:00 -04:00
Hypolite Petovan a149d6ec44 Move recovery code model to sub-folder 2019-07-22 07:41:01 -04:00
Michael 53ffe5a2e1 Fetch Diaspora posts by url 2019-07-21 07:37:50 +00:00
Michael 931c190566 Removed test output 2019-07-18 06:20:54 +00:00
Michael 41a1c1c3e6 Fetch items by given uri 2019-07-18 06:11:02 +00:00
Michael e247a14d2b Added the option to only receive top level posts from people you follow 2019-07-17 21:37:13 +00:00
Hypolite Petovan 19247b62ae Ensure $uid parameter of Feature::isEnabled to be an integer 2019-07-15 22:00:49 -04:00
Hypolite Petovan d1c048cd4b
Fix typo in Model\Config\PConfig 2019-07-15 16:32:13 -04:00
Philipp Holzer ebf00e32a1
minor phpdoc fixings 2019-07-15 20:54:33 +02:00
Philipp Holzer 9d98a4ce3a
Refactor PConfiguration 2019-07-15 20:13:53 +02:00
Hypolite Petovan 6c68b8359d
Merge pull request #7372 from nupplaphil/task/simplify_config 
Refactor Configuration (Simplify Config Part 3)
 2019-07-14 19:05:09 -04:00
Philipp Holzer aa249adf6d
some more minor fixups (phpdoc, unused using) 2019-07-14 22:49:17 +02:00
Philipp Holzer c293eadb78
Improve & fixing Tests 2019-07-14 22:12:11 +02:00