git.mxchange.org Git - quix0rs-gnu-social.git/commit

]> git.mxchange.org Git - quix0rs-gnu-social.git/commit

projects / quix0rs-gnu-social.git / commit

author	Roland Haeder <roland@mxchange.org>
	Thu, 26 Feb 2015 00:01:11 +0000 (01:01 +0100)
committer	Roland Haeder <roland@mxchange.org>
	Thu, 26 Feb 2015 00:01:11 +0000 (01:01 +0100)
commit	7ec725e2edb405c2a1f8421097ee1990f55771d2
tree	9bad569d7199a631da23d030dd6ce54dd1a068ed	tree \| snapshot
parent	31ba481cb0a0a19176454a0cfd4701efce2a1adf	commit \| diff
parent	0b09e4bfcb4cd7802eca86a031e4fc1ce85c6e3d	commit \| diff

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>

46 files changed:

actions/apifriendshipsexists.php	diff1 \|	diff2 \|	blob \| history
actions/apifriendshipsshow.php	diff1 \|	diff2 \|	blob \| history
actions/apitimelineretweetedtome.php	diff1 \|	diff2 \|	blob \| history
actions/apitimelineuser.php	diff1 \|	diff2 \|	blob \| history
actions/doc.php	diff1 \|	diff2 \|	blob \| history
classes/Avatar.php	diff1 \|	diff2 \|	blob \| history
classes/Confirm_address.php	diff1 \|	diff2 \|	blob \| history
classes/File.php	diff1 \|	diff2 \|	blob \| history
classes/File_redirection.php	diff1 \|	diff2 \|	blob \| history
classes/File_thumbnail.php	diff1 \|	diff2 \|	blob \| history
classes/Memcached_DataObject.php	diff1 \|	diff2 \|	blob \| history
classes/Notice.php	diff1 \|	diff2 \|	blob \| history
classes/User_group.php	diff1 \|	diff2 \|	blob \| history
lib/activityimporter.php	diff1 \|	diff2 \|	blob \| history
lib/apiaction.php	diff1 \|	diff2 \|	blob \| history
lib/default.php	diff1 \|	diff2 \|	blob \| history
lib/imagefile.php	diff1 \|	diff2 \|	blob \| history
lib/installer.php	diff1 \|	diff2 \|	blob \| history
lib/menu.php	diff1 \|	diff2 \|	blob \| history
lib/noticelistitem.php	diff1 \|	diff2 \|	blob \| history
lib/schemaupdater.php	diff1 \|	diff2 \|	blob \| history
lib/util.php	diff1 \|	diff2 \|	blob \| history
plugins/AuthCrypt/AuthCryptPlugin.php	diff1 \|	diff2 \|	blob \| history
plugins/Blog/classes/Blog_entry.php	diff1 \|	diff2 \|	blob \| history
plugins/Bookmark/classes/Bookmark.php	diff1 \|	diff2 \|	blob \| history
plugins/DirectMessage/classes/Message.php	diff1 \|	diff2 \|	blob \| history
plugins/Directory/actions/groupdirectory.php	diff1 \|	diff2 \|	blob \| history
plugins/Directory/actions/userdirectory.php	diff1 \|	diff2 \|	blob \| history
plugins/Event/classes/Happening.php	diff1 \|	diff2 \|	blob \| history
plugins/Event/classes/RSVP.php	diff1 \|	diff2 \|	blob \| history
plugins/GNUsocialPhoto/classes/Photo.php	diff1 \|	diff2 \|	blob \| history
plugins/GNUsocialVideo/classes/Video.php	diff1 \|	diff2 \|	blob \| history
plugins/NoticeTitle/classes/Notice_title.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/classes/FeedSub.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/classes/Ostatus_profile.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/lib/salmonaction.php	diff1 \|	diff2 \|	blob \| history
plugins/Oembed/classes/File_oembed.php	diff1 \|	diff2 \|	blob \| history
plugins/OpenID/OpenIDPlugin.php	diff1 \|	diff2 \|	blob \| history
plugins/Poll/classes/Poll.php	diff1 \|	diff2 \|	blob \| history
plugins/Poll/classes/Poll_response.php	diff1 \|	diff2 \|	blob \| history
plugins/QnA/classes/QnA_Answer.php	diff1 \|	diff2 \|	blob \| history
plugins/QnA/classes/QnA_Question.php	diff1 \|	diff2 \|	blob \| history
plugins/RSSCloud/RSSCloudPlugin.php	diff1 \|	diff2 \|	blob \| history
plugins/VideoThumbnails/VideoThumbnailsPlugin.php	diff1 \|	diff2 \|	blob \| history
plugins/WebFinger/WebFingerPlugin.php	diff1 \|	diff2 \|	blob \| history
scripts/upgrade.php	diff1 \|	diff2 \|	blob \| history

