nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
15062 commits 2 branches 55 tags 148 MiB
Commit graph

15062 commits

This branch
This branch
All branches
Author SHA1 Message Date
fabrixxm 61e8147daf Frio: recalculate sticky aside on click only on a tags 
This to prevent input elements in aside to lose focus after the
recalculation.
 2017-05-09 14:53:56 +02:00
fabrixxm d162e689da frio mobile: disable page scroll when aside is shown 2017-05-08 15:14:31 +02:00
fabrixxm 1da4b9d942 frio: add comment note about sticky aside hack 2017-04-27 19:21:14 +02:00
fabrixxm 0ffe426ff1 Frio: Enable stiky aside only on desktop-size windows. 
"Hack" to fix the "scroll back to top" problem with
chrome-based browsers, sticky-kit and off-canvas aside
 2017-04-27 08:39:35 +02:00
fabrixxm 0afc732059 frio mobile aside: add overlay transition 2017-04-26 10:16:39 +02:00
fabrixxm bd4ce2daee mobile aside: max-width and transparent overlay 
fix maximum aside with in mobile screen at 300px.
This way the aside will not cover all the screen.
The area not covered by aside element are dimmed by a semi-transparent overlay
 2017-04-26 08:58:45 +02:00
fabrixxm ea9d44c20a Fix sticky aside when height change 2017-04-26 08:56:47 +02:00
fabrixxm e569e20caf Frio: sitck aside on page scroll 
use sticky-kit jquery library to keep aside inside viewport
when user scrolls the page.
 2017-04-22 20:36:48 +02:00
fabrixxm 5b731a60ae Frio: Fix aside in mobile view 
Aside is fixed to cover page, without the need to scroll back top to see it.
 2017-04-22 20:34:52 +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 Häder 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 Häder 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 Häder 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
Hypolite Petovan 37efb5725e Remove debug 2017-04-19 23:31:38 -04:00
Michael Vogel 83cc56e713 Merge pull request #3326 from Alkarex/utf8mb4 
Default to utf8mb4
 2017-04-20 05:28:16 +02:00
Hypolite Petovan 8680068037 Remove vcard Edit link pointing to profiles for contacts 2017-04-19 21:58:33 -04:00
Hypolite Petovan 0811f9257e Merge pull request #3287 from Quix0r/rewrites/coding-convention-split2-1-2 
Coding convention applied split 2-1-2 (of 2-14-2)
 2017-04-19 20:39:07 -04:00
rabuzarus f2154a206e Merge pull request #3364 from Rudloff/feature/external-links 
In standalone mode, open links to source in a new tab (fixes #3359)
 2017-04-20 01:37:28 +02:00
Pierre Rudloff 8549da4f7b Make standalone tweaks work with infinite scrolling 2017-04-19 23:51:18 +02:00
Michael e16fb74b0c Reworked OStatus communication part to better support Mastodon. 2017-04-19 21:37:00 +00:00
Pierre Rudloff 2ea2c4b87b In standalone mode, open links to source in a new tab (fixes #3359) 2017-04-19 23:27:11 +02:00
Roland Häder 9739758c42
added curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-04-19 23:07:59 +02:00
Roland Häder b9d8587f41 Merge branch 'develop' into rewrites/coding-convention-split2-1-2 2017-04-19 23:06:01 +02:00
Roland Häder 98edbde05c
added braces, opps 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-04-19 23:03:44 +02:00
Hypolite Petovan 5432af3414 Merge pull request #3363 from sesom42/develop 
displays the correct profile for contacts that have set the default profile
 2017-04-19 15:45:38 -04:00