friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
25,841 Commits 2 Branches 63 Tags 237 MiB
Commit Graph

1246 Commits

Author SHA1 Message Date
Michael ed58af25a5 show pinned items 2019-11-07 06:53:18 +00:00
Michael cf56992444 We can now pin our own posts 2019-11-07 05:39:15 +00:00
Michael Vogel 6ba7b5961c
Merge pull request #7798 from MrPetovan/task/rework-photo-functions 
Rework photo functions
 2019-11-02 21:20:38 +01:00
Hypolite Petovan 5cd8cb7134 Add unfollow link to output of Contact::photoMenu 
- Add rel and pending keys to output of Contact::getDetailsByURL
- Add rel and pending keys to output of Contact::getDetailsByAddr
 2019-11-02 12:48:03 -04:00
Hypolite Petovan b8a22de2d2
Merge pull request #7800 from annando/manually-improve 
AP: Respect "manually approve" during contact request
 2019-11-02 12:45:43 -04:00
Michael 9461446374 Respect "manually-improve" during contact request 2019-11-02 16:24:54 +00:00
Michael e27ebaee48 Respect "manually improve" during contact request 2019-11-02 16:20:17 +00:00
Hypolite Petovan 26b5de9a76 Rename Photo::newResource() result variable from $hash to $resource_id 2019-11-02 07:48:45 -04:00
Hypolite Petovan 03bf1dcbd3 Move Object\Image static methods to Util\Images 
- Optimize imports in modified files
 2019-11-02 07:48:45 -04:00
Philipp Holzer aa7be41728
Fix ACLFormatterTest 
- Add nullable to expand() function again
- Add angle bracket support to toString()
 2019-11-01 14:13:29 +01:00
Michael 44cc750f79 Some more warnings removed 2019-10-31 07:33:25 +00:00
Michael dc065eed42 Fix several warnings and errors 2019-10-30 06:50:20 +00:00
Hypolite Petovan d6ff89d7b4
Merge pull request #7769 from annando/issue-3229 
Changed OpenID registration
 2019-10-29 10:32:02 -04:00
Philipp Holzer 3eda62bfa6
Check null for acl-fields 2019-10-28 18:16:10 +01:00
Michael bfbce16d0b Merge remote-tracking branch 'upstream/develop' into issue-3229 2019-10-28 13:50:06 +00:00
Philipp Holzer d9d71ea1e6
Wrong condition for home notifications 2019-10-28 00:01:35 +01:00
Philipp Holzer 3465bd9f11
rename methods 2019-10-26 05:02:14 +02:00
Philipp Holzer fdc0236aa1
Fix arguments 2019-10-26 04:37:31 +02:00
Philipp Holzer a72e65a760
Adapt class structure 
- Introduce constants
- Add constructor parameters
- Add typehints
- Renamed fields more meaningful
- Renamed method names to match identifier
- Adjust PHP doc
- Add GetClass call at used places
 2019-10-26 04:03:27 +02:00
Philipp Holzer 1f368d469f
Move Friendica\Core\NotificationsManager to Friendica\Model\Notify 2019-10-26 02:01:46 +02:00
Philipp b34afa990b
Merge pull request #7767 from MrPetovan/bug/fatal-errors 
Expect outbox->first to be a Link structure in Model\GContact
 2019-10-25 08:46:42 +02:00
Philipp Holzer 3897c74deb
Add docs 2019-10-25 00:10:20 +02:00
Michael aca701bef8 Changed OpenID registration 2019-10-24 20:23:26 +00:00
Philipp Holzer 2fba7ed477
Rename namespace 2019-10-24 21:40:13 +02:00
Philipp Holzer 07cea24430
Move Activity/Namespaces defines to constants 2019-10-24 21:40:12 +02:00
Hypolite Petovan b0987f637c Expect outbox->first to be a Link structure in Model\GContact 
- See https://www.w3.org/TR/activitystreams-vocabulary/#dfn-first
- Addresses https://github.com/friendica/friendica/issues/7675#issuecomment-545300597
 2019-10-24 08:47:00 -04:00
Philipp Holzer c9e1098dd2
Adapt naming convention 2019-10-23 21:39:00 +02:00
Philipp Holzer 52c42491c4
Move activity_match() to Protocol\Activity::match() 
- With tests
 2019-10-23 02:05:11 +02:00
Philipp Holzer 9e94e8b48c
Remove function prepare_text and use BBCode::convert() instead 2019-10-23 00:58:13 +02:00
Philipp Holzer f65f7f11c3
Move expand_acl to ACLFormatter::expand() 
- including tests
 2019-10-23 00:40:14 +02:00
Philipp Holzer a3e350313d
Move redir_private_images to Item::addRedirLinkToImageLinks() 2019-10-23 00:20:44 +02:00
Hypolite Petovan 2edccf9341
Merge pull request #7759 from nupplaphil/task/mod_receive 
Move mod/receive to src/Module/Diaspora/receive
 2019-10-21 11:59:13 -04:00
Michael 17bb1eaf12 Fix fatal error 2019-10-21 05:52:45 +00:00
Philipp Holzer 7716374593
Move mod/receive to src/Module/Diaspora/receive 
- Added routes
- Make Diaspora::decode(Raw) more explicit
- Add new User::getByGuid() method
 2019-10-20 13:07:16 +02:00
Michael 1f98067189 Cleaned up code / removed legacy stuff 2019-10-19 16:41:07 +00:00
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