]> git.mxchange.org Git - quix0rs-gnu-social.git/log
quix0rs-gnu-social.git
9 years agoNo need for execute-right here.
Roland Haeder [Wed, 4 Mar 2015 13:50:07 +0000 (14:50 +0100)]
No need for execute-right here.

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoMerge branch 'nightly' of gitorious.org:social/mainline into nightly
Roland Haeder [Tue, 3 Mar 2015 20:22:47 +0000 (21:22 +0100)]
Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoFillImageFileMetadata event documented
Mikael Nordfeldth [Mon, 2 Mar 2015 19:37:59 +0000 (20:37 +0100)]
FillImageFileMetadata event documented

9 years agoAdded some checked (I checked them) type-hints to improve type-safety (typing mistakes).
Roland Haeder [Sun, 1 Mar 2015 17:34:46 +0000 (18:34 +0100)]
Added some checked (I checked them) type-hints to improve type-safety (typing mistakes).

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoMerge branch 'nightly' of gitorious.org:social/mainline into nightly
Roland Haeder [Sun, 1 Mar 2015 17:30:18 +0000 (18:30 +0100)]
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>
9 years agoBug tracker link updated.
Mikael Nordfeldth [Sun, 1 Mar 2015 15:48:01 +0000 (16:48 +0100)]
Bug tracker link updated.

9 years agoBlog depended on TinyMCE which was unmaintained
Mikael Nordfeldth [Sun, 1 Mar 2015 13:32:48 +0000 (14:32 +0100)]
Blog depended on TinyMCE which was unmaintained

9 years agoMerge branch 'nightly' of gitorious.org:social/mainline into nightly
Roland Haeder [Sun, 1 Mar 2015 12:02:10 +0000 (13:02 +0100)]
Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoAahhh, gotta run php -l before pushing stuff!!!
Mikael Nordfeldth [Sun, 1 Mar 2015 11:47:48 +0000 (12:47 +0100)]
Aahhh, gotta run php -l before pushing stuff!!!

9 years agoForgot to make syntax edits on last commit.
Mikael Nordfeldth [Sun, 1 Mar 2015 11:45:58 +0000 (12:45 +0100)]
Forgot to make syntax edits on last commit.

9 years agoUser class throws exception on register failure
Mikael Nordfeldth [Sun, 1 Mar 2015 11:36:19 +0000 (12:36 +0100)]
User class throws exception on register failure

9 years agoAllow changing nick on EmailRegistration
Mikael Nordfeldth [Sun, 1 Mar 2015 11:31:52 +0000 (12:31 +0100)]
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.

9 years agoMerge branch 'nightly' of gitorious.org:social/mainline into nightly
Roland Haeder [Sat, 28 Feb 2015 12:41:20 +0000 (13:41 +0100)]
Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoDon't log every included config file
Mikael Nordfeldth [Sat, 28 Feb 2015 12:04:17 +0000 (13:04 +0100)]
Don't log every included config file

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

9 years agoAvatar table url field now 'text', maybe use filename as unique key?
Mikael Nordfeldth [Sat, 28 Feb 2015 11:56:42 +0000 (12:56 +0100)]
Avatar table url field now 'text', maybe use filename as unique key?

9 years agoMerge branch 'nightly' of gitorious.org:social/mainline into nightly
Roland Haeder [Fri, 27 Feb 2015 15:55:03 +0000 (16:55 +0100)]
Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoFixed parser error as the braces pair was missing.
Roland Haeder [Fri, 27 Feb 2015 15:53:11 +0000 (16:53 +0100)]
Fixed parser error as the braces pair was missing.

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoINSTALL file overhaul, mostly done.
Mikael Nordfeldth [Fri, 27 Feb 2015 15:06:05 +0000 (16:06 +0100)]
INSTALL file overhaul, mostly done.

9 years agohtaccess.sample updating
Mikael Nordfeldth [Fri, 27 Feb 2015 14:42:45 +0000 (15:42 +0100)]
htaccess.sample updating

9 years agossh key based easy upgrade method documentation
Mikael Nordfeldth [Fri, 27 Feb 2015 14:07:24 +0000 (15:07 +0100)]
ssh key based easy upgrade method documentation

9 years agoBetter UPGRADE documentation for GS->GS upgrade
Mikael Nordfeldth [Fri, 27 Feb 2015 14:03:07 +0000 (15:03 +0100)]
Better UPGRADE documentation for GS->GS upgrade

