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

Merge remote-tracking branch 'upstream/master' into social-master

Signed-off-by: Roland Haeder <roland@mxchange.org>
Conflicts:
actions/apifriendshipsdestroy.php
actions/apifriendshipsexists.php
actions/apifriendshipsshow.php
actions/replies.php
actions/showstream.php
classes/File.php
classes/Notice.php
lib/docfile.php
lib/framework.php
lib/noticeform.php
plugins/APC/APCPlugin.php
plugins/Adsense/AdsensePlugin.php
plugins/Aim/AimPlugin.php
plugins/Aim/lib/aimmanager.php
plugins/Blog/BlogPlugin.php
plugins/Blog/classes/Blog_entry.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/OStatus/OStatusPlugin.php
plugins/OStatus/classes/Ostatus_profile.php
plugins/Share/actions/apitimelineretweetedtome.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

author	Roland Haeder <roland@mxchange.org>
	Sun, 12 Apr 2015 14:14:02 +0000 (16:14 +0200)
committer	Roland Haeder <roland@mxchange.org>
	Sun, 12 Apr 2015 14:14:02 +0000 (16:14 +0200)
commit	200721a2f45dbfa5463ba32165c7f60e517f0622
tree	1ecfd7458c998824a34f87dd69c1cc9702bd6444	tree \| snapshot
parent	76babcb430e6fae9254541f5a26483e576dfe5f3	commit \| diff
parent	5e834e8119b73d88f968bffb0bcb6dd54a4d44f7	commit \| diff

