bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity
21761 commits 4 branches 62 tags 178 MiB
Commit graph

5120 commits

Author SHA1 Message Date
Hypolite Petovan 8d7fb35463 Prevent fatal error when $friends isn't an array 2018-11-22 19:03:24 -05:00
Hypolite Petovan 03c5c7ca0a Fix formatting in mod/ostatus_subscribe 2018-11-22 19:03:02 -05:00
Hypolite Petovan c91a87bc07 Fix typo in comment in mod/redir 2018-11-21 22:27:57 -05:00
Hypolite Petovan 20e7e7e3ac Add new REGISTER_INVITATION value to mod/friendica output 2018-11-21 22:27:50 -05:00
Hypolite Petovan 2ef23300a3
Merge pull request #6179 from Alkarex/sql-distinct-fix 
Fix SQL grammar error: ORDER BY clause is not in SELECT
 2018-11-21 08:07:33 -05:00
Alexandre Alapetite a1238d03a6 Fix SQL grammar error: ORDER BY clause is not in SELECT 
```
2018-11-21T08:31:28Z@e3393hprfvfqnblturqp56rjnp [Info]:DBA.php:557:p
DB Error 3065: Expression #1 of ORDER BY clause is not in SELECT list,
references column 'friendica.item.created' which is not in SELECT list;
this is incompatible with DISTINCT
q, profile_content, update_profile_content,
LegacyModule::runModuleFunction, LegacyModule::content, call_user_func,
App::runFrontend
SELECT DISTINCT(`parent-uri`) AS `uri` FROM `item` INNER JOIN `contact`
ON `contact`.`id` = `item`.`contact-id` AND NOT `contact`.`blocked` AND
NOT `contact`.`pending` WHERE `item`.`uid` = 1 AND `item`.`visible` AND
(NOT `item`.`deleted` OR `item`.`gravity` = 3) AND NOT
`item`.`moderated` AND `item`.`wall` AND `item`.`unseen` ORDER BY
`item`.`created` DESC
```
 2018-11-21 09:57:34 +01:00
Michael 85529ed8ff "viewcontacts" hadn't displayed the AP contacts 2018-11-21 08:50:43 +00:00
Michael d89e3f4264 To safe or not so save, that is the question 2018-11-19 16:36:31 +00:00
Michael b486e48cd6 14 days 2018-11-19 10:02:44 +00:00
Michael ad3502078f Merge remote-tracking branch 'upstream/develop' into dbclean 2018-11-19 10:01:09 +00:00
Michael 191c1a400a The expiry of conversations can now be configured in the admin panel 2018-11-19 06:58:46 +00:00
Michael 43079bfaf8 Several default features are now in the core 2018-11-18 20:13:46 +00:00
Jonny Tischbein 7c690c93bb Fix setting permisson as post for uploaded photo in album via modal create post 2018-11-17 19:14:59 +01:00
Hypolite Petovan 22fedc9a1a
Merge pull request #6152 from JonnyTischbein/issue_delete_from_saved_folder 
Fix deleting last element and displaying empty saved folder
 2018-11-17 11:59:24 -05:00
Jonny Tischbein 590fbe8c6f More Code Standard 2018-11-17 17:27:12 +01:00
Jonny Tischbein 4f8e50d834 Code Standard 2018-11-17 17:24:30 +01:00
fabrixxm 1e9e06a325 Use appropriate redirect in dfrn_poll 
Got an error while remote auth to a local user, where $destination_url
is relative.
 2018-11-17 16:12:45 +01:00
Jonny Tischbein 56406b9910 Fix SQL Error if no items where found + Fix setting to null 2018-11-17 13:22:32 +01:00
Jonny Tischbein 52eb2281e4 Fix deleting last element from saved folder + Fix displaying empty saved folder 2018-11-17 12:41:00 +01:00
Alexandre Alapetite b190c2e9c7 Title difference for two different ATOM feeds 
Fix for
https://github.com/friendica/friendica/issues/6128#issuecomment-439016471
 2018-11-17 00:05:13 +01:00