9 years agoStatusNet 1.1.x to GNU social 1.2.x instructions updated
Mikael Nordfeldth [Fri, 27 Feb 2015 13:47:54 +0000 (14:47 +0100)]
StatusNet 1.1.x to GNU social 1.2.x instructions updated

9 years agoUPGRADE file had incorrect commands
Mikael Nordfeldth [Fri, 27 Feb 2015 13:12:01 +0000 (14:12 +0100)]
UPGRADE file had incorrect commands

9 years agoStatusNet to GNU social renaming in minor places
Mikael Nordfeldth [Fri, 27 Feb 2015 11:55:08 +0000 (12:55 +0100)]
StatusNet to GNU social renaming in minor places

9 years agoStatusNet class renamed GNUsocial
Mikael Nordfeldth [Fri, 27 Feb 2015 11:44:15 +0000 (12:44 +0100)]
StatusNet class renamed GNUsocial

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

9 years agoStart and EndActionExecute added/fixed/documented
Mikael Nordfeldth [Fri, 27 Feb 2015 11:11:43 +0000 (12:11 +0100)]
Start and EndActionExecute added/fixed/documented

9 years ago1.2.x branch started (utf8mb4 support is reason enough)
Mikael Nordfeldth [Fri, 27 Feb 2015 09:09:57 +0000 (10:09 +0100)]
1.2.x branch started (utf8mb4 support is reason enough)

9 years agoChange branch to 1.2.x since we're utf8mb4 now
Mikael Nordfeldth [Fri, 27 Feb 2015 09:04:29 +0000 (10:04 +0100)]
Change branch to 1.2.x since we're utf8mb4 now

9 years agoMerge branch 'master' into nightly
Mikael Nordfeldth [Fri, 27 Feb 2015 09:01:55 +0000 (10:01 +0100)]
Merge branch 'master' into nightly

Conflicts:
lib/apiaction.php

9 years agoI hereby dub thee 1.1.3 - The Spanish Invasion
Mikael Nordfeldth [Fri, 27 Feb 2015 08:58:38 +0000 (09:58 +0100)]
I hereby dub thee 1.1.3 - The Spanish Invasion

9 years agoPass Profile to asAtomEntry
Mikael Nordfeldth [Fri, 27 Feb 2015 08:57:49 +0000 (09:57 +0100)]
Pass Profile to asAtomEntry

9 years agophp5-intl is recommended but not required
Mikael Nordfeldth [Thu, 26 Feb 2015 21:58:36 +0000 (22:58 +0100)]
php5-intl is recommended but not required

9 years agoMerge branch 'rewrites-nightly/type-hints-asserts' into nightly
Roland Haeder [Thu, 26 Feb 2015 00:21:27 +0000 (01:21 +0100)]
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>
9 years agoSafely added more type-hints.
Roland Haeder [Thu, 26 Feb 2015 00:20:09 +0000 (01:20 +0100)]
Safely added more type-hints.

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoMerge branch 'nightly' of gitorious.org:social/mainline into social-master
Roland Haeder [Thu, 26 Feb 2015 00:01:11 +0000 (01:01 +0100)]
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>
9 years agoNormalize username on AuthCrypt login
Mikael Nordfeldth [Wed, 25 Feb 2015 23:45:17 +0000 (00:45 +0100)]
Normalize username on AuthCrypt login

Because users login with mixed casing and whatnot.

9 years agoAttachment list items have more sane margins around them
Mikael Nordfeldth [Wed, 25 Feb 2015 23:12:34 +0000 (00:12 +0100)]
Attachment list items have more sane margins around them

9 years agoNotice character count now adapts to resized textbox
Mikael Nordfeldth [Wed, 25 Feb 2015 15:40:59 +0000 (16:40 +0100)]
Notice character count now adapts to resized textbox

9 years ago501 Not Implemented on timelines for remote users.
Mikael Nordfeldth [Wed, 25 Feb 2015 15:31:02 +0000 (16:31 +0100)]
501 Not Implemented on timelines for remote users.

9 years agoNoticeOptions above NoticeAttachments
Mikael Nordfeldth [Wed, 25 Feb 2015 15:22:59 +0000 (16:22 +0100)]
NoticeOptions above NoticeAttachments

