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>
	Sun, 15 Feb 2015 20:47:26 +0000 (21:47 +0100)
committer	Roland Haeder <roland@mxchange.org>
	Sun, 15 Feb 2015 20:47:26 +0000 (21:47 +0100)
commit	26703076f66f77f337559416cc02101c532d7aa8
tree	d08a2b9c722b4d6f975cf84468e9cb776befed9c	tree \| snapshot
parent	b92ef93d36947e64da2e2078531848539d18bfea	commit \| diff
parent	61992dd9a254e94a5299f73a8d697d9e2c67cddd	commit \| diff

Merge remote-tracking branch 'upstream/master'

Conflicts:
actions/apiaccountverifycredentials.php
actions/apimediaupload.php
actions/apistatusesshow.php
actions/apitimelinepublic.php
actions/logout.php
actions/public.php
actions/register.php
lib/inboxnoticestream.php
plugins/Favorite/actions/apifavoritecreate.php
plugins/OStatus/actions/pushhub.php
plugins/OStatus/classes/Ostatus_profile.php
plugins/OStatus/scripts/update_ostatus_profiles.php
plugins/OpportunisticQM/lib/opportunisticqueuemanager.php
plugins/YammerImport/lib/yammerimporter.php
scripts/commandline.inc.php

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

49 files changed:

