friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-05-17 03:06:42 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity
31135 commits 2 branches 63 tags 241 MiB
Commit graph

7685 commits

Author SHA1 Message Date
Michael ffdbac7e41 Issue 10443: Fix requesting media content 2021-06-28 18:53:10 +00:00
Michael 2f06d271bb Use a default value for "uid" 2021-06-28 13:58:06 +00:00
Michael a1a584f444 External resources are cacheable 2021-06-28 13:09:00 +00:00
Michael 4f95622d73 Only user the user with attached media. 2021-06-28 12:40:58 +00:00
Michael 8ac9b37176 Merge remote-tracking branch 'upstream/2021.06-rc' into proxy2 2021-06-28 10:11:41 +00:00
Michael 6f350c1e59 Use signed requests for fetching private images 2021-06-28 10:08:51 +00:00
Michael 7e200174d6 Replace attachment links in the body 2021-06-28 04:53:20 +00:00
Hypolite Petovan 681c7c0187 Add ExternalStorage dependency to StorageManager 
- Since ExternalStorage isn't instantiated automatically by Dice, we have to provide the dependency manually in StorageManager->getByName
- This requires StorageManager to take one one additional dependency
- Tests are updated with this additional dependency
 2021-06-27 23:15:46 -04:00
Hypolite Petovan faac5b71ce
Merge pull request #10437 from annando/reduce-proxy 
Reduce the usage of the "proxifyUrl" function
 2021-06-27 22:41:14 -04:00
Michael dbf9132ea6 Fixed indendation 2021-06-28 01:34:29 +00:00
Hypolite Petovan 005ba8c388
Merge pull request #10435 from nupplaphil/feat/di_cleanup 
Add constructor injection for ExternalResource Storage
 2021-06-27 21:02:03 -04:00
Michael c89547aead Only proxify images 2021-06-27 19:06:05 +00:00
Michael b46b7b08ba Reduce the usage of the "proxifyUrl" function 2021-06-27 11:50:10 +00:00
Philipp Holzer b5acc07eaf
Add todo for develop phase 2021-06-26 21:17:10 +02:00
Michael de2898988b Inverted condition 2021-06-26 11:31:37 +00:00
Michael 258d5fa695 Issue 10433: Only notify when there had been changes 2021-06-26 11:29:58 +00:00
Philipp Holzer f1f3fa7216
Add constructor injection for ExternalResource 2021-06-25 20:13:50 +02:00
Michael Vogel d9d30d9555
Apply suggestions from code review 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-06-25 20:00:59 +02:00
Michael ed4a18f079 Function to return the avatar and header path for a given contact id 2021-06-25 17:03:35 +00:00
Michael e6e90abc77 AOI: Send "history" section for trends 2021-06-24 22:15:25 +00:00
Michael 89608d5844 Set CORS header fields to support Halcyon 2021-06-24 18:02:29 +00:00
Michael ee25246e41 Standards 2021-06-24 17:37:50 +00:00
Michael 9276f6823b New class for external resources 2021-06-24 17:30:22 +00:00
Michael 96809b3fdd API: Improved avatar handling 2021-06-24 07:08:38 +00:00
Tobias Diekershoff cfc08cbc11 console autoinstall used parameter U twice 
The parameter "-U" was used twice for the database user and for the URL.
As all other database parameters are using the lowercase letter for the
parameter, this was adopted for the dbuser as well.
 2021-06-23 18:05:39 +02:00
Michael df05d6b52a Transmit mediaType for headers as well / use blank image for empty header 2021-06-22 13:58:29 +00:00
Michael dd39b3203b Transmit mediaType, preparation for header image 2021-06-22 03:17:41 +00:00
Hypolite Petovan 47cb89967f
Merge pull request #10420 from annando/usercount 
Don't count the system user as user
 2021-06-21 08:46:56 -04:00