9 years agoRemoving some plugins that were moved to plugins-unmaintained
Mikael Nordfeldth [Wed, 25 Feb 2015 14:47:14 +0000 (15:47 +0100)]
Removing some plugins that were moved to plugins-unmaintained

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

9 years agoDocumentation + filename uniqueness in File class
Mikael Nordfeldth [Wed, 25 Feb 2015 14:13:47 +0000 (15:13 +0100)]
Documentation + filename uniqueness in File class

9 years agoFixed 2 parser errors.
Roland Haeder [Wed, 25 Feb 2015 13:30:11 +0000 (14:30 +0100)]
Fixed 2 parser errors.

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoFixed 2 parser errors.
Roland Haeder [Wed, 25 Feb 2015 13:30:11 +0000 (14:30 +0100)]
Fixed 2 parser errors.

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoMerge commit 'refs/merge-requests/55' of https://gitorious.org/social/mainline into...
Mikael Nordfeldth [Wed, 25 Feb 2015 11:59:19 +0000 (12:59 +0100)]
Merge commit 'refs/merge-requests/55' of https://gitorious.org/social/mainline into merge-requests/55

9 years agoRemoved Lato font from themes where it was unnecessary
Mikael Nordfeldth [Wed, 25 Feb 2015 11:56:41 +0000 (12:56 +0100)]
Removed Lato font from themes where it was unnecessary

9 years agoMerge commit 'refs/merge-requests/51' of https://gitorious.org/social/mainline into...
Mikael Nordfeldth [Wed, 25 Feb 2015 11:52:35 +0000 (12:52 +0100)]
Merge commit 'refs/merge-requests/51' of https://gitorious.org/social/mainline into merge-requests/51

9 years agotrailing whitespace
Mikael Nordfeldth [Wed, 25 Feb 2015 11:50:56 +0000 (12:50 +0100)]
trailing whitespace

9 years agoMerge commit 'refs/merge-requests/49' of https://gitorious.org/social/mainline into...
Mikael Nordfeldth [Wed, 25 Feb 2015 11:49:58 +0000 (12:49 +0100)]
Merge commit 'refs/merge-requests/49' of https://gitorious.org/social/mainline into merge-requests/49

9 years agoHTML5 media <source> tags are short tags
Mikael Nordfeldth [Wed, 25 Feb 2015 11:49:15 +0000 (12:49 +0100)]
HTML5 media <source> tags are short tags

9 years agoMerge branch 'nightly' of gitorious.org:social/mainline into nightly
Roland Haeder [Wed, 25 Feb 2015 01:30:21 +0000 (02:30 +0100)]
Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Conflicts:
plugins/VideoThumbnails/VideoThumbnailsPlugin.php

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoavconv required -f image2 not -f mjpeg at least on my server
Mikael Nordfeldth [Wed, 25 Feb 2015 00:41:34 +0000 (01:41 +0100)]
avconv required -f image2 not -f mjpeg at least on my server

9 years agoOnly local files to be passed through VideoThumbnails
Mikael Nordfeldth [Wed, 25 Feb 2015 00:37:57 +0000 (01:37 +0100)]
Only local files to be passed through VideoThumbnails

9 years agoVideoThumbnails changed to use 'exec' call to avconv
Mikael Nordfeldth [Wed, 25 Feb 2015 00:36:14 +0000 (01:36 +0100)]
VideoThumbnails changed to use 'exec' call to avconv

9 years agoSave thumbnails with proper extension
Mikael Nordfeldth [Wed, 25 Feb 2015 00:34:00 +0000 (01:34 +0100)]
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.

9 years agomimetype added to ImageFile
Mikael Nordfeldth [Wed, 25 Feb 2015 00:33:32 +0000 (01:33 +0100)]
mimetype added to ImageFile

9 years agoImageFile constructor changed to align with existing code
Mikael Nordfeldth [Wed, 25 Feb 2015 00:31:44 +0000 (01:31 +0100)]
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).

9 years agoThrow more explicit exception in ImageFile
Mikael Nordfeldth [Wed, 25 Feb 2015 00:14:27 +0000 (01:14 +0100)]
Throw more explicit exception in ImageFile

9 years agoMerge branch 'nightly' of gitorious.org:social/mainline into nightly
Roland Haeder [Tue, 24 Feb 2015 22:47:12 +0000 (23:47 +0100)]
Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoHide posts from users with private_stream in scoping streams
Mikael Nordfeldth [Tue, 24 Feb 2015 21:59:58 +0000 (22:59 +0100)]
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).

