Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
11735 commits 2 branches 0 tags 132 MiB
Commit graph

11735 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Vogel
27905cc21a Merge remote-tracking branch 'upstream/develop' into 1603-ostatus-completion 2016-03-06 20:37:51 +01:00
Michael Vogel
ef2bc47cc6 New way of fetching the conversation id for thread completion 2016-03-06 20:36:28 +01:00
fabrixxm
d30d13959b Merge pull request #2328 from rabuzarus/0602_contact_profile 
polishing of the contact-edit page
 2016-03-06 19:56:59 +01:00
Tobias Diekershoff
bdfd81e723 Merge pull request #2400 from annando/1603-ostatus-thread 
Only import OStatus threads that are started by our contacts
 2016-03-06 19:40:01 +01:00
Michael Vogel
9579725d4d This should work better ... 2016-03-06 19:27:34 +01:00
Michael Vogel
279a0453f9 Or back ... 2016-03-06 15:13:19 +01:00
Michael Vogel
7f48df63a3 Relocated the check. 2016-03-06 15:11:04 +01:00
Michael Vogel
4bd1061a09 Only import OStatus threads if we follow the thread starter 2016-03-06 14:53:30 +01:00
Tobias Diekershoff
1127150c79 Merge pull request #2399 from annando/1603-default-group 
Central function for default group, special setting for OStatus
 2016-03-06 14:42:27 +01:00
Michael Vogel
bb06026147 Settings for only importing threads from our ostatus contacts 2016-03-06 14:09:04 +01:00
Michael Vogel
4ef33b4d5b Clarification of description 2016-03-06 13:26:30 +01:00
Michael Vogel
8752ec11b2 Central function for default group, special setting for OStatus 2016-03-06 13:15:27 +01:00
Tobias Diekershoff
6072e17a64 Merge pull request #2398 from annando/1603-fontawesome4 
The Font Awesome library is now updated, the reply button is changed
 2016-03-06 01:49:46 +01:00
Michael Vogel
f05cbf9ed8 Merge pull request #2397 from Quix0r/fixes/poller-warning 
No processing if error or empty array
 2016-03-05 13:35:43 +01:00
Michael Vogel
996cd8c24e The Font Awesome library is now updated, the replxy button is changed 2016-03-05 13:29:01 +01:00
Roland Haeder
08630ca6f8
Merge branch 'rewrites/is_filled_array_introduced' into rhaeder-develop 2016-03-04 22:53:42 +01:00
Roland Haeder
b56a9bfacc
Fixes E_WARNING from foreach() because count() seem to return TRUE even when $r is no array ?! 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-04 22:53:22 +01:00
Roland Haeder
5a439a31f3
Fixes E_WARNING from foreach() because count() seem to return TRUE even when $r is no array ?! 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-04 22:46:30 +01:00
Roland Haeder
d88606321d
Just easier code ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-04 22:39:08 +01:00
Roland Haeder
425665795d
Merge branch 'fixes/poller-warning' into rhaeder-develop 2016-03-04 22:38:47 +01:00
Roland Haeder
d5c1ce490b
No processing if error or empty array 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-04 22:38:18 +01:00
Roland Haeder
cc4349777a
Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-04 20:05:24 +01:00
fabrixxm
3184a6263b Merge pull request #2392 from Quix0r/minor/logging 
Minor: Some more logging to trace down bugs
 2016-03-02 12:21:18 +01:00
Tobias Diekershoff
73f4c3c8da Merge pull request #2394 from annando/1603-federation 
Small bugfix: Fixes problen when version number contains linebreaks
 2016-03-02 10:41:02 +01:00
Tobias Diekershoff
40209b2554 Merge pull request #2393 from annando/1603-api-speed 
API: Some small speed improvement when calling the home timeline.
 2016-03-02 10:40:23 +01:00
Michael Vogel
411566f48b API: Some small speed improvement when calling the home timeline. 2016-03-01 19:17:01 +01:00
Michael Vogel
ce5f6fae51 Small bugfix: Fixes problen when version number contains linebreaks 2016-03-01 19:14:45 +01:00
Roland Haeder
902a3fdfe9 Merge branch 'rhaeder-develop' of github.com:Quix0r/friendica into rhaeder-develop 2016-03-01 18:32:21 +01:00
Roland Haeder
2d154ae72f Closed TODO: no .= needed here. #2392 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-01 18:31:49 +01:00
Roland Haeder
8cb011a07e More logging in case of errors + logged network type + added TODO (for ugly E_NOTICE). 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-01 18:31:49 +01:00
Roland Haeder
24cbac1a5b Also use is_filled_array() here, too. if $contacts is FALSE count() issues are E_WARNING 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-01 18:31:49 +01:00
Roland Haeder
4ec377008d Introduced is_filled_array() + added some missing array initialization 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-01 18:31:49 +01:00
Roland Haeder
95bfa17254
Merge branch 'rhaeder-develop' of github.com:Quix0r/friendica into rhaeder-develop 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-01 18:31:33 +01:00
Roland Haeder
6318d28435
Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop 2016-03-01 18:29:34 +01:00
Roland Haeder
51a2d31f54 Closed TODO: no .= needed here. #2392 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-01 18:29:09 +01:00
Roland Haeder
f05c1e82f0 Also use is_filled_array() here, too. if $contacts is FALSE count() issues are E_WARNING 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-01 18:29:09 +01:00
Roland Haeder
0c1cc0d32f Introduced is_filled_array() + added some missing array initialization 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-01 18:29:09 +01:00
Roland Haeder
0510b31b7b <form> and <html> or <head> are not self-closing tags. 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-01 18:29:09 +01:00
Roland Haeder
2247d85b28 Don't miss to add exit() after header('Location: bla') as header() does *NOT* 
exit the script quickly enough. Always use an explicit exit() or you get real
trouble.

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-01 18:29:09 +01:00
Roland Haeder
cf50bb3471 More logging in case of errors + logged network type + added TODO (for ugly E_NOTICE). 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-01 18:29:09 +01:00
Roland Haeder
118d428013 Prevent some E_NOTICE in identity.php 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-01 18:29:09 +01:00
Roland Haeder
0142ff7f0f Prevent some E_NOTICE in boot.php 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-01 18:29:09 +01:00
Roland Haeder
1f2bf81844 No need to set $a->theme_info = array() everywhere if you can define it in App 
itself.

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-01 18:29:09 +01:00
Roland Haeder
7d5166c9fe
Closed TODO: no .= needed here. #2392 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-01 18:28:06 +01:00
Roland Haeder
858438daec
More calls replaced with is_filled_array(), ticket #2390 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-01 16:04:18 +01:00
fabrixxm
04ccd9a776 Merge pull request #2388 from Quix0r/fixes/prevent-e_notice_boot_php 
Prevent some E_NOTICE
 2016-03-01 15:50:20 +01:00
fabrixxm
be3fa8f8b1 Merge pull request #2391 from Quix0r/fixes/http-security 
Missing exit() after header('Location: bla') is bad news
 2016-03-01 15:33:31 +01:00
fabrixxm
11310aa93b Merge pull request #2389 from Quix0r/rewrites/theme_info_array_init 
$a->theme_info = array() should be avoided
 2016-03-01 15:32:34 +01:00
fabrixxm
fd316fe720 Merge pull request #2387 from Quix0r/fixes/html-errors 
Some tags should not be self-closed
 2016-03-01 15:31:28 +01:00
Roland Haeder
7e485f25ab <form> and <html> or <head> are not self-closing tags. 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-01 14:53:35 +01:00