Michael 6b46fdb54e Don't count the system user as user 2021-06-21 04:03:20 +00:00
Michael d5e5a6ea23 Fix fatal error: Uncaught TypeError: Argument 1 passed to Friendica\Model\Post\Media::existsByURIId() must be of the type int, null given 2021-06-21 03:53:53 +00:00
Philipp Holzer 5a6c5e9a17
Fix wrong attachement index 2021-06-20 22:33:05 +02:00
Philipp Holzer d4387d45ee
Cleanup Code 2021-06-20 13:25:45 +02:00
Philipp Holzer 263774eb46
Satisfy PHP-CS 2021-06-20 13:25:45 +02:00
Philipp Holzer 322f0b3ecf
Cleanup Mastodon Factories 2021-06-20 13:25:45 +02:00
Michael 97891fe05b Context: use the correct "select functionality 2021-06-19 18:27:35 +00:00
Michael 7dd5ea42e9 An empty user id does not have children 2021-06-19 06:27:25 +00:00
Michael 09609c40a4 Classname fixed 2021-06-18 05:50:52 +00:00
Michael 7d835ad790 Unused "use" removed 2021-06-18 03:32:20 +00:00
Michael 0a5904a001 API: "created_at" is timestamp 2021-06-18 03:21:38 +00:00
Michael a2b1819721 Fix notice "Undefined index: url in .../src/Protocol/ActivityPub/Transmitter.php on line 611" 2021-06-17 18:48:23 +00:00
Michael Vogel b184df1108
Update src/Object/Api/Mastodon/Account.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-06-17 19:14:35 +02:00
Michael bd016dc680 Photos should point to the local system 2021-06-17 16:55:54 +00:00
Michael fe07dc828b Fix noscrape publishing and pulling, added header 2021-06-17 11:23:32 +00:00
Michael ebd4f59d02 Merge remote-tracking branch 'upstream/2021.06-rc' into public-timeline 2021-06-16 21:01:20 +00:00
Hypolite Petovan 7b91bd1d80
Merge pull request #10410 from annando/oauth 
API: Added OAuth revoke, adding documentation to parameters
 2021-06-16 16:32:45 -04:00
Michael Vogel a256f18159
Update src/Module/OAuth/Token.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-06-16 22:19:26 +02:00
Hypolite Petovan 59204d641d
Merge pull request #10409 from annando/api-link-header 
Set the "Link" header
 2021-06-16 16:16:35 -04:00
Michael 6b3476409a Check for REDIRECT_REMOTE_USER as well 2021-06-16 19:39:51 +00:00
Michael 5e22704f7e API: Added OAuth revoke, adding documentation to parameters 2021-06-16 19:24:44 +00:00
Michael 6e789ec19a No need for +1 and -1 2021-06-16 17:57:01 +00:00
Hypolite Petovan ead0cf370a
Merge pull request #10408 from annando/issue-10392 
Issue 10392: Avoid "Friendica can't display this page at the moment"
 2021-06-16 13:32:17 -04:00
Michael 78d4aff878 Set the "Link" header 2021-06-16 15:02:33 +00:00
Michael ae5f57233e Issue 10392: Avoid "Friendica can't display this page at the moment" 2021-06-16 13:23:07 +00:00
Michael 11d2440425 New functions for the post-view view 2021-06-16 10:16:01 +00:00
Michael 5211c12b0c Merge remote-tracking branch 'upstream/2021.06-rc' into public-timeline 2021-06-16 05:58:11 +00:00
Michael 3796e13142 Force a directory update if previously published 2021-06-16 05:23:43 +00:00
Michael 1ced04e54c Merge remote-tracking branch 'upstream/2021.06-rc' into profile-publish 2021-06-16 05:01:16 +00:00
Michael c17f23423f Chec for missing profile first 2021-06-15 22:01:30 +00:00
Michael e994d02791 Add a profile entry if missing 2021-06-15 21:39:28 +00:00
Michael 0ab24510ef Centzralized functionality to update and publish profile changes 2021-06-15 11:12:44 +00:00
Michael d348e4afca Possibly fixes notice "Undefined index: private in .../src/Model/Item.php on line 3115" 2021-06-14 18:34:11 +00:00
Hypolite Petovan c9ec2e21b3
Merge pull request #10403 from annando/doc-structure 
Updated database structure documentation
 2021-06-14 09:01:58 -04:00
