Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Conflicts:
classes/File.php

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

No need for execute-right here.

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

Use getUrl() on File and File_thumbnail instead of ->url

Move thumbnail algorithm mainly to ImageFile class

Free ImageMagick object from memory when done with it

ImageMagickPlugin refactored so we can more easily add new formats

Subscription_queue::start does not mean Subscription exists

Subscription::ensureStart skips AlreadyFulfilledException

Sometimes we just want to accept the user's wrong, but when it comes
to remote APIs etc. we probably want to let the client know it has
done something already (in this case multiple identical subscription
requests - which might indicate to it that it should refresh the sub
lists or something).

Merge branch 'nightly' of gitorious.org:social/mainline into nightly

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

FillImageFileMetadata event documented

Added some checked (I checked them) type-hints to improve type-safety (typing mistakes).

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

Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Conflicts:
plugins/Blog/BlogPlugin.php
plugins/Blog/classes/Blog_entry.php

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

Bug tracker link updated.

Blog depended on TinyMCE which was unmaintained

Merge branch 'nightly' of gitorious.org:social/mainline into nightly

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

Aahhh, gotta run php -l before pushing stuff!!!

Forgot to make syntax edits on last commit.

User class throws exception on register failure

Allow changing nick on EmailRegistration

Nothing said that the EmailRegistration plugin was meant to restrict
the nickname to the local part of the email address. Let users change
it before they actually register the user.

Merge branch 'nightly' of gitorious.org:social/mainline into nightly

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

Don't log every included config file

but let us retrieve the list by running GNUsocial::configFiles()

Avatar table url field now 'text', maybe use filename as unique key?

Merge branch 'nightly' of gitorious.org:social/mainline into nightly

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

Fixed parser error as the braces pair was missing.

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

INSTALL file overhaul, mostly done.

htaccess.sample updating

ssh key based easy upgrade method documentation

Better UPGRADE documentation for GS->GS upgrade

StatusNet 1.1.x to GNU social 1.2.x instructions updated

UPGRADE file had incorrect commands

StatusNet to GNU social renaming in minor places

StatusNet class renamed GNUsocial

also added backward compatible StatusNet class for the two calls I know
third party plugins use, isHTTPS and getActivePlugins

Start and EndActionExecute added/fixed/documented

1.2.x branch started (utf8mb4 support is reason enough)

Change branch to 1.2.x since we're utf8mb4 now

Merge branch 'master' into nightly

Conflicts:
lib/apiaction.php

I hereby dub thee 1.1.3 - The Spanish Invasion

Pass Profile to asAtomEntry

php5-intl is recommended but not required

Merge branch 'rewrites-nightly/type-hints-asserts' into nightly

Conflicts:
plugins/Directory/actions/groupdirectory.php
plugins/Directory/actions/userdirectory.php
plugins/WebFinger/WebFingerPlugin.php

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

Safely added more type-hints.

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

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

Conflicts:
actions/apifriendshipsdestroy.php
actions/apifriendshipsexists.php
actions/apifriendshipsshow.php
actions/apitimelineretweetedtome.php
plugins/APC/APCPlugin.php
plugins/Adsense/AdsensePlugin.php
plugins/Aim/AimPlugin.php
plugins/Aim/lib/aimmanager.php
plugins/Directory/actions/groupdirectory.php
plugins/Directory/actions/userdirectory.php
plugins/Irc/IrcPlugin.php
plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/HandlerTest.php
plugins/Irc/lib/ircmanager.php
plugins/Spotify/SpotifyPlugin.php
plugins/TinyMCE/TinyMCEPlugin.php
plugins/VideoThumbnails/VideoThumbnailsPlugin.php
plugins/WebFinger/WebFingerPlugin.php
plugins/XCache/XCachePlugin.php
plugins/YammerImport/actions/yammeradminpanel.php
plugins/YammerImport/actions/yammerauth.php
plugins/YammerImport/lib/yammerimporter.php

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

Normalize username on AuthCrypt login

Because users login with mixed casing and whatnot.

Attachment list items have more sane margins around them

Notice character count now adapts to resized textbox

501 Not Implemented on timelines for remote users.

NoticeOptions above NoticeAttachments

Removing some plugins that were moved to plugins-unmaintained

See https://gitorious.org/social/plugins-unmaintained/

Documentation + filename uniqueness in File class

Fixed 2 parser errors.

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

Fixed 2 parser errors.

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