Alexandre Alapetite 51f0d52100 WebSub fixes 
More fixes related to https://github.com/friendica/friendica/issues/6128
* Bug when using direct ATOM URL, which ends with .atom after nick name
* Bug when callback URL already has some ?query=parameters (which is
quite usual)
Slight refactoring
 2018-11-15 12:54:04 +01:00
Tobias Diekershoff b0d8a2fcd0
Merge pull request #6127 from annando/notice 
Avoid "Cannot modify header information - headers already sent"
 2018-11-14 10:20:47 +01:00
Hypolite Petovan 6996a172e8
Merge pull request #6130 from annando/develop 
Issue 6128: Websub could work now
 2018-11-13 18:46:17 -05:00
Michael a5ddaa9dbc Issue 6128: Websub could work now 2018-11-13 22:23:16 +00:00
Hypolite Petovan d697dbd794
Convert remaining instances of "contacts" in mod/follow 2018-11-13 16:02:33 -05:00
Hypolite Petovan 537164fd02
Convert remaining instances of "contacts" in mod/unfollow 2018-11-13 16:01:01 -05:00
Michael 83ae873646 Avoid "Cannot modify header information - headers already sent" 2018-11-13 20:20:54 +00:00
Tobias Diekershoff 320c986e05
Merge pull request #6121 from annando/hide 
Don't suggest hidden contacts / Added AP to the suggestions
 2018-11-13 09:39:58 +01:00
Michael edc6ba976d Output all technical fields - even for hidden contacts 2018-11-13 07:09:14 +00:00
Michael b5fa518998 Don't suggest hidden contacts / Added AP to the suggestions 2018-11-13 05:52:21 +00:00
Michael cc0904eb77 Issue 6032: Avoid fatal error 2018-11-12 19:10:40 +00:00
Michael de0ddfa0d8 Fix wromg server detecting / improved Pleroma version numbers 2018-11-11 21:54:50 +00:00
Steffen K9 de759e41c5
Missing use for Strings 
In line 72 'Strings::' is used but the 'use Friendica\Util\Strings' was missing.
 2018-11-11 01:14:50 +01:00
Hypolite Petovan 7242b706f0 Improve return path in mod/follow 2018-11-10 08:24:31 -05:00
Adam Magness 218f0734be Rename removeTags to escapeTags 
rename function and update calls.
 2018-11-09 13:29:42 -05:00
Adam Magness 063f0e9cb0 Rename escapeTags to escapeHtml 
rename function and update calls.
 2018-11-09 13:27:58 -05:00
Adam Magness b5a97c1abe Move getTags to BBCode 
move getTags function to BBCode class and update calls.
 2018-11-09 13:24:19 -05:00
Adam Magness e4354a0d7b Update and Remove isValidEmail 
change function calls, and remove unneeded function.
 2018-11-09 13:18:42 -05:00
Adam Magness ffc406d819 normalise_link calls 
implement normaliseLink function
 2018-11-08 11:28:29 -05:00
Adam Magness 5276c28a78 link_compare calls 
implement compareLink function.
 2018-11-08 10:46:50 -05:00
Adam Magness 6fc9c6de3b base64url calls 
implement base64UrlEncode and base64UrlDecode functions
 2018-11-08 10:37:08 -05:00
Adam Magness 0efcbe5d15 protect_sprintf calls 
implement protectSprintf function
 2018-11-08 10:30:45 -05:00
Adam Magness 46d7767fd0 formatBytes calls 
implement function in new class
 2018-11-08 10:28:49 -05:00
Adam Magness b73af72deb deindent calls 
implement function in new class
 2018-11-08 10:26:49 -05:00
Adam Magness 916b3e551e format_network_name calls 
implement formatNetworkName function
 2018-11-08 10:24:47 -05:00
Adam Magness b99925060a autoname calls 
implement getRandomName function
 2018-11-08 10:22:20 -05:00
Adam Magness 0e01568ccd escape_tags calls 
implement escapeTags function
 2018-11-08 10:20:03 -05:00
Adam Magness a0f65ca7a1 notags calls 
implement removeTags function
 2018-11-08 10:14:37 -05:00
Adam Magness 991f259ecb random_string calls 
implement getRandomHex function
 2018-11-08 08:45:46 -05:00
Adam Magness e537f7d017 Function calls 
update function calls to new class
 2018-11-06 21:16:27 -05:00