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

15074 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael 67bae59c66 Small corrections 2017-04-25 05:11:04 +00:00
Michael 8de510e635 We weren't able to test mysqlnd, so better remove the code 2017-04-24 21:51:47 +00:00
Michael eb63ce5df5 Free results 2017-04-24 21:36:04 +00:00
Michael ec0d2a1a03 Little spelling problem 2017-04-24 21:23:00 +00:00
Michael b5f10e5ddb Replace spaces by tabs 2017-04-24 21:20:24 +00:00
Michael ed437e978a Code cleanup 2017-04-24 21:18:30 +00:00
Michael 82f13441bc Removed old functions 2017-04-24 21:02:51 +00:00
Michael 9959da5a1c New function to calculate rows 2017-04-24 20:32:35 +00:00
Michael d67338a895 New function to check for the existance of data 2017-04-24 19:23:49 +00:00
Michael 0c8a2fd345 Örgs 2017-04-24 06:28:57 +00:00
Michael d636bcb9d3 Restored privates variables 2017-04-24 06:27:59 +00:00
Michael 311c029bcf Rearranged lines 2017-04-24 06:26:49 +00:00
Michael 34bb34b9a4 Lost lines are back 2017-04-24 06:24:03 +00:00
Michael 28a28f00a4 New function skeleton for execution of queries 2017-04-24 06:13:42 +00:00
Michael 63b0b05445 We now can work with prepared statements 2017-04-23 23:15:38 +00:00
Hypolite Petovan 772825690f Merge pull request #3384 from strk/openid-register 
Fix OpenID registration, and improve its robustness
 2017-04-23 08:55:51 -04:00
Sandro Santilli cd521b2dcc Urlencode query parameters 2017-04-23 13:50:33 +02:00
Sandro Santilli ebc926a716 Add missing query string introducing character 
Fixes #3383
 2017-04-23 13:50:18 +02:00
Hypolite Petovan 4cccb450cb Merge pull request #3382 from annando/1704-myisam 
Command in dbstructure.php to convert all tables from MyISAM to InnoDB
 2017-04-22 20:55:06 -04:00
Michael 2628ff91f4 Call it "toinnodb" 2017-04-22 21:55:16 +00:00
Michael aaa558f7ea New command in dbstructure.php to convert all tables from MyISAM to InnoDB 2017-04-22 21:36:01 +00:00
Hypolite Petovan 0f67934e05 Merge pull request #3375 from Quix0r/rewrites/coding-convention-split2-3-2 
Coding convention applied split 2-3-2 (of 2-14-2)
 2017-04-22 09:11:18 -04:00
Hypolite Petovan affb3938d2 Merge pull request #3376 from annando/1704-key-length 
Issue 3358: The key length should now work on InnoDB and MyISAM
 2017-04-21 20:41:45 -04:00
Michael Vogel cc3bc3f785 Merge pull request #3377 from Alkarex/dfrn-date-format 
Fix SQL date format bug in dfrn
 2017-04-22 00:07:47 +02:00
Alexandre Alapetite 7f1c71c9fd Fix SQL date format bug in dfrn 
https://github.com/friendica/friendica/issues/3336
https://github.com/friendica/friendica/pull/3338
 2017-04-22 00:00:13 +02:00
Michael fef0fe2fb9 Issue 3358: The key length should now work on InnoDB and MyISAM 2017-04-21 21:26:05 +00:00
Roland Haeder 299c0122f6
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-21 20:08:57 +02:00
Roland Haeder cdff732044
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-21 20:08:57 +02:00
Hypolite Petovan 27b3943cc7 Merge pull request #3373 from strk/expire-login-later 
Make log-in cookie expiration time configurable
 2017-04-21 12:18:57 -04:00
Sandro Santilli a6c6287288 Fix Config::get call 2017-04-21 17:36:45 +02:00
Sandro Santilli 24c023eb0e Add default value to documentation for system.auth_cookie_lifetime 2017-04-21 17:20:28 +02:00
Sandro Santilli e08228ca09 Add auth_cookie_lifetime variable to installation config template 2017-04-21 17:19:58 +02:00
Sandro Santilli 270d604a6e Add documentation 2017-04-21 17:19:11 +02:00
Sandro Santilli 14f93367e7 Add missing semicolon 2017-04-21 17:13:05 +02:00
Sandro Santilli e2a0a72598 Use Config::get 2017-04-21 17:09:06 +02:00
Sandro Santilli 05b6891e89 Allow specifying cookie lifetime via config variable 
Tweak $a->config['system']['auth_cookie_lifetime']
 2017-04-21 16:15:39 +02:00
Sandro Santilli e9f1a2e276 Expire log-in cookie in 90 days rather than 7 2017-04-21 15:16:12 +02:00
Hypolite Petovan 3da0436f01 Merge pull request #3369 from Quix0r/rewrites/coding-convention-split2-2-2 
Coding convention applied split 2-2-2 (of 2-14-2)
 2017-04-20 18:28:16 -04:00
Roland Häder b7c21e1b65
fixed parser error 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-04-20 22:59:43 +02:00
Roland Haeder ec57babf89
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-20 22:59:08 +02:00
Hypolite Petovan b936fb8da9 Merge pull request #3371 from Alkarex/photos_any_value 
mod photos compatibility only_full_group_by
 2017-04-20 15:26:31 -04:00
Alexandre Alapetite 5b80a1fcaa mod photos compatibility only_full_group_by 
Related to https://github.com/friendica/friendica/pull/3323
 2017-04-20 21:23:45 +02:00
Hypolite Petovan 792ed55ae6 Merge pull request #3367 from annando/1704-mastodon 
Reworked OStatus communication part to better support Mastodon.
 2017-04-20 02:12:41 -04:00
Michael Vogel 6e04e44776 Merge pull request #3368 from tobiasd/develop 
regen credits
 2017-04-20 08:12:01 +02:00
Hypolite Petovan 01dab95d60 Merge pull request #3366 from annando/issue-3358 
Issue 3358; Avoid key length problems when changing collation
 2017-04-20 02:03:30 -04:00
Tobias Diekershoff e178f04a0e regen credits 2017-04-20 07:59:54 +02:00
Michael 3592f90910 Merge remote-tracking branch 'upstream/develop' into 1704-mastodon 
Conflicts:
	include/bbcode.php
 2017-04-20 05:44:31 +00:00
Michael 2354cc243e Issue 3358; Avoid key length problems when changing collation 2017-04-20 05:24:08 +00:00
Michael c6e7f6306c Some standards 2017-04-20 05:17:00 +00:00
Michael Vogel d3cdfa6108 Merge pull request #3365 from Hypolite/issue/remove-wrong-profile-link-for-contacts 
Remove vcard Edit link pointing to profiles for contacts
 2017-04-20 05:38:38 +02:00