Merge branch 'master' into social-master

Merge remote-tracking branch 'upstream/master'

Hannes Mannerheim's merge request 8 from Gitorious

Bug, attachments stored double in file table

This if-statement looked like this before:

if (empty($file_redir))

and so it needs a ! when rewritten as instanceof

Merge branch 'master' into social-master

Merge remote-tracking branch 'upstream/master'

Mats Sjöberg's merge request no.5 from Gitorious

Latest Mf2/Parser.php is compatible with PHP5.3

Updated LDAP2 extlib to latest version.

Added a return true statement for an event handler

Merge branch 'fixes/type-hints' into social-master

Fixed:
-----------------------------
Argument 2 passed to Ostatus_profile::notifyDeferred() must be an
instance of Profile, instance of User given, called in
/var/www/htdocs/plugins/OStatus/lib/ostatusqueuehandler.php on line 156 and
defined (/var/www/htdocs/plugins/OStatus/classes/Ostatus_profile.php:363)
[ABORT]
-----------------------------
getProfile() must be called on this->user

Plus fixed/added some type-hints.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Use common_debug() instead of common_log(LOG_DEBUG, ) to minimize code duplication.

Signed-off-by: Roland Haeder <roland@mxchange.org>

"return parent" breaks ldap plugin, there's no parent

Reoved another to strict type-hint + added check if $args is no array. In this
case the below foreach() is unneccessary as the if() block in it will never
match.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Added asserts + remove wrong type-hint (was no array).

Signed-off-by: Roland Haeder <roland@mxchange.org>

Reoved another to strict type-hint + added check if $args is no array. In this
case the below foreach() is unneccessary as the if() block in it will never
match.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Added asserts + remove wrong type-hint (was no array).

Signed-off-by: Roland Haeder <roland@mxchange.org>

Merge branch 'fixes/type-hints' into social-master