9 years agoRemoving whitespace and creating an early-return in inScope
Mikael Nordfeldth [Tue, 24 Feb 2015 21:44:43 +0000 (22:44 +0100)]
Removing whitespace and creating an early-return in inScope

9 years agoadded DocNav EVENT
buttle [Tue, 24 Feb 2015 20:51:31 +0000 (21:51 +0100)]
added DocNav EVENT

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

9 years agoDon't store duplicates of files.
Mikael Nordfeldth [Tue, 24 Feb 2015 20:11:25 +0000 (21:11 +0100)]
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.

9 years agoScript to delete file table entries which have disappeared locally
Mikael Nordfeldth [Tue, 24 Feb 2015 18:29:28 +0000 (19:29 +0100)]
Script to delete file table entries which have disappeared locally

9 years agoMerge branch 'social-master' into nightly
Roland Haeder [Mon, 23 Feb 2015 20:22:44 +0000 (21:22 +0100)]
Merge branch 'social-master' into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoChanged thumbnail-only chmod to attachment-general chmod as recommended by mmn.
Roland Haeder [Mon, 23 Feb 2015 20:21:53 +0000 (21:21 +0100)]
Changed thumbnail-only chmod to attachment-general chmod as recommended by mmn.

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoMerge branch 'social-master' into nightly
Roland Haeder [Mon, 23 Feb 2015 19:00:23 +0000 (20:00 +0100)]
Merge branch 'social-master' into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoGenerally applying 0644 on all thumbnail images is maybe not what all people
Roland Haeder [Mon, 23 Feb 2015 18:57:00 +0000 (19:57 +0100)]
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>
9 years agoMerge branch 'nightly' of gitorious.org:social/mainline into nightly
Roland Haeder [Sun, 22 Feb 2015 21:37:45 +0000 (22:37 +0100)]
Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoRSSCloud URL field too long for utf8mb4
Mikael Nordfeldth [Sat, 21 Feb 2015 15:43:21 +0000 (16:43 +0100)]
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.

9 years agoMerge branch 'nightly' of gitorious.org:social/mainline into nightly
Roland Haeder [Fri, 20 Feb 2015 16:13:50 +0000 (17:13 +0100)]
Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoensureFeedURL will return Ostatus_profile early if already stored
Mikael Nordfeldth [Fri, 20 Feb 2015 13:47:12 +0000 (14:47 +0100)]
ensureFeedURL will return Ostatus_profile early if already stored

9 years agoMerge branch 'nightly' of gitorious.org:social/mainline into nightly
Roland Haeder [Fri, 20 Feb 2015 12:58:14 +0000 (13:58 +0100)]
Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoDefault install to site profile community
Mikael Nordfeldth [Fri, 20 Feb 2015 00:00:28 +0000 (01:00 +0100)]
Default install to site profile community

9 years agoEmoji support through utf8mb4 seems to be done!
Mikael Nordfeldth [Thu, 19 Feb 2015 21:13:42 +0000 (22:13 +0100)]
Emoji support through utf8mb4 seems to be done!

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

9 years agoHad to avoid using indexes in the migration phase
Mikael Nordfeldth [Thu, 19 Feb 2015 21:06:43 +0000 (22:06 +0100)]
Had to avoid using indexes in the migration phase

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

9 years agoRemove common_debug call that slipped by
Mikael Nordfeldth [Thu, 19 Feb 2015 20:26:55 +0000 (21:26 +0100)]
Remove common_debug call that slipped by

9 years agounique keys and indexes must be NOT NULL or MySQL fucks up
Mikael Nordfeldth [Thu, 19 Feb 2015 20:21:39 +0000 (21:21 +0100)]
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.

9 years agoSome loose table definitions which needed 191 char indexes
Mikael Nordfeldth [Thu, 19 Feb 2015 20:01:43 +0000 (21:01 +0100)]
Some loose table definitions which needed 191 char indexes

because we want utf8mb4 so badly!

9 years agoMerge branch 'utf8mb4' into nightly
Mikael Nordfeldth [Thu, 19 Feb 2015 19:50:40 +0000 (20:50 +0100)]
Merge branch 'utf8mb4' into nightly

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

9 years agoMerge branch 'nightly' of gitorious.org:social/mainline into nightly
Roland Haeder [Thu, 19 Feb 2015 19:38:05 +0000 (20:38 +0100)]
Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoless newlines for the scripts/upgrade.php output
Mikael Nordfeldth [Thu, 19 Feb 2015 18:40:36 +0000 (19:40 +0100)]
less newlines for the scripts/upgrade.php output

