]> git.mxchange.org Git - quix0rs-gnu-social.git/log
quix0rs-gnu-social.git
9 years agoMerge branch 'social-nightly' into nightly
Roland Haeder [Sat, 7 Mar 2015 18:31:57 +0000 (19:31 +0100)]
Merge branch 'social-nightly' into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoMerge branch 'social-master' into nightly
Roland Haeder [Sat, 7 Mar 2015 18:31:47 +0000 (19:31 +0100)]
Merge branch 'social-master' into nightly

Conflicts:
lib/noticeform.php

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoMerge branch 'nightly' into social-nightly
Roland Haeder [Sat, 7 Mar 2015 18:30:33 +0000 (19:30 +0100)]
Merge branch 'nightly' into social-nightly

9 years agoMerge branch 'nightly' of gitorious.org:social/mainline into nightly
Roland Haeder [Sat, 7 Mar 2015 18:29:59 +0000 (19:29 +0100)]
Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoMerge branch 'nightly' into social-nightly
Roland Haeder [Sat, 7 Mar 2015 15:53:36 +0000 (16:53 +0100)]
Merge branch 'nightly' into social-nightly

9 years agoMerge branch 'nightly' of gitorious.org:social/mainline into nightly
Roland Haeder [Sat, 7 Mar 2015 15:52:44 +0000 (16:52 +0100)]
Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agojquery-ui updated to 1.11.3
Mikael Nordfeldth [Sat, 7 Mar 2015 13:14:19 +0000 (14:14 +0100)]
jquery-ui updated to 1.11.3

Checked all checkboxes on http://jqueryui.com/download/

9 years agojquery infieldlabel.js removed from script list
Mikael Nordfeldth [Sat, 7 Mar 2015 11:32:24 +0000 (12:32 +0100)]
jquery infieldlabel.js removed from script list

9 years agojQuery cookie plugin updated
Mikael Nordfeldth [Sat, 7 Mar 2015 00:00:07 +0000 (01:00 +0100)]
jQuery cookie plugin updated

Source: https://plugins.jquery.com/cookie/

9 years agoJSON in JavaScript library updated
Mikael Nordfeldth [Fri, 6 Mar 2015 23:57:21 +0000 (00:57 +0100)]
JSON in JavaScript library updated

...why we now need a JSON library... _in_ Javascript?!
Source: http://www.json.org/js.html

9 years agojQuery Form Plugin updated
Mikael Nordfeldth [Fri, 6 Mar 2015 23:55:17 +0000 (00:55 +0100)]
jQuery Form Plugin updated

Source: http://malsup.com/jquery/form/

9 years ago"infield labels" should be migrated to HTML5 placeholder
Mikael Nordfeldth [Fri, 6 Mar 2015 23:49:05 +0000 (00:49 +0100)]
"infield labels" should be migrated to HTML5 placeholder

9 years agojQuery v2.1.3 seems to work fine
Mikael Nordfeldth [Fri, 6 Mar 2015 23:48:43 +0000 (00:48 +0100)]
jQuery v2.1.3 seems to work fine

9 years agoMerge branch 'master' into social-master
Roland Haeder [Fri, 6 Mar 2015 23:41:01 +0000 (00:41 +0100)]
Merge branch 'master' into social-master

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agorand() is weak on some OSes as it only produces random numbers from -32766 to
Roland Haeder [Fri, 6 Mar 2015 23:36:49 +0000 (00:36 +0100)]
rand() is weak on some OSes as it only produces random numbers from -32766 to
32766. So let's get rid of it all together and use mt_rand() (which produces
*way* larger numbers on *all* systems).

Signed-off-by: Roland Haeder <roland@mxchange.org>
Conflicts:
lib/noticeform.php

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoMerge branch 'nightly' into social-nightly
Roland Haeder [Fri, 6 Mar 2015 23:38:35 +0000 (00:38 +0100)]
Merge branch 'nightly' into social-nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agorand() is weak on some OSes as it only produces random numbers from -32766 to
Roland Haeder [Fri, 6 Mar 2015 23:36:49 +0000 (00:36 +0100)]
rand() is weak on some OSes as it only produces random numbers from -32766 to
32766. So let's get rid of it all together and use mt_rand() (which produces
*way* larger numbers on *all* systems).

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoMerge branch 'nightly' of gitorious.org:social/mainline into nightly
Roland Haeder [Fri, 6 Mar 2015 23:34:34 +0000 (00:34 +0100)]
Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Better use a clear type-hint and array() as default value then you can avoid the
additional is_null() call.

Conflicts:
lib/noticeform.php

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoStart working a bit more consistently with "notice-options"
Mikael Nordfeldth [Fri, 6 Mar 2015 23:32:26 +0000 (00:32 +0100)]
Start working a bit more consistently with "notice-options"

Let's get the AJAX response and present it to the user with the same
mechanisms for all actions, instead of having a bunch of javascript
for various circumstances (fave, repeat, delete should all be the same
behaviour for example).

9 years agoNo need for NoticeFormMaster anymore
Mikael Nordfeldth [Fri, 6 Mar 2015 23:00:02 +0000 (00:00 +0100)]
No need for NoticeFormMaster anymore

