Commit graph

15137 commits

Author SHA1 Message Date
Tobias Diekershoff
1a436281c5 added template for the blocklist editor in the admin panel 2017-04-24 23:44:27 +02:00
Tobias Diekershoff
7f837a9205 add the contents from the blocklist to the /friendica page 2017-04-24 23:43:39 +02: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
Hypolite Petovan
bc2dd690fd Merge pull request #3386 from rabuzarus/20170422_-_Stream_content_update_2
improve profile page (wall) update for non logged in users and remote users
2017-04-23 21:43:27 -04:00
Michael
63b0b05445 We now can work with prepared statements 2017-04-23 23:15:38 +00:00
Michael
05dcedb54c Merge remote-tracking branch 'upstream/develop' into 1704-conversation 2017-04-23 14:25:35 +00:00
rabuzarus
88602de604 fall back to unseen items if no timestamp is available 2017-04-23 16:22:53 +02:00
rabuzarus
20a53e14ca add a visual indicator (fade) on group membership change 2017-04-23 15:26:26 +02:00
rabuzarus
e7914ecc95 add $contact.change_member to the js template. At the present time we don't make use of it, but the js smarty template should be the same as the php smarty template 2017-04-23 14:58:23 +02: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
rabuzarus
46291b2e2b fix smarty PHP warnings 2017-04-23 14:51:41 +02: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
Michael
c0784f7301 New tables for conversations 2017-04-22 20:46:40 +00:00
rabuzarus
5a7b9676ff fixed typo 2017-04-22 22:10:43 +02:00
rabuzarus
53c1bf6ba3 improve profile update for non logged in ussers and remote users 2017-04-22 22:08:05 +02: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
rabuzarus
b273165873 Remove unused function 2017-04-21 16:13:16 +02:00
rabuzarus
f99bb958f6 Merge develop into 20170407_-_group_edit
Conflicts:
	mod/group.php
2017-04-21 16:09:48 +02:00
rabuzarus
40e5436604 some restructuring in groups.php + Frio: provide own group template 2017-04-21 16:04:29 +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