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, 16 Aug 2015 20:46:34 +0000 (22:46 +0200)
committer	Roland Haeder <roland@mxchange.org>
	Sun, 16 Aug 2015 20:46:34 +0000 (22:46 +0200)
commit	4694d068f965ec733edcfe5c9afe8244ae01f00a
tree	9b37913d7193a9b16938a2b59362e3e522fb89b0	tree \| snapshot
parent	ffcdd14940e0a10a40b292378ccabf51d4a04cff	commit \| diff
parent	c1e6e4e65b8f1919621bd1b45fa77ed132a378c7	commit \| diff

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

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

43 files changed:

actions/apitimelinetag.php	diff1 \|	diff2 \|	blob \| history
plugins/DomainStatusNetwork/scripts/installforemail.php	diff1 \|	diff2 \|	blob \| history
plugins/DomainStatusNetwork/scripts/proposesite.php	diff1 \|	diff2 \|	blob \| history
plugins/DomainStatusNetwork/scripts/sitefordomain.php	diff1 \|	diff2 \|	blob \| history
plugins/EmailRegistration/scripts/cancelemailregistration.php	diff1 \|	diff2 \|	blob \| history
plugins/EmailRegistration/scripts/registeremailuser.php	diff1 \|	diff2 \|	blob \| history
plugins/EmailReminder/scripts/sendemailreminder.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/scripts/fixup-shadow.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/scripts/gcfeeds.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/scripts/renew-feeds.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/scripts/resub-feed.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/scripts/rm_bad_feedsubs.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/scripts/testfeed.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/scripts/update-profile-data.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/scripts/update-profile.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/scripts/update_ostatus_profiles.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/tests/slap.php	diff1 \|	diff2 \|	blob \| history
plugins/Realtime/scripts/cleanupchannels.php	diff1 \|	diff2 \|	blob \| history
plugins/RequireValidatedEmail/scripts/registerbyemail.php	diff1 \|	diff2 \|	blob \| history
plugins/Sitemap/scripts/updatecounts.php	diff1 \|	diff2 \|	blob \| history
plugins/TwitterBridge/daemons/twitterdaemon.php	diff1 \|	diff2 \|	blob \| history
plugins/TwitterBridge/scripts/initialize_notice_to_status.php	diff1 \|	diff2 \|	blob \| history
scripts/clearcache.php	diff1 \|	diff2 \|	blob \| history
scripts/createsim.php	diff1 \|	diff2 \|	blob \| history
scripts/dumpschema.php	diff1 \|	diff2 \|	blob \| history
scripts/flushrouter.php	diff1 \|	diff2 \|	blob \| history
scripts/flushsite.php	diff1 \|	diff2 \|	blob \| history
scripts/gnusocialversion.php	diff1 \|	diff2 \|	blob \| history
scripts/importtwitteratom.php	diff1 \|	diff2 \|	blob \| history
scripts/make-release.php	diff1 \|	diff2 \|	blob \| history
scripts/makegroupadmin.php	diff1 \|	diff2 \|	blob \| history
scripts/registeruser.php	diff1 \|	diff2 \|	blob \| history
scripts/sessiongc.php	diff1 \|	diff2 \|	blob \| history
scripts/settag.php	diff1 \|	diff2 \|	blob \| history
scripts/showcache.php	diff1 \|	diff2 \|	blob \| history
scripts/showtable.php	diff1 \|	diff2 \|	blob \| history
scripts/uncache_users.php	diff1 \|	diff2 \|	blob \| history
scripts/updatelocation.php	diff1 \|	diff2 \|	blob \| history
scripts/updateurls.php	diff1 \|	diff2 \|	blob \| history
scripts/upgrade.php	diff1 \|	diff2 \|	blob \| history
scripts/userrole.php	diff1 \|	diff2 \|	blob \| history
tests/atompub/atompub_test.php	diff1 \|	diff2 \|	blob \| history
tests/oauth/oauth_post_notice.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/apitimelinetag.php	diff1 \|	diff2 \|	blob \| history
plugins/DomainStatusNetwork/scripts/installforemail.php	diff1 \|	diff2 \|	blob \| history
plugins/DomainStatusNetwork/scripts/proposesite.php	diff1 \|	diff2 \|	blob \| history
plugins/DomainStatusNetwork/scripts/sitefordomain.php	diff1 \|	diff2 \|	blob \| history
plugins/EmailRegistration/scripts/cancelemailregistration.php	diff1 \|	diff2 \|	blob \| history
plugins/EmailRegistration/scripts/registeremailuser.php	diff1 \|	diff2 \|	blob \| history
plugins/EmailReminder/scripts/sendemailreminder.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/scripts/fixup-shadow.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/scripts/gcfeeds.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/scripts/renew-feeds.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/scripts/resub-feed.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/scripts/rm_bad_feedsubs.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/scripts/testfeed.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/scripts/update-profile-data.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/scripts/update-profile.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/scripts/update_ostatus_profiles.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/tests/slap.php	diff1 \|	diff2 \|	blob \| history
plugins/Realtime/scripts/cleanupchannels.php	diff1 \|	diff2 \|	blob \| history
plugins/RequireValidatedEmail/scripts/registerbyemail.php	diff1 \|	diff2 \|	blob \| history
plugins/Sitemap/scripts/updatecounts.php	diff1 \|	diff2 \|	blob \| history
plugins/TwitterBridge/daemons/twitterdaemon.php	diff1 \|	diff2 \|	blob \| history
plugins/TwitterBridge/scripts/initialize_notice_to_status.php	diff1 \|	diff2 \|	blob \| history
scripts/clearcache.php	diff1 \|	diff2 \|	blob \| history
scripts/createsim.php	diff1 \|	diff2 \|	blob \| history
scripts/dumpschema.php	diff1 \|	diff2 \|	blob \| history
scripts/flushrouter.php	diff1 \|	diff2 \|	blob \| history
scripts/flushsite.php	diff1 \|	diff2 \|	blob \| history
scripts/gnusocialversion.php	diff1 \|	diff2 \|	blob \| history
scripts/importtwitteratom.php	diff1 \|	diff2 \|	blob \| history
scripts/make-release.php	diff1 \|	diff2 \|	blob \| history
scripts/makegroupadmin.php	diff1 \|	diff2 \|	blob \| history
scripts/registeruser.php	diff1 \|	diff2 \|	blob \| history
scripts/sessiongc.php	diff1 \|	diff2 \|	blob \| history
scripts/settag.php	diff1 \|	diff2 \|	blob \| history
scripts/showcache.php	diff1 \|	diff2 \|	blob \| history
scripts/showtable.php	diff1 \|	diff2 \|	blob \| history
scripts/uncache_users.php	diff1 \|	diff2 \|	blob \| history
scripts/updatelocation.php	diff1 \|	diff2 \|	blob \| history
scripts/updateurls.php	diff1 \|	diff2 \|	blob \| history
scripts/upgrade.php	diff1 \|	diff2 \|	blob \| history
scripts/userrole.php	diff1 \|	diff2 \|	blob \| history
tests/atompub/atompub_test.php	diff1 \|	diff2 \|	blob \| history
tests/oauth/oauth_post_notice.php	diff1 \|	diff2 \|	blob \| history