Michael 7106106f11 Formatted index list 2021-06-14 12:15:10 +00:00
Michael 96f07c7288 Indexes and foreign keys added 2021-06-14 08:53:37 +00:00
Michael fd30df7300 Pad the header 2021-06-14 05:58:51 +00:00
Michael 4095e6c9be Pad the lengths of the columns 2021-06-14 05:33:47 +00:00
Michael a827f948c8 Reversed "null" 2021-06-14 05:14:09 +00:00
Michael 31db9dbef7 Added default value "NULL" 2021-06-14 05:08:01 +00:00
Michael bb5e6d248b Added sort order 2021-06-13 20:56:14 +00:00
Michael 84ab5d6159 Updates database structure documentation 2021-06-13 20:33:50 +00:00
Michael bf8cb39102 Diaspora relay functionality is removed 2021-06-13 11:15:04 +00:00
Simon Rupf 8b841ccc51 Reduce batch size for photo processing to reduce memory usage 2021-06-12 20:40:17 +02:00
Michael 24cc82f396 API: (hopefully) improves speed of the public timeline 2021-06-12 15:19:56 +00:00
Michael b7f12051a8 Small fixes 2021-06-12 11:19:23 +00:00
Michael c21cbd936e Changed sorting 2021-06-12 10:12:02 +00:00
Michael b8da971fac Server statistics: New section for relais and nomads 2021-06-12 08:08:35 +00:00
Michael 84028d7342 Proxify the media url 2021-06-11 03:51:11 +00:00
Michael 4ea30af752 Videos are now working as well 2021-06-10 19:55:43 +00:00
Michael 945f482ba3 API: Some more apps are now supported 2021-06-10 19:10:33 +00:00
Michael 6dc2988c0f Return the application fields 2021-06-10 08:05:21 +00:00
Michael 0b9c934cad Simplify the code 2021-06-10 07:02:06 +00:00
Michael d917ed58a8 API: Tests with various clients, small fixes 2021-06-10 06:26:34 +00:00
Michael 5e36d10730 Merge remote-tracking branch 'upstream/2021.06-rc' into http-options 2021-06-09 11:11:11 +00:00
Michael 4706d60b04 Added documentation 2021-06-09 07:44:19 +00:00
Michael c9b66d6e28 Deactivate CORS related headers 2021-06-09 07:42:23 +00:00
Michael 58a513cb30 Support HTTP OPTIONS requests 2021-06-09 07:27:42 +00:00
Michael 385c03364f The function is now protected again 2021-06-08 20:45:58 +00:00
Michael e4be1e0cd5 Get rid of "api_user()" function 2021-06-08 20:41:46 +00:00
Michael 8bf5dd187b Added "source" detection 2021-06-08 17:48:41 +00:00
Michael 0f0a301280 Move basic auth functionality to the new class 2021-06-08 17:32:41 +00:00
Michael 2a440c0bae Use "checkAllowedScope" instead of "login" 2021-06-08 12:00:22 +00:00
Michael 5853fe562d Login hasn't got a return value 2021-06-08 09:51:17 +00:00
Michael 9720ee2c20 Rearranged scope check 2021-06-08 09:11:56 +00:00
Michael 95cac04540 Rearranged function order 2021-06-08 08:56:01 +00:00
Michael 11c8dfe73a Unified request for uid 2021-06-08 08:28:14 +00:00
Michael 85217941e3 Simplified code 2021-06-08 08:04:12 +00:00
Michael 8cde7fe51f Standards 2021-06-08 07:37:28 +00:00
Michael 4b280a7279 Standards 2021-06-08 07:35:36 +00:00
Michael ca5e0eaaea Fix coding standards 2021-06-08 07:33:53 +00:00
Michael 126e281165 Improved documentation 2021-06-08 06:39:23 +00:00
Michael acbe9ebf9e API: New classes for OAuth and basic auth 2021-06-08 06:32:24 +00:00
Michael 265137ef44 Avoid PHP Warning: Illegal string offset 'type' in /src/Protocol/ActivityPub/Receiver.php on line 668 2021-06-07 10:21:48 +00:00
Michael 8e12c1d39b Added note about missing parameters 2021-06-07 07:45:20 +00:00
Michael dc9b5df072 API: The endpoints "followers" and "following" are swapped 2021-06-07 04:44:12 +00:00
Michael 038e505ca3 Improve forum delivery, avoid false distribution 2021-06-06 19:28:47 +00:00
Michael 3fd5c79025 Add the forum followers to forum posts 2021-06-06 13:25:42 +00:00
Michael 56f07d412b Addec comments on forum delivery 2021-06-06 10:07:21 +00:00
Michael 73b0af52fb Use "self" 2021-06-06 09:24:12 +00:00
Michael b269a2da87 Respect the "unlisted" setting for forum posts 2021-06-06 09:19:29 +00:00
Michael ace89197ff Display the forum posts in the new format. 2021-06-05 20:29:19 +00:00
Michael e2b8d5379b Public forums are now posting unlisted 2021-06-05 18:38:21 +00:00
Michael 8a9f633ce2 Merge remote-tracking branch 'upstream/2021.06-rc' into forum-handling 2021-06-05 06:14:06 +00:00
Michael 98c314599c Don't lose ownership on forum posting 2021-06-05 06:13:10 +00:00
Hypolite Petovan 11bc968294
Merge pull request #10368 from annando/more-api 
API: some more endpoints added
 2021-06-04 15:30:52 -04:00