9 years agoChoose whether to prerender the inline reply forms
Mikael Nordfeldth [Fri, 6 Mar 2015 22:52:25 +0000 (23:52 +0100)]
Choose whether to prerender the inline reply forms

The DefaultLayout plugin will come with options to render various parts
of the page by default or not. The expected default behaviour will try
to imitate the original StatusNet/GNU social looks as far as possible.

9 years agoReplies to replies without reloading page now work
Mikael Nordfeldth [Fri, 6 Mar 2015 22:47:03 +0000 (23:47 +0100)]
Replies to replies without reloading page now work

9 years agoHide the threaded-replies gray line.
Mikael Nordfeldth [Fri, 6 Mar 2015 22:46:08 +0000 (23:46 +0100)]
Hide the threaded-replies gray line.

9 years agoMake sure we save 0 as '0' because of DB_DataObject bug
Mikael Nordfeldth [Fri, 6 Mar 2015 22:21:57 +0000 (23:21 +0100)]
Make sure we save 0 as '0' because of DB_DataObject bug

9 years agoReply notice forms are functional again, but not AJAX
Mikael Nordfeldth [Fri, 6 Mar 2015 20:20:46 +0000 (21:20 +0100)]
Reply notice forms are functional again, but not AJAX

9 years agoRemove some more reply-placeholder stuff
Mikael Nordfeldth [Fri, 6 Mar 2015 19:42:50 +0000 (20:42 +0100)]
Remove some more reply-placeholder stuff

9 years agoNo separate placeholder input element for replyforms
Mikael Nordfeldth [Fri, 6 Mar 2015 19:22:01 +0000 (20:22 +0100)]
No separate placeholder input element for replyforms

Also we're moving the rendering of these out into a separate plugin. Not
done yet, some javascript should be moved out as well.

9 years agoMake NoticeForm return the proper placeholder text
Mikael Nordfeldth [Fri, 6 Mar 2015 19:04:09 +0000 (20:04 +0100)]
Make NoticeForm return the proper placeholder text

Also fixes some comments and uncertainties in the beginning of the
class definition.

9 years agoMerge branch 'nightly' into social-nightly
Roland Haeder [Fri, 6 Mar 2015 00:44:57 +0000 (01:44 +0100)]
Merge branch 'nightly' into social-nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoMerge branch 'nightly' of gitorious.org:social/mainline into nightly
Roland Haeder [Fri, 6 Mar 2015 00:43:25 +0000 (01:43 +0100)]
Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoGet the values from the correct object.
Mikael Nordfeldth [Thu, 5 Mar 2015 23:47:18 +0000 (00:47 +0100)]
Get the values from the correct object.

9 years agoValues of 0 would not be updated because of DB_DataObject
Mikael Nordfeldth [Thu, 5 Mar 2015 23:44:00 +0000 (00:44 +0100)]
Values of 0 would not be updated because of DB_DataObject

Upstream bug causing (int)0 to be interpreted as a "null string":
https://pear.php.net/bugs/bug.php?id=20291

9 years agoMerge branch 'nightly' into social-nightly
Roland Haeder [Thu, 5 Mar 2015 23:01:27 +0000 (00:01 +0100)]
Merge branch 'nightly' into social-nightly

This branch will serve as a "pre-beta", or so. :-) And it will contain commits
from both my social-master and my local nightly branch.

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoMerge branch 'master' into social-master
Roland Haeder [Thu, 5 Mar 2015 22:50:51 +0000 (23:50 +0100)]
Merge branch 'master' into social-master

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoMake attachment fit better in notice: drop text and link
aroquen [Thu, 5 Mar 2015 21:19:57 +0000 (22:19 +0100)]
Make attachment fit better in notice: drop text and link

9 years agoMerge branch 'nightly' of gitorious.org:social/aroquen-mainline into nightly
Roland Haeder [Thu, 5 Mar 2015 22:49:26 +0000 (23:49 +0100)]
Merge branch 'nightly' of gitorious.org:social/aroquen-mainline into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoMake attachment fit better in notice: drop text and link
aroquen [Thu, 5 Mar 2015 21:19:57 +0000 (22:19 +0100)]
Make attachment fit better in notice: drop text and link

9 years agoMerge branch 'master' of gitorious.org:social/mainline into nightly
Roland Haeder [Thu, 5 Mar 2015 21:04:51 +0000 (22:04 +0100)]
Merge branch 'master' of gitorious.org:social/mainline into nightly

Conflicts:
README.md

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoAdded more checked type-hints
Roland Haeder [Thu, 5 Mar 2015 18:18:38 +0000 (19:18 +0100)]
Added more checked type-hints

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoAdded more checked type-hints
Roland Haeder [Thu, 5 Mar 2015 18:18:38 +0000 (19:18 +0100)]
Added more checked type-hints

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoMerge branch 'master' into social-master
Roland Haeder [Thu, 5 Mar 2015 17:46:50 +0000 (18:46 +0100)]
Merge branch 'master' into social-master

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years ago$related must contain class names, no table names ("all" lower-case) + fixed some...
Roland Haeder [Thu, 5 Mar 2015 17:43:57 +0000 (18:43 +0100)]
$related must contain class names, no table names ("all" lower-case) + fixed some checked type-hints.