actions/apiaccountverifycredentials.php	diff1 \|	diff2 \|	blob \| history
actions/apimediaupload.php	diff1 \|	diff2 \|	blob \| history
actions/apistatusesshow.php	diff1 \|	diff2 \|	blob \| history
actions/apitimelinepublic.php	diff1 \|	diff2 \|	blob \| history
actions/attachment.php	diff1 \|	diff2 \|	blob \| history
actions/confirmaddress.php	diff1 \|	diff2 \|	blob \| history
actions/editpeopletag.php	diff1 \|	diff2 \|	blob \| history
actions/logout.php	diff1 \|	diff2 \|	blob \| history
actions/public.php	diff1 \|	diff2 \|	blob \| history
actions/recoverpassword.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/showprofiletag.php	diff1 \|	diff2 \|	blob \| history
actions/tag.php	diff1 \|	diff2 \|	blob \| history
classes/Notice.php	diff1 \|	diff2 \|	blob \| history
classes/User_group.php	diff1 \|	diff2 \|	blob \| history
extlib/DB/DataObject.php	diff1 \|	diff2 \|	blob \| history
extlib/DB/DataObject/Cast.php	diff1 \|	diff2 \|	blob \| history
extlib/DB/DataObject/Generator.php	diff1 \|	diff2 \|	blob \| history
extlib/DB/DataObject/createTables.php	diff1 \|	diff2 \|	blob \| history
lib/action.php	diff1 \|	diff2 \|	blob \| history
lib/attachmentlistitem.php	diff1 \|	diff2 \|	blob \| history
lib/default.php	diff1 \|	diff2 \|	blob \| history
lib/framework.php	diff1 \|	diff2 \|	blob \| history
lib/imagefile.php	diff1 \|	diff2 \|	blob \| history
lib/router.php	diff1 \|	diff2 \|	blob \| history
lib/util.php	diff1 \|	diff2 \|	blob \| history
plugins/AnonymousFave/actions/anonfavor.php	diff1 \|	diff2 \|	blob \| history
plugins/Bookmark/BookmarkPlugin.php	diff1 \|	diff2 \|	blob \| history
plugins/Favorite/actions/apifavoritecreate.php	diff1 \|	diff2 \|	blob \| history
plugins/Favorite/actions/atompubshowfavorite.php	diff1 \|	diff2 \|	blob \| history
plugins/Favorite/actions/showfavorites.php	diff1 \|	diff2 \|	blob \| history
plugins/Mapstraction/actions/map.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/magicenvelope.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/scripts/gcfeeds.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/scripts/testfeed.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/scripts/update_ostatus_profiles.php	diff1 \|	diff2 \|	blob \| history
plugins/Oembed/actions/oembed.php	diff1 \|	diff2 \|	blob \| history
plugins/QnA/classes/QnA_Answer.php	diff1 \|	diff2 \|	blob \| history
plugins/TwitterBridge/daemons/synctwitterfriends.php	diff1 \|	diff2 \|	blob \| history
plugins/TwitterBridge/daemons/twitterstatusfetcher.php	diff1 \|	diff2 \|	blob \| history
plugins/YammerImport/lib/yammerimporter.php	diff1 \|	diff2 \|	blob \| history
scripts/clear_jabber.php	diff1 \|	diff2 \|	blob \| history
scripts/commandline.inc.php	diff1 \|	\|	blob \| history
scripts/registeruser.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/apiaccountverifycredentials.php	diff1 \|	diff2 \|	blob \| history
actions/apimediaupload.php	diff1 \|	diff2 \|	blob \| history
actions/apistatusesshow.php	diff1 \|	diff2 \|	blob \| history
actions/apitimelinepublic.php	diff1 \|	diff2 \|	blob \| history
actions/attachment.php	diff1 \|	diff2 \|	blob \| history
actions/confirmaddress.php	diff1 \|	diff2 \|	blob \| history
actions/editpeopletag.php	diff1 \|	diff2 \|	blob \| history
actions/logout.php	diff1 \|	diff2 \|	blob \| history
actions/public.php	diff1 \|	diff2 \|	blob \| history
actions/recoverpassword.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/showprofiletag.php	diff1 \|	diff2 \|	blob \| history
actions/tag.php	diff1 \|	diff2 \|	blob \| history
classes/Notice.php	diff1 \|	diff2 \|	blob \| history
classes/User_group.php	diff1 \|	diff2 \|	blob \| history
extlib/DB/DataObject.php	diff1 \|	diff2 \|	blob \| history
extlib/DB/DataObject/Cast.php	diff1 \|	diff2 \|	blob \| history
extlib/DB/DataObject/Generator.php	diff1 \|	diff2 \|	blob \| history
extlib/DB/DataObject/createTables.php	diff1 \|	diff2 \|	blob \| history
lib/action.php	diff1 \|	diff2 \|	blob \| history
lib/attachmentlistitem.php	diff1 \|	diff2 \|	blob \| history
lib/default.php	diff1 \|	diff2 \|	blob \| history
lib/framework.php	diff1 \|	diff2 \|	blob \| history
lib/imagefile.php	diff1 \|	diff2 \|	blob \| history
lib/router.php	diff1 \|	diff2 \|	blob \| history
lib/util.php	diff1 \|	diff2 \|	blob \| history
plugins/AnonymousFave/actions/anonfavor.php	diff1 \|	diff2 \|	blob \| history
plugins/Bookmark/BookmarkPlugin.php	diff1 \|	diff2 \|	blob \| history
plugins/Favorite/actions/apifavoritecreate.php	diff1 \|	diff2 \|	blob \| history
plugins/Favorite/actions/atompubshowfavorite.php	diff1 \|	diff2 \|	blob \| history
plugins/Favorite/actions/showfavorites.php	diff1 \|	diff2 \|	blob \| history
plugins/Mapstraction/actions/map.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/magicenvelope.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/scripts/gcfeeds.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/scripts/testfeed.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/scripts/update_ostatus_profiles.php	diff1 \|	diff2 \|	blob \| history
plugins/Oembed/actions/oembed.php	diff1 \|	diff2 \|	blob \| history
plugins/QnA/classes/QnA_Answer.php	diff1 \|	diff2 \|	blob \| history
plugins/TwitterBridge/daemons/synctwitterfriends.php	diff1 \|	diff2 \|	blob \| history
plugins/TwitterBridge/daemons/twitterstatusfetcher.php	diff1 \|	diff2 \|	blob \| history
plugins/YammerImport/lib/yammerimporter.php	diff1 \|	diff2 \|	blob \| history
scripts/clear_jabber.php	diff1 \|	diff2 \|	blob \| history
scripts/commandline.inc.php	diff1 \|	\|	blob \| history
scripts/registeruser.php	diff1 \|	diff2 \|	blob \| history