Michael 5ddd2f3ab5 Coding standards 2021-06-03 05:18:22 +00:00
Michael 4206c5d363 API: some more endpoints added 2021-06-03 04:47:02 +00:00
Tobias Diekershoff ed3d32f0e2
Merge pull request #10367 from annando/old-api-oauth 
Support OAuth for the legacy API
 2021-06-03 06:36:03 +02:00
Michael 9c59bcb6a5 Support OAuth for the legacy API 2021-06-02 22:11:21 +00:00
Michael 5df1b59bb3 Fix "Undefined index: post-type in .../src/Model/Item.php on line 2888" 2021-06-02 17:43:30 +00:00
Hypolite Petovan 86d56c7f57
Merge pull request #10361 from annando/limit-context 
Simplify the code
 2021-06-02 09:11:11 -04:00
Hypolite Petovan b47ae829f7
Merge pull request #10360 from annando/limit-context 
API: Limit the elements for the context
 2021-06-02 07:13:39 -04:00
Michael 4d19a6f0e3 Simplify the code 2021-06-02 07:15:42 +00:00
Michael a2be7e386f API: Lim it the elements for the context 2021-06-02 07:11:18 +00:00
Michael e7bc908655 Renaming the date format to "JSON" 2021-06-02 03:32:42 +00:00
Michael 4e164690d5 Use the proper way to display milliseconds 2021-06-02 03:19:55 +00:00
Michael 5bd51b156a API: Fix date format 2021-06-01 22:32:05 +00:00
Michael d3833f63e0 Fix account id of notifications 2021-06-01 22:00:12 +00:00
Michael 842cbbaf09 Added notifications for follow requests 2021-06-01 21:13:16 +00:00
Michael 49459821be Renamed function 2021-06-01 14:23:12 +00:00
Michael 3f0937dd42 API: Show activity notifications 2021-06-01 05:51:03 +00:00
Hypolite Petovan d99286640d
Merge pull request #10348 from annando/fix-diaspora-comment 
Fix commenting on mobile to Diaspora
 2021-05-31 19:27:53 -04:00