Merge commit 'refs/merge-requests/55' of https://gitorious.org/social/mainline into merge-requests/55

Removed Lato font from themes where it was unnecessary

Merge commit 'refs/merge-requests/51' of https://gitorious.org/social/mainline into merge-requests/51

trailing whitespace

Merge commit 'refs/merge-requests/49' of https://gitorious.org/social/mainline into merge-requests/49

HTML5 media <source> tags are short tags

Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Conflicts:
plugins/VideoThumbnails/VideoThumbnailsPlugin.php

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

avconv required -f image2 not -f mjpeg at least on my server

Only local files to be passed through VideoThumbnails

VideoThumbnails changed to use 'exec' call to avconv

Save thumbnails with proper extension

This might cause double extensions, but that's ok since the filename
is stored in the database. We might want to look at it later though.

mimetype added to ImageFile

ImageFile constructor changed to align with existing code

Noone passed type, width or height to new ImageFile(...) and
in all instances, both parameters were set (though $id is null on occasion).

Throw more explicit exception in ImageFile

Merge branch 'nightly' of gitorious.org:social/mainline into nightly

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

Hide posts from users with private_stream in scoping streams

For example the public timeline would show notices from a user with
private_stream configured. (previously it would only hide _new_ notices
by this user as they would be the only ones with notice scoping set).

Removing whitespace and creating an early-return in inScope

added DocNav EVENT

Event to overide DocNav
two small css changes to indent notice footer correctly.

Don't store duplicates of files.

If a new file is uploaded, it will be matched with a previously uploaded
file so we don't have to store duplicates. SHA256 is random enough and
also unlikely enough to cause collisions.

Script to delete file table entries which have disappeared locally

Merge branch 'social-master' into nightly

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

Changed thumbnail-only chmod to attachment-general chmod as recommended by mmn.

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

Merge branch 'social-master' into nightly

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

Generally applying 0644 on all thumbnail images is maybe not what all people
like, so better make it configurable.

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

Merge branch 'nightly' of gitorious.org:social/mainline into nightly

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

RSSCloud URL field too long for utf8mb4

Should be the last one. If any URLs are longer than 191 chars, it might
require more manual interaction. Any instance with problems running
scripts/upgrade.php will get special treatment, help and a lollipop.

Merge branch 'nightly' of gitorious.org:social/mainline into nightly

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

ensureFeedURL will return Ostatus_profile early if already stored

Merge branch 'nightly' of gitorious.org:social/mainline into nightly

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

Default install to site profile community

Emoji support through utf8mb4 seems to be done!

scripts/upgrade.php will take a _long_ time though! But it's worth it.

Had to avoid using indexes in the migration phase

File and File_redirection still had their indexes in the temporary migration table definition.

Remove common_debug call that slipped by

unique keys and indexes must be NOT NULL or MySQL fucks up

If this merge throws exception on scripts/upgrade.php and you recently
tried a nightly (i.e. during 2015-02-19) then just go back a commit or two
and try again.

Or delete the duplicate entries. Find the entries like this:

SELECT COUNT(*), urlhash FROM file_redirection
    GROUP BY urlhash
    HAVING COUNT(*) > 1;

then for each urlhash (or come up with a smart SQL query) do:
DELETE FROM file_redirection WHERE urlhash='hashfrompreviousquery' LIMIT 1;

You'll have to remove duplicates more than once if you have >2 identical
urlhash entries. LIMIT -1 might do that for you. I'm not sure.

Some loose table definitions which needed 191 char indexes

because we want utf8mb4 so badly!

Merge branch 'utf8mb4' into nightly

Conflicts because of urlhash fixes:
classes/File.php
classes/File_redirection.php
classes/File_thumbnail.php

Merge branch 'nightly' of gitorious.org:social/mainline into nightly

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

less newlines for the scripts/upgrade.php output

Bad check on existing urlhash key

Use new ::getByUrl for File and File_redirection

and make use of the exceptions instead endless if statements

Mediafile updated to insert urlhash and lookup properly

function is hashurl, variable is urlhash

File and File_redirection adhoc storage methods updated for urlhash

File_thumbnail url is not an index

File_redirection also got urlhash column

Merge branch 'nightly' into file_urlhash

$this->scoped->getUser() instead of common_current_user();

ROLLBACK if query failed in email settings savePreferences

MINOR: Please don't set a+x on files which are not being executed as shell script by the server.

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