9 years agoBad check on existing urlhash key
Mikael Nordfeldth [Thu, 19 Feb 2015 18:36:59 +0000 (19:36 +0100)]
Bad check on existing urlhash key

9 years agoUse new ::getByUrl for File and File_redirection
Mikael Nordfeldth [Thu, 19 Feb 2015 18:29:55 +0000 (19:29 +0100)]
Use new ::getByUrl for File and File_redirection

and make use of the exceptions instead endless if statements

9 years agoMediafile updated to insert urlhash and lookup properly
Mikael Nordfeldth [Thu, 19 Feb 2015 18:12:16 +0000 (19:12 +0100)]
Mediafile updated to insert urlhash and lookup properly

9 years agofunction is hashurl, variable is urlhash
Mikael Nordfeldth [Thu, 19 Feb 2015 18:07:43 +0000 (19:07 +0100)]
function is hashurl, variable is urlhash

9 years agoFile and File_redirection adhoc storage methods updated for urlhash
Mikael Nordfeldth [Thu, 19 Feb 2015 17:59:28 +0000 (18:59 +0100)]
File and File_redirection adhoc storage methods updated for urlhash

9 years agoFile_thumbnail url is not an index
Mikael Nordfeldth [Thu, 19 Feb 2015 17:59:13 +0000 (18:59 +0100)]
File_thumbnail url is not an index

9 years agoFile_redirection also got urlhash column
Mikael Nordfeldth [Thu, 19 Feb 2015 17:34:48 +0000 (18:34 +0100)]
File_redirection also got urlhash column

9 years agoMerge branch 'nightly' into file_urlhash
Mikael Nordfeldth [Thu, 19 Feb 2015 17:13:09 +0000 (18:13 +0100)]
Merge branch 'nightly' into file_urlhash

9 years ago$this->scoped->getUser() instead of common_current_user();
Mikael Nordfeldth [Thu, 19 Feb 2015 16:46:37 +0000 (17:46 +0100)]
$this->scoped->getUser() instead of common_current_user();

9 years agoROLLBACK if query failed in email settings savePreferences
Mikael Nordfeldth [Thu, 19 Feb 2015 16:42:47 +0000 (17:42 +0100)]
ROLLBACK if query failed in email settings savePreferences

9 years agoMINOR: Please don't set a+x on files which are not being executed as shell script...
Roland Haeder [Thu, 19 Feb 2015 11:15:07 +0000 (12:15 +0100)]
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>
9 years agoMINOR: Please don't set a+x on files which are not being executed as shell script...
Roland Haeder [Thu, 19 Feb 2015 11:15:07 +0000 (12:15 +0100)]
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>
9 years agoMerge branch 'social-master' into nightly
Roland Haeder [Wed, 18 Feb 2015 15:48:25 +0000 (16:48 +0100)]
Merge branch 'social-master' into nightly

Conflicts:
classes/File.php

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoMerge branch 'nightly' of gitorious.org:social/mainline into nightly
Roland Haeder [Wed, 18 Feb 2015 15:47:11 +0000 (16:47 +0100)]
Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Conflicts:
actions/apifriendshipsdestroy.php
actions/apifriendshipsexists.php
actions/apifriendshipsshow.php
actions/apitimelineretweetedtome.php
plugins/Directory/actions/groupdirectory.php
plugins/Directory/actions/userdirectory.php

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoProfile table cleaning script.
Mikael Nordfeldth [Wed, 18 Feb 2015 13:01:35 +0000 (14:01 +0100)]
Profile table cleaning script.

9 years agoUserdirectoryAction now ManagedAction and better SQL
Mikael Nordfeldth [Wed, 18 Feb 2015 12:37:06 +0000 (13:37 +0100)]
UserdirectoryAction now ManagedAction and better SQL

9 years agoNo need for return true
Mikael Nordfeldth [Wed, 18 Feb 2015 12:18:32 +0000 (13:18 +0100)]
No need for return true

9 years agoGroupdirectoryAction now has no direct SQL queries
Mikael Nordfeldth [Wed, 18 Feb 2015 11:17:26 +0000 (12:17 +0100)]
GroupdirectoryAction now has no direct SQL queries

also various fixes uppers