Michael 58531a2748 Fix tests 2021-05-31 20:02:53 +00:00
Michael be7a01f086 Fix commenting on mobile to Diaspora 2021-05-31 19:39:50 +00:00
Hypolite Petovan 52cf924558 Check for post-type key existence in Model\Item::addVisualAttachments 
- Address https://github.com/friendica/friendica/issues/10169#issuecomment-844324800
 2021-05-31 08:29:50 -04:00
Hypolite Petovan 303c9d4a54 Check Content\Item::replaceTag return for false return value before using it 
- Address https://github.com/friendica/friendica/issues/10169#issuecomment-835547443
- Remove unused code in Content\Item::replaceTag
 2021-05-31 08:29:50 -04:00
Hypolite Petovan 302070875c Ensure nodeinfo-provided protocols are strings in Model\GServer::parseNodeinfo2 
- https://github.com/friendica/friendica/issues/10168#issuecomment-828281803
 2021-05-31 00:47:03 -04:00
Philipp Holzer bdc2cd000b
Update avatar after user creation 2021-05-30 20:47:21 +02:00
Michael 2df14fab3b Ensure that the public contact exists when a user is created 2021-05-30 12:04:26 +00:00
Hypolite Petovan 9b9449c03c
Merge pull request #10340 from annando/relevant-url 
Add relevant link after media links had been removed
 2021-05-30 07:50:43 -04:00
Hypolite Petovan 15581ba91f
Merge pull request #10338 from annando/issue-9923 
Issue 9923: Fix DB Error 1055
 2021-05-30 07:48:49 -04:00
Michael 6f730bd671 Add relevant link after media links had been removed 2021-05-30 06:13:20 +00:00
Michael c05c447d0f Avoid warning "array_merge(): Expected parameter 2 to be an array, null given" 2021-05-29 22:48:06 +00:00
Michael 4cdfcb5cfb Avoid DB Errors with "group by" 2021-05-29 21:51:33 +00:00
Michael 6c90005363 Issue 9923: Fix DB Error 1055 2021-05-29 21:28:40 +00:00
Michael da20b48651 Fix PHP Notice: Undefined index: isForum in /src/Protocol/ActivityPub/Processor.php on line 605 2021-05-29 19:09:41 +00:00
Hypolite Petovan 452ed8aa8c
Merge pull request #10332 from annando/calender-download 
simplify the calendar download
 2021-05-29 13:46:41 -04:00
Michael 0249048534 More logging for the contact discovery 2021-05-29 17:24:50 +00:00
Michael a9302c30c3 simplify the calendar download 2021-05-29 17:09:45 +00:00
Hypolite Petovan b621d2c714
Merge pull request #10329 from annando/unified-request 
API: Unified request parameter handling
 2021-05-29 10:53:16 -04:00
Michael Vogel 1ca58968f2
Apply suggestions from code review 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-05-29 14:32:31 +02:00
Michael b28acc7dad Improved logging for local probing, avoid worker fork 2021-05-29 11:11:26 +00:00
Michael c3c6f3c8d3 Code style conventions 2021-05-29 10:40:47 +00:00
Michael 97356ed617 API: Unified request parameter handling 2021-05-28 06:10:32 +00:00
Michael ce8e5012e9 Fix reshare of Diaspora posts only with pictures 2021-05-27 19:58:18 +00:00
Hypolite Petovan 7af91bafec
Merge pull request #10324 from annando/issue-10262 
Issue 10262: Don't accept BCC posts from non followers
 2021-05-27 11:40:14 -04:00