Again, it must be User_flag_profile (class name), not user_flag_profile (table name).

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years ago$related must contain class names, no table names ("all" lower-case) + fixed some...
Roland Haeder [Thu, 5 Mar 2015 17:43:57 +0000 (18:43 +0100)]
$related must contain class names, no table names ("all" lower-case) + fixed some checked type-hints.

Again, it must be User_flag_profile (class name), not user_flag_profile (table name).

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoActually show all images as <img /> tags.
Mikael Nordfeldth [Thu, 5 Mar 2015 10:59:31 +0000 (11:59 +0100)]
Actually show all images as <img /> tags.

Browsers should be secure enough by now for this.

9 years agoSVG files can be used as thumbnails I guess
Mikael Nordfeldth [Thu, 5 Mar 2015 10:59:11 +0000 (11:59 +0100)]
SVG files can be used as thumbnails I guess

9 years agoSome SVG files are "text/html" according to 'file'
Mikael Nordfeldth [Thu, 5 Mar 2015 10:54:30 +0000 (11:54 +0100)]
Some SVG files are "text/html" according to 'file'

9 years agoImageMagick sucks at vector graphics, so only use for rasterization
Mikael Nordfeldth [Thu, 5 Mar 2015 10:53:52 +0000 (11:53 +0100)]
ImageMagick sucks at vector graphics, so only use for rasterization

9 years agoMerge branch 'master' into social-master
Roland Haeder [Wed, 4 Mar 2015 13:52:59 +0000 (14:52 +0100)]
Merge branch 'master' into social-master

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoMerge branch 'master' of gitorious.org:social/mainline
Roland Haeder [Wed, 4 Mar 2015 13:52:41 +0000 (14:52 +0100)]
Merge branch 'master' of gitorious.org:social/mainline

Signed-off-by: Roland Haeder <roland@mxchange.org>
9 years agoMerge branch 'nightly' of gitorious.org:social/mainline into nightly
Roland Haeder [Wed, 4 Mar 2015 13:52:14 +0000 (14:52 +0100)]
Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Conflicts:
classes/File.php

Signed-off-by: Roland Haeder <roland@mxchange.org>
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 agoImageMagick plugin can now make thumbnails of SVG files
Mikael Nordfeldth [Wed, 4 Mar 2015 12:50:20 +0000 (13:50 +0100)]
ImageMagick plugin can now make thumbnails of SVG files

9 years agoUsed ->find(true) on wrong object
Mikael Nordfeldth [Wed, 4 Mar 2015 12:46:51 +0000 (13:46 +0100)]
Used ->find(true) on wrong object

9 years agoReset imgPath variable if VideoThumbnails failed
Mikael Nordfeldth [Wed, 4 Mar 2015 12:45:42 +0000 (13:45 +0100)]
Reset imgPath variable if VideoThumbnails failed

9 years agoDocumentation and more understandable code.
Mikael Nordfeldth [Wed, 4 Mar 2015 12:29:18 +0000 (13:29 +0100)]
Documentation and more understandable code.

9 years agoUse getUrl() on File and File_thumbnail instead of ->url
Mikael Nordfeldth [Wed, 4 Mar 2015 12:13:04 +0000 (13:13 +0100)]
Use getUrl() on File and File_thumbnail instead of ->url

9 years agoMove thumbnail algorithm mainly to ImageFile class
Mikael Nordfeldth [Wed, 4 Mar 2015 12:12:42 +0000 (13:12 +0100)]
Move thumbnail algorithm mainly to ImageFile class

9 years agoFree ImageMagick object from memory when done with it
Mikael Nordfeldth [Wed, 4 Mar 2015 11:18:44 +0000 (12:18 +0100)]
Free ImageMagick object from memory when done with it

9 years agoImageMagickPlugin refactored so we can more easily add new formats
Mikael Nordfeldth [Wed, 4 Mar 2015 11:06:21 +0000 (12:06 +0100)]
ImageMagickPlugin refactored so we can more easily add new formats

9 years agoSubscription_queue::start does not mean Subscription exists
Mikael Nordfeldth [Wed, 4 Mar 2015 10:49:54 +0000 (11:49 +0100)]
Subscription_queue::start does not mean Subscription exists

9 years agoSubscription::ensureStart skips AlreadyFulfilledException
Mikael Nordfeldth [Wed, 4 Mar 2015 10:38:04 +0000 (11:38 +0100)]
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).

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 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 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 'master' of gitorious.org:social/mainline into social-master
Roland Haeder [Fri, 27 Feb 2015 15:55:43 +0000 (16:55 +0100)]
Merge branch 'master' of gitorious.org:social/mainline into social-master

Signed-off-by: Roland Haeder <roland@mxchange.org>
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 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.1.3 not 1.1.3 beta3
Mikael Nordfeldth [Fri, 27 Feb 2015 09:15:23 +0000 (10:15 +0100)]
1.1.3 not 1.1.3 beta3

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>