Fixed syntax error. :-(

Signed-off-by: Roland Haeder <roland@mxchange.org>

Fixed syntax error. :-(

Signed-off-by: Roland Haeder <roland@mxchange.org>

Fixed type-hints + added assert + method getGroup().

Signed-off-by: Roland Haeder <roland@mxchange.org>

Fixed type-hints + added assert + method getGroup().

Signed-off-by: Roland Haeder <roland@mxchange.org>

Merge branch 'fixes/type-hints' into social-master

Fixed type-hint to correct object URLMapper as the other does not exist.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Fixed type-hints.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Fixed type-hint to correct object URLMapper as the other does not exist.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Fixed ;-)

Signed-off-by: Roland Haeder <roland@mxchange.org>

Merge branch 'social-master' of gitorious.org:statusnet/quix0rs-gnu-social into social-master

Merge branch 'fixes/type-hints' of gitorious.org:statusnet/quix0rs-gnu-social into fixes/type-hints

Fixed type hints:
- onStartEnqueueNotice
- onPluginVersion
- onGetValidDaemons

Signed-off-by: Roland Haeder <roland@mxchange.org>

Improved type-hint for following methods:
- handle
- isReadOnly
- prepare

Signed-off-by: Roland Haeder <roland@mxchange.org>

Added some (good known) type-hints.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Some fixes/improvements
- added getter getGroup() for https://bugz.foocorp.net/T44
- added type-hints in method signatures

---------------------------------------------------------
WARNING: Some plugins attempt to get a property 'group' from (basicly) a Menu
class which does NOT have such property. This badly needs fixing.
---------------------------------------------------------

Signed-off-by: Roland Haeder <roland@mxchange.org>

Remove exception so it never throwed by HTTPClient

Remove exception for generally problems.

Delete @debugs from urlshortenerplugin2

Adding htaccess.sample back*shame*

oops, DB.txt O_o

Fix @author back

Add urlshortenerplugin2.php to solve some @todo's and adding exceptions

Merge branch 'master' of git://gitorious.org/statusnet/darksider3s-gnu-social into social-master

Fixed type hints:
- onStartEnqueueNotice
- onPluginVersion
- onGetValidDaemons

Signed-off-by: Roland Haeder <roland@mxchange.org>

Improved type-hint for following methods:
- handle
- isReadOnly
- prepare

Signed-off-by: Roland Haeder <roland@mxchange.org>

Added some (good known) type-hints.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Some fixes/improvements
- added getter getGroup() for https://bugz.foocorp.net/T44
- added type-hints in method signatures

---------------------------------------------------------
WARNING: Some plugins attempt to get a property 'group' from (basicly) a Menu
class which does NOT have such property. This badly needs fixing.
---------------------------------------------------------

Signed-off-by: Roland Haeder <roland@mxchange.org>

Improved type-hint for following methods:
- handle
- isReadOnly
- prepare

Signed-off-by: Roland Haeder <roland@mxchange.org>

Added some (good known) type-hints.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Some fixes/improvements
- added getter getGroup() for https://bugz.foocorp.net/T44
- added type-hints in method signatures

---------------------------------------------------------
WARNING: Some plugins attempt to get a property 'group' from (basicly) a Menu
class which does NOT have such property. This badly needs fixing.
---------------------------------------------------------

Signed-off-by: Roland Haeder <roland@mxchange.org>

Some cleanups:
- Used instanceof to compare object instance with class (not the best, interfaces would be better)
- Improved some SQL queries by addding backticks
- Converted some double-quotes to single

Signed-off-by: Roland Haeder <roland@mxchange.org>

Possible fix for https://bugz.foocorp.net/T41

Signed-off-by: Roland Haeder <roland@mxchange.org>

No need for php interpreter again as this script is executable.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Fixed CHMOD.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Merge remote-tracking branch 'upstream/master'

Signed-off-by: Roland Haeder <roland@mxchange.org>
Conflicts:
lib/installer.php
plugins/Meteor/MeteorPlugin.php
plugins/TwitterBridge/daemons/synctwitterfriends.php
scripts/getvaliddaemons.php

QnA layout fix, still no answer-action

There is required to be an answer-action element for the threaded view
so we can fetch that action value to an AJAX call which fetches the form.

That is: Currently the "Your answer..." placeholder will fetch a blank URL.

tabs to spaces

Fixes for making Meteor working with HTTPS.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Added missing index declarations.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Let's not avoid error reporting completely in getvaliddaemons

Fixed CHMOD + set error_reporting(0) in getvaliddaemons.php to avoid strict warnings in PHP +5.5

Signed-off-by: Roland Haeder <roland@mxchange.org>

This JavaScript file is located in js/ - Fixed paths for all targets.

Signed-off-by: Roland Haeder <roland@mxchange.org>

AtomPub missing georss namespace merge from chimo

QnA fixes from chimo

Poll fixes by chimo

Added additional check.

Signed-off-by: Roland Haeder <roland@mxchange.org>

TwitterBridge should not try to send replies to tweets back to Twitter if user hasn't selected to import tweets.

Merge branch 'master' of gitorious.org:social/mainline

Added GNU social install doc:

Fixes for making Meteor working with HTTPS.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Usefull line for debugging added.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Opps.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Introduced common_get_temp_dir() which wraps getting temporary path.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Added missing index declarations.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Renamed commandline.inc -> commandline.inc.php to avoid confusion.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Fixed CHMOD + set error_reporting(0) in getvaliddaemons.php to avoid strict warnings in PHP +5.5

Signed-off-by: Roland Haeder <roland@mxchange.org>

Fixed error when installing 'Blog' plugin.

Signed-off-by: Roland Haeder <roland@mxchange.org>

This JavaScript file is located in js/ - Fixed paths for all targets.

Signed-off-by: Roland Haeder <roland@mxchange.org>

alpha number bump

Merge mmn's 'nightly' changes

Check for valid database connection object.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Check for valid database connection object.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Updated README

PollListItem: Use showNotice args

Added adaptNoticeListItem and QnAListItem

Added adaptNoticeListItem and PollListItem

Adds missing georss xmlns in subscriptions AtomPub

Fixes 'unbound prefix: georss' validation issue.

Revert "Repeat query window misplaced"

I believe other parts of the CSS may have been tidied and propered up since.

declared "next_id" used to set the max_id for next link

local variable format in ApiAction declared in class

User timeline ActivityStreams output now has paging data

Profile activityobject array outputs "summary" field

Removing old "-browser-border-radius" stuff (pre-CSS3)

Merge request from postblue for unclosed @media in CSS

Missing end of @media screen, projection, tv

Deleting useless comma

Apache 2.4 mod_authz_host access example

Apache 2.2 -> 2.4 upgrades tend to fail on the "Order allow,deny" bit.

PATHINFO example added to htaccess.sample

TwitterBridge PHP require_once paths now relative

RSVP fromNotice now throws NoResultException

Don't auto-enable Twitter and Facebook bridges (singleuser)

Multiuser instances already had them disabled.