1
1
Fork 0
Commit graph

11605 commits

Author SHA1 Message Date
Michael Vogel ec9c9f0be7 Don't create lock files if the process is called from the poller via the worker 2016-03-08 00:20:06 +01:00
Tobias Diekershoff fa652ad1bc Merge pull request #2401 from annando/1603-ostatus-completion
New way of fetching the conversation id for thread completion
2016-03-06 21:13:05 +01:00
Michael Vogel 4ef44c67b8 Added documentation 2016-03-06 21:06:52 +01:00
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 Häder d5c1ce490b
No processing if error or empty array
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-04 22:38:18 +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 Häder 7d5166c9fe
Closed TODO: no .= needed here. #2392
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-01 18:28:06 +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 Häder 08abdfda68
<form> and <html> or <head> are not self-closing tags.
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-01 14:49:56 +01:00
Roland Häder 8616f0cc35
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 14:49:07 +01:00
Roland Häder 76b042ddee
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 14:42:55 +01:00
Roland Häder 04eacb6470
Prevent some E_NOTICE in identity.php
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-01 14:36:23 +01:00
Roland Häder f10d2afca0
Prevent some E_NOTICE in boot.php
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-01 14:32:19 +01:00
Roland Häder 04a7d6384e
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 14:27:38 +01:00
Michael Vogel 066ddada17 Merge pull request #2386 from tobiasd/20160229-fedcolor
adding some colors to the Federation Statistics page of the admin panel
2016-02-29 19:03:31 +01:00
Tobias Diekershoff 09060c0ed3 adding some colors to the Federation Statistics page of the admin panel 2016-02-29 17:24:34 +01:00
Michael Vogel 497c40e674 Merge pull request #2383 from tobiasd/20160225
a missing break
2016-02-29 11:11:54 +01:00
fabrixxm 9847083e79 Merge pull request #2384 from tobiasd/20160228-api
old location might vanish, vinzv moved the GS API docs over here
2016-02-29 08:54:36 +01:00
Tobias Diekershoff 08a7802112 old location might vanish, vinzv moved the GS API docs over here 2016-02-28 08:30:45 +01:00
Tobias Diekershoff f4b0e9316e a missing break 2016-02-25 21:37:37 +01:00
Tobias Diekershoff 48642a8544 Merge pull request #2379 from annando/1602-abstract-doc
Some documentation for the usage of the "abstract" element.
2016-02-25 13:15:12 +01:00
fabrixxm 53776919c0 Merge pull request #2382 from tobiasd/20160204-doc
small stuff for the docs
2016-02-25 08:46:25 +01:00
Tobias Diekershoff 1b14b22b76 Client section in DeveloperIntro docs 2016-02-24 20:46:06 +01:00
Michael Vogel 68d7beb298 Welcome to the live editing and commenting of the pull request ;-) 2016-02-24 07:43:13 +01:00
Michael Vogel 8369e6ce59 Clarification between statusnet and GNU Social. 2016-02-24 07:37:18 +01:00
Michael Vogel db92663466 One line, one sentence 2016-02-24 07:33:20 +01:00
Tobias Diekershoff a2ed74e17f Merge pull request #2380 from annando/issue-2373
Bugfix: Resharing on the display page works again.
2016-02-24 07:28:40 +01:00
Michael Vogel 99bac3a4d8 Corrected explanation 2016-02-24 07:22:32 +01:00
Michael Vogel eec0dbf738 Bugfix: Resharing on the display page works again. 2016-02-24 07:20:23 +01:00