Michael c076545e3b API: Only show "bookmarked" on top level post 2021-05-27 10:49:15 +00:00
Michael 8b3884b2de API: Bookmarked posts are starred, not pinned 2021-05-27 07:51:30 +00:00
Michael 403cce25c4 Follower is sharer instead 2021-05-27 04:00:38 +00:00
Michael a3c323b366 Issue 10262: Don't accept BCC posts from non followers 2021-05-26 20:52:39 +00:00
Hypolite Petovan 8c99d3acc1
Merge pull request #10323 from annando/issue-10306 
Issue 10306: Improve local delivery
 2021-05-26 14:24:24 -04:00
Michael c6a56985a8 Changed comments 2021-05-26 18:15:07 +00:00
Michael 76e6a71822 Setting the post reason 2021-05-26 14:29:50 +00:00
Michael 016911a20c Setting the post reason and causer 2021-05-26 14:21:28 +00:00
Michael 785f8124ed Issue 10306: Improve local delivery 2021-05-26 09:24:37 +00:00
Philipp Holzer 681f55315b
Downgrading PHP 7.4 incompatible fread/fwrite checks 2021-05-25 20:21:51 +02:00
Michael ee5209a847 Improved logging 2021-05-25 13:18:48 +00:00
Michael 09f29cd577 Avoid notices because of empty fields 2021-05-25 13:11:23 +00:00
Michael 4d4544ada3 Separate the char from the binary handling 2021-05-24 20:07:39 +00:00
Michael da8d5f5015 Issue 9926: Limit the length of data to store in the apcontact table 2021-05-24 19:44:24 +00:00
Hypolite Petovan 6ef9ccbb97
Merge pull request #10311 from fabrixxm/fix/consoleautoinstall 
console autoinstall: handle `-f/--file` as single config file
 2021-05-24 10:30:45 -04:00
fabrixxm c45a1d1e4d autoinstall: compact output 2021-05-24 15:27:23 +02:00
fabrixxm 613cdf7ee1 autoinstall: handle -f/--file as single config file 
as help string says.
 2021-05-24 15:21:24 +02:00
Michael 32d0d45adf Issue 10287: Don't show ignored and blocked posts 2021-05-24 10:51:21 +00:00
Hypolite Petovan de2c43ce4b
Merge pull request #10294 from annando/http-input-data 
New class to process HTTP input data
 2021-05-24 06:11:23 -04:00
Michael 6e1402f7bd Calling it static 2021-05-24 08:08:01 +00:00
Michael 3e303fb366 Test file uploads 2021-05-24 07:43:42 +00:00
Michael ca5fd01f75 Transmit encoding, deactivated file test 2021-05-24 05:33:34 +00:00
Michael 7b49117801 Return data should be array 2021-05-24 05:22:25 +00:00
Hypolite Petovan a24febb8b6
Merge pull request #10283 from very-ape/fix-message-button 
Fix message button using a more targeted approach.
 2021-05-23 18:49:21 -04:00
Philipp Holzer 15216266d9
Add ContentType Injection for HTTPInputData tests 2021-05-23 22:40:41 +02:00
very-ape 7776c5f690 Implement code changes from review. 2021-05-23 13:25:25 -07:00
Michael a69e128fe4 Merge remote-tracking branch 'upstream/2021.06-rc' into http-input-data 2021-05-23 20:17:50 +00:00
Philipp Holzer c064a39341
Adapt tests using a content file 2021-05-23 20:30:27 +02:00
Philipp Holzer a0da84b6b0
Enable testability for HTTPInputData and create a failing test for it :-) 2021-05-23 19:58:09 +02:00
Michael 4ac68394c3 Fix warning "reset() expects parameter 1 to be array, null given" 2021-05-23 16:37:34 +00:00
Hypolite Petovan 48a783c91a
Merge pull request #10300 from annando/issue-10264 
Issue 10264: Remote comments for visitors
 2021-05-23 12:00:53 -04:00