This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)

RSS Atom

actions/apifriendshipsexists.php	diff1 \|	diff2 \|	blob \| history
actions/apifriendshipsshow.php	diff1 \|	diff2 \|	blob \| history
actions/apitimelineretweetedtome.php	diff1 \|	diff2 \|	blob \| history
actions/apitimelineuser.php	diff1 \|	diff2 \|	blob \| history
actions/doc.php	diff1 \|	diff2 \|	blob \| history
classes/Avatar.php	diff1 \|	diff2 \|	blob \| history
classes/Confirm_address.php	diff1 \|	diff2 \|	blob \| history
classes/File.php	diff1 \|	diff2 \|	blob \| history
classes/File_redirection.php	diff1 \|	diff2 \|	blob \| history
classes/File_thumbnail.php	diff1 \|	diff2 \|	blob \| history
classes/Memcached_DataObject.php	diff1 \|	diff2 \|	blob \| history
classes/Notice.php	diff1 \|	diff2 \|	blob \| history
classes/User_group.php	diff1 \|	diff2 \|	blob \| history
lib/activityimporter.php	diff1 \|	diff2 \|	blob \| history
lib/apiaction.php	diff1 \|	diff2 \|	blob \| history
lib/default.php	diff1 \|	diff2 \|	blob \| history
lib/imagefile.php	diff1 \|	diff2 \|	blob \| history
lib/installer.php	diff1 \|	diff2 \|	blob \| history
lib/menu.php	diff1 \|	diff2 \|	blob \| history
lib/noticelistitem.php	diff1 \|	diff2 \|	blob \| history
lib/schemaupdater.php	diff1 \|	diff2 \|	blob \| history
lib/util.php	diff1 \|	diff2 \|	blob \| history
plugins/AuthCrypt/AuthCryptPlugin.php	diff1 \|	diff2 \|	blob \| history
plugins/Blog/classes/Blog_entry.php	diff1 \|	diff2 \|	blob \| history
plugins/Bookmark/classes/Bookmark.php	diff1 \|	diff2 \|	blob \| history
plugins/DirectMessage/classes/Message.php	diff1 \|	diff2 \|	blob \| history
plugins/Directory/actions/groupdirectory.php	diff1 \|	diff2 \|	blob \| history
plugins/Directory/actions/userdirectory.php	diff1 \|	diff2 \|	blob \| history
plugins/Event/classes/Happening.php	diff1 \|	diff2 \|	blob \| history
plugins/Event/classes/RSVP.php	diff1 \|	diff2 \|	blob \| history
plugins/GNUsocialPhoto/classes/Photo.php	diff1 \|	diff2 \|	blob \| history
plugins/GNUsocialVideo/classes/Video.php	diff1 \|	diff2 \|	blob \| history
plugins/NoticeTitle/classes/Notice_title.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/classes/FeedSub.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/classes/Ostatus_profile.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/lib/salmonaction.php	diff1 \|	diff2 \|	blob \| history
plugins/Oembed/classes/File_oembed.php	diff1 \|	diff2 \|	blob \| history
plugins/OpenID/OpenIDPlugin.php	diff1 \|	diff2 \|	blob \| history
plugins/Poll/classes/Poll.php	diff1 \|	diff2 \|	blob \| history
plugins/Poll/classes/Poll_response.php	diff1 \|	diff2 \|	blob \| history
plugins/QnA/classes/QnA_Answer.php	diff1 \|	diff2 \|	blob \| history
plugins/QnA/classes/QnA_Question.php	diff1 \|	diff2 \|	blob \| history
plugins/RSSCloud/RSSCloudPlugin.php	diff1 \|	diff2 \|	blob \| history
plugins/VideoThumbnails/VideoThumbnailsPlugin.php	diff1 \|	diff2 \|	blob \| history
plugins/WebFinger/WebFingerPlugin.php	diff1 \|	diff2 \|	blob \| history
scripts/upgrade.php	diff1 \|	diff2 \|	blob \| history