actions/apifriendshipsexists.php	diff1 \|	diff2 \|	blob \| history
actions/apifriendshipsshow.php	diff1 \|	diff2 \|	blob \| history
actions/apitimelineuser.php	diff1 \|	diff2 \|	blob \| history
actions/doc.php	diff1 \|	diff2 \|	blob \| history
actions/invite.php	diff1 \|	diff2 \|	blob \| history
actions/register.php	diff1 \|	diff2 \|	blob \| history
actions/replies.php	diff1 \|	diff2 \|	blob \| history
actions/shownotice.php	diff1 \|	diff2 \|	blob \| history
actions/subscribe.php	diff1 \|	diff2 \|	blob \| history
classes/Avatar.php	diff1 \|	diff2 \|	blob \| history
classes/Confirm_address.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
htaccess.sample	diff1 \|	diff2 \|	blob \| history
index.php	diff1 \|	diff2 \|	blob \| history
lib/action.php	diff1 \|	diff2 \|	blob \| history
lib/activityimporter.php	diff1 \|	diff2 \|	blob \| history
lib/apiaction.php	diff1 \|	diff2 \|	blob \| history
lib/attachmentlistitem.php	diff1 \|	diff2 \|	blob \| history
lib/default.php	diff1 \|	diff2 \|	blob \| history
lib/docfile.php	diff1 \|	diff2 \|	blob \| history
lib/formaction.php	diff1 \|	diff2 \|	blob \| history
lib/framework.php	diff1 \|	diff2 \|	blob \| history
lib/imagefile.php	diff1 \|	diff2 \|	blob \| history
lib/implugin.php	diff1 \|	diff2 \|	blob \| history
lib/installer.php	diff1 \|	diff2 \|	blob \| history
lib/menu.php	diff1 \|	diff2 \|	blob \| history
lib/noticeform.php	diff1 \|	diff2 \|	blob \| history
lib/noticelistitem.php	diff1 \|	diff2 \|	blob \| history
lib/plugin.php	diff1 \|	diff2 \|	blob \| history
lib/router.php	diff1 \|	diff2 \|	blob \| history
lib/rssaction.php	diff1 \|	diff2 \|	blob \| history
lib/schemaupdater.php	diff1 \|	diff2 \|	blob \| history
lib/util.php	diff1 \|	diff2 \|	blob \| history
plugins/AnonymousFave/actions/anonfavor.php	diff1 \|	diff2 \|	blob \| history
plugins/AuthCrypt/AuthCryptPlugin.php	diff1 \|	diff2 \|	blob \| history
plugins/Autocomplete/actions/autocomplete.php	diff1 \|	diff2 \|	blob \| history
plugins/Bookmark/BookmarkPlugin.php	diff1 \|	diff2 \|	blob \| history
plugins/Bookmark/actions/newbookmark.php	diff1 \|	diff2 \|	blob \| history
plugins/Bookmark/classes/Bookmark.php	diff1 \|	diff2 \|	blob \| history
plugins/Cronish/CronishPlugin.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/DomainStatusNetwork/DomainStatusNetworkPlugin.php	diff1 \|	diff2 \|	blob \| history
plugins/DomainStatusNetwork/actions/globalapi.php	diff1 \|	diff2 \|	blob \| history
plugins/EmailRegistration/actions/emailregister.php	diff1 \|	diff2 \|	blob \| history
plugins/EmailReminder/scripts/sendemailreminder.php	diff1 \|	diff2 \|	blob \| history
plugins/EmailSummary/scripts/sendemailsummary.php	diff1 \|	diff2 \|	blob \| history
plugins/Event/actions/cancelrsvp.php	diff1 \|	diff2 \|	blob \| history
plugins/Event/actions/newrsvp.php	diff1 \|	diff2 \|	blob \| history
plugins/Event/classes/Happening.php	diff1 \|	diff2 \|	blob \| history
plugins/Event/classes/RSVP.php	diff1 \|	diff2 \|	blob \| history
plugins/FacebookBridge/actions/facebookfinishlogin.php	diff1 \|	diff2 \|	blob \| history
plugins/Favorite/actions/apifavoritecreate.php	diff1 \|	diff2 \|	blob \| history
plugins/Favorite/classes/Fave.php	diff1 \|	diff2 \|	blob \| history
plugins/GNUsocialPhoto/classes/Photo.php	diff1 \|	diff2 \|	blob \| history
plugins/GNUsocialProfileExtensions/GNUsocialProfileExtensionsPlugin.php	diff1 \|	diff2 \|	blob \| history
plugins/GNUsocialVideo/classes/Video.php	diff1 \|	diff2 \|	blob \| history
plugins/LinkPreview/actions/oembedproxy.php	diff1 \|	diff2 \|	blob \| history
plugins/Mapstraction/MapstractionPlugin.php	diff1 \|	diff2 \|	blob \| history
plugins/NoticeTitle/classes/Notice_title.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/OStatusPlugin.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/actions/oembed.php	diff1 \|	diff2 \|	blob \| history
plugins/Oembed/classes/File_oembed.php	diff1 \|	diff2 \|	blob \| history
plugins/OpenID/OpenIDPlugin.php	diff1 \|	diff2 \|	blob \| history
plugins/OpportunisticQM/OpportunisticQMPlugin.php	diff1 \|	diff2 \|	blob \| history
plugins/OpportunisticQM/lib/opportunisticqueuemanager.php	diff1 \|	diff2 \|	blob \| history
plugins/Poll/actions/newpoll.php	diff1 \|	diff2 \|	blob \| history
plugins/Poll/actions/respondpoll.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/QnAPlugin.php	diff1 \|	diff2 \|	blob \| history
plugins/QnA/actions/qnaclosequestion.php	diff1 \|	diff2 \|	blob \| history
plugins/QnA/actions/qnanewanswer.php	diff1 \|	diff2 \|	blob \| history
plugins/QnA/actions/qnanewquestion.php	diff1 \|	diff2 \|	blob \| history
plugins/QnA/actions/qnareviseanswer.php	diff1 \|	diff2 \|	blob \| history
plugins/QnA/actions/qnavote.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/Realtime/scripts/cleanupchannels.php	diff1 \|	diff2 \|	blob \| history
plugins/Recaptcha/RecaptchaPlugin.php	diff1 \|	diff2 \|	blob \| history
plugins/SearchSub/actions/searchsub.php	diff1 \|	diff2 \|	blob \| history
plugins/Share/actions/apistatusesretweets.php	\|	diff2 \|	blob \| history
plugins/Share/actions/apitimelineretweetedbyme.php	\|	diff2 \|	blob \| history
plugins/Share/actions/apitimelineretweetedtome.php	\|	diff2 \|	blob \| history
plugins/Share/actions/apitimelineretweetsofme.php	\|	diff2 \|	blob \| history
plugins/TagSub/actions/tagsub.php	diff1 \|	diff2 \|	blob \| history
plugins/TwitterBridge/actions/twitterauthorization.php	diff1 \|	diff2 \|	blob \| history
plugins/VideoThumbnails/VideoThumbnailsPlugin.php	diff1 \|	diff2 \|	blob \| history
plugins/WebFinger/WebFingerPlugin.php	diff1 \|	diff2 \|	blob \| history
plugins/WikiHowProfile/WikiHowProfilePlugin.php	diff1 \|	diff2 \|	blob \| history
scripts/commandline.inc.php	diff1 \|	\|	blob \| history
scripts/upgrade.php	diff1 \|	diff2 \|	blob \| history