Tobias Diekershoff 0ca929dccd
Merge pull request #10304 from annando/fix-emptymissing-photos 
Fix missing media on posts to Mastodon
 2021-05-23 15:34:34 +02:00
Michael 36c5e360f6 Fix missing media on posts to Mastodon 2021-05-23 13:29:25 +00:00
Michael b7a7ae58e9 Issue 10232: Improved search for embedded media links 2021-05-23 12:35:05 +00:00
Hypolite Petovan 4d214bd9cb
Merge pull request #10292 from annando/fix-mail 
Fix inserting mails
 2021-05-23 07:39:00 -04:00
Hypolite Petovan 0238a15809
Merge pull request #10295 from nupplaphil/bug/php7_cs 
Fix PHP 7.0 Coding Standards
 2021-05-23 07:38:38 -04:00
Michael 050bc673aa Issue 10264: Remote comments for visitors 2021-05-23 10:39:11 +00:00
Michael 8f9033633c Issue 10287: Make block and ignore work for the API as well 2021-05-23 08:56:24 +00:00
Tobias Diekershoff 55dda47f39 Issue 10293: mention the required function in the error message 2021-05-23 07:50:32 +02:00
Michael Vogel d00a4eacdc
Update src/Model/Mail.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-05-23 07:37:17 +02:00
very-ape b2bc911eb2 Merge branch 'fix-message-button' of https://github.com/very-ape/friendica into fix-message-button 2021-05-22 15:32:08 -07:00
very-ape ceb409dae8 Replace $contact with $profile_contact in sidebar function. 2021-05-22 15:30:46 -07:00
Philipp Holzer 965cd8b096
Fix PHP 7.0 Coding Standards 2021-05-22 23:47:35 +02:00
Michael fd3706b72e Coding standards again 2021-05-22 20:33:26 +00:00
Michael 684f9cdb96 Coding standards 2021-05-22 20:31:50 +00:00
Michael 2c6db3ccac Coding standards 2021-05-22 20:29:15 +00:00
Michael 6f44476c56 Merge remote-tracking branch 'upstream/2021.06-rc' into http-input-data 2021-05-22 20:26:32 +00:00
Michael c18cbe95a6 Fix inserting mails 2021-05-22 18:20:11 +00:00
Tobias Diekershoff 83cb4edc36
Merge pull request #10291 from annando/no-summary 
Don't create automated summaries
 2021-05-22 18:17:43 +02:00
Michael 77092157fe Don't create automated summaries 2021-05-22 16:11:10 +00:00
Michael ede808f449 Fixes "Undefined index: upubkey" by replacing the profile load mechanism 2021-05-22 15:50:05 +00:00
Michael a5c8c4d8b7 Fixes notice 2021-05-22 15:41:25 +00:00
Michael 6fe916a390 API: improved mail handling 2021-05-22 13:37:04 +00:00
Michael 0c21588ab9 Don't delete local tombstone contacts 2021-05-22 08:25:30 +00:00
very-ape bd9a469392
Merge branch '2021.06-rc' into fix-message-button 2021-05-21 23:40:49 -07:00
very-ape 34eb81a187 Don't retrieve a contact record we've already been given. 2021-05-21 22:49:35 -07:00
Michael 9d4b29d9c0 Fix for empty profile pages 2021-05-22 05:34:10 +00:00
very-ape c22ef3e79e Fix message button using a more targeted approach. 2021-05-21 14:28:01 -07:00
Hypolite Petovan 26d3f5433b
Merge pull request #10280 from very-ape/fix-message-button 
Fix Message button.
 2021-05-21 14:57:28 -04:00
very-ape 97a9ec4e40 Bug fix: last commit results in logged-in user's contacts being displayed on contact profile sidebar. 2021-05-21 11:38:50 -07:00
Michael 081652e09a Wrong class path 2021-05-21 18:00:03 +00:00
Michael bcb2073c9a New class to process HTTP input data 2021-05-21 17:36:51 +00:00
very-ape 93926e99b8 Use getByNickname as suggested in code review. 2021-05-21 10:15:32 -07:00
very-ape fe52719d37 Fix Message button. 2021-05-20 23:30:42 -07:00
Hypolite Petovan 315dddbcb9
Merge pull request #10277 from very-ape/authenticate-hook 
Bug fix: allow authentication addons to create users again.
 2021-05-20 15:05:55 -04:00
very-ape e2d93b57da
Update src/Model/User.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-05-20 11:54:30 -07:00
very-ape d66f1e30ae Apply suggestions from code review 
Also clean up some code, make it less needlessly verbose.

Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-05-20 11:35:33 -07:00
Hypolite Petovan 0e368c4ba4 Fix display of RTL tags 2021-05-20 08:39:36 -04:00
Hypolite Petovan 93f3c511dc Fix wrong display of mentions in RTL context 2021-05-20 08:39:36 -04:00
very-ape c89241dbd8 Bug fix: add missing changes. 2021-05-20 00:19:09 -07:00
very-ape 9ab57de356 Bug fix: allow authentication addons to create users again. 2021-05-20 00:16:08 -07:00
Tobias Diekershoff 57ff3e3a07
Merge pull request #10276 from annando/api-conversations 
API: Support for private mails
 2021-05-20 09:13:50 +02:00
Michael f5f919aead Coding standards 2021-05-20 06:58:15 +00:00
Michael e10f3f26b9 Removed unused parameter 2021-05-20 04:44:45 +00:00
Michael db8b0b9666 The next mail endpoint is done 2021-05-20 04:39:45 +00:00
Michael 8a3db0226b Coding standards 2021-05-20 03:53:48 +00:00
Michael 66ad777f4b Supporting all parameters 2021-05-19 22:33:40 +00:00
Michael 3d65ef3af2 Indentions 2021-05-19 22:20:56 +00:00
Michael d46150f1dc Whitespaces ... 2021-05-19 22:18:30 +00:00
Michael ae6dae3b23 Whitespace removed 2021-05-19 22:10:05 +00:00
Michael c1212dce03 Indentions 2021-05-19 22:09:25 +00:00
Michael 70259965df API: Support for private mails 2021-05-19 21:56:50 +00:00
Hypolite Petovan 09cf32926d
Merge pull request #10275 from very-ape/authenticate-hook 
Move the 'authenticate' hook deeper into the authentication flow so t…
 2021-05-19 16:51:15 -04:00
very-ape 9ddaabc22d Move the 'authenticate' hook deeper into the authentication flow so that password authentication addons are consulted whenever a user's password needs confirming. 2021-05-19 13:11:31 -07:00
Michael fcc18de9c5 Unneeded spaces removed 2021-05-19 16:09:09 +00:00
Michael ab96e694df Removed unused use 2021-05-19 16:07:37 +00:00
Michael 1c7d1c7c47 New endpoint "verify_credentials" added 2021-05-19 09:35:08 +00:00
Michael 3172b0bcf2 Log API errors 2021-05-19 09:03:41 +00:00
Michael b3b9c51dbe Reduced log level 2021-05-19 07:02:12 +00:00
Michael 50ca38a0f7 Harmonized API parameters for all timeline endpoints 2021-05-19 06:55:08 +00:00
Michael e3d227f3c9 API: Parameter cleanup 2021-05-19 06:18:42 +00:00
Michael e5c1b90668 API: Reworked request parameter handling 2021-05-18 19:26:46 +00:00
Michael f935c1cf73 Restructured variable handling 2021-05-18 08:38:04 +00:00
Michael 724a61390f Coding standards 2021-05-18 07:23:18 +00:00
Michael 2252949bca Style stuff ... 2021-05-18 07:18:31 +00:00