From: Roland Haeder Date: Sun, 16 Aug 2015 20:46:34 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/master' into social-master X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4694d068f965ec733edcfe5c9afe8244ae01f00a;p=quix0rs-gnu-social.git Merge remote-tracking branch 'upstream/master' into social-master Signed-off-by: Roland Haeder Conflicts: actions/apitimelinetag.php --- 4694d068f965ec733edcfe5c9afe8244ae01f00a diff --cc plugins/DomainStatusNetwork/scripts/installforemail.php index 1815b97759,f773094a74..1815b97759 mode 100644,100755..100755 --- a/plugins/DomainStatusNetwork/scripts/installforemail.php +++ b/plugins/DomainStatusNetwork/scripts/installforemail.php diff --cc plugins/DomainStatusNetwork/scripts/proposesite.php index 28741a5d4f,96a722fdab..28741a5d4f mode 100644,100755..100755 --- a/plugins/DomainStatusNetwork/scripts/proposesite.php +++ b/plugins/DomainStatusNetwork/scripts/proposesite.php diff --cc plugins/DomainStatusNetwork/scripts/sitefordomain.php index 2eaa600d25,59412cceba..2eaa600d25 mode 100644,100755..100755 --- a/plugins/DomainStatusNetwork/scripts/sitefordomain.php +++ b/plugins/DomainStatusNetwork/scripts/sitefordomain.php diff --cc plugins/EmailRegistration/scripts/cancelemailregistration.php index 7ae81f7ccf,d834aade60..7ae81f7ccf mode 100644,100755..100755 --- a/plugins/EmailRegistration/scripts/cancelemailregistration.php +++ b/plugins/EmailRegistration/scripts/cancelemailregistration.php diff --cc plugins/EmailRegistration/scripts/registeremailuser.php index a785a76a66,02915240d3..a785a76a66 mode 100644,100755..100755 --- a/plugins/EmailRegistration/scripts/registeremailuser.php +++ b/plugins/EmailRegistration/scripts/registeremailuser.php diff --cc plugins/EmailReminder/scripts/sendemailreminder.php index b126f9e049,5b5b26dde3..b126f9e049 mode 100644,100755..100755 --- a/plugins/EmailReminder/scripts/sendemailreminder.php +++ b/plugins/EmailReminder/scripts/sendemailreminder.php diff --cc plugins/OStatus/scripts/fixup-shadow.php index 817ef4eb16,ffaae5588d..817ef4eb16 mode 100644,100755..100755 --- a/plugins/OStatus/scripts/fixup-shadow.php +++ b/plugins/OStatus/scripts/fixup-shadow.php diff --cc plugins/OStatus/scripts/gcfeeds.php index f1db4b358f,a95cd54dbc..f1db4b358f mode 100644,100755..100755 --- a/plugins/OStatus/scripts/gcfeeds.php +++ b/plugins/OStatus/scripts/gcfeeds.php diff --cc plugins/OStatus/scripts/renew-feeds.php index 01136de417,8f8ac3ee1d..01136de417 mode 100644,100755..100755 --- a/plugins/OStatus/scripts/renew-feeds.php +++ b/plugins/OStatus/scripts/renew-feeds.php diff --cc plugins/OStatus/scripts/resub-feed.php index edf64cd5f6,3d13724f7d..edf64cd5f6 mode 100644,100755..100755 --- a/plugins/OStatus/scripts/resub-feed.php +++ b/plugins/OStatus/scripts/resub-feed.php diff --cc plugins/OStatus/scripts/rm_bad_feedsubs.php index 1957f95cb3,ce1698a60c..1957f95cb3 mode 100644,100755..100755 --- a/plugins/OStatus/scripts/rm_bad_feedsubs.php +++ b/plugins/OStatus/scripts/rm_bad_feedsubs.php diff --cc plugins/OStatus/scripts/testfeed.php index e22f22ac50,84b470c3b2..e22f22ac50 mode 100644,100755..100755 --- a/plugins/OStatus/scripts/testfeed.php +++ b/plugins/OStatus/scripts/testfeed.php diff --cc plugins/OStatus/scripts/update-profile-data.php index 772cc073e2,e024ed95a7..772cc073e2 mode 100644,100755..100755 --- a/plugins/OStatus/scripts/update-profile-data.php +++ b/plugins/OStatus/scripts/update-profile-data.php diff --cc plugins/OStatus/scripts/update-profile.php index 20073e0750,3d72674920..20073e0750 mode 100644,100755..100755 --- a/plugins/OStatus/scripts/update-profile.php +++ b/plugins/OStatus/scripts/update-profile.php diff --cc plugins/OStatus/scripts/update_ostatus_profiles.php index 707dbe61f8,2a32ae0491..707dbe61f8 mode 100644,100755..100755 --- a/plugins/OStatus/scripts/update_ostatus_profiles.php +++ b/plugins/OStatus/scripts/update_ostatus_profiles.php diff --cc plugins/OStatus/tests/slap.php index eaef76d8cd,e3f5439aed..eaef76d8cd mode 100644,100755..100755 --- a/plugins/OStatus/tests/slap.php +++ b/plugins/OStatus/tests/slap.php diff --cc plugins/Realtime/scripts/cleanupchannels.php index b6035bfac5,37883b1da6..b6035bfac5 mode 100644,100755..100755 --- a/plugins/Realtime/scripts/cleanupchannels.php +++ b/plugins/Realtime/scripts/cleanupchannels.php diff --cc plugins/RequireValidatedEmail/scripts/registerbyemail.php index 6935e00ee5,4d2000ab0f..6935e00ee5 mode 100644,100755..100755 --- a/plugins/RequireValidatedEmail/scripts/registerbyemail.php +++ b/plugins/RequireValidatedEmail/scripts/registerbyemail.php diff --cc plugins/Sitemap/scripts/updatecounts.php index 744dab8287,91bc0ac4e9..744dab8287 mode 100644,100755..100755 --- a/plugins/Sitemap/scripts/updatecounts.php +++ b/plugins/Sitemap/scripts/updatecounts.php diff --cc plugins/TwitterBridge/daemons/twitterdaemon.php index e563f53493,8b774889d1..e563f53493 mode 100644,100755..100755 --- a/plugins/TwitterBridge/daemons/twitterdaemon.php +++ b/plugins/TwitterBridge/daemons/twitterdaemon.php diff --cc plugins/TwitterBridge/scripts/initialize_notice_to_status.php index 12fb245748,f4a60c479d..12fb245748 mode 100644,100755..100755 --- a/plugins/TwitterBridge/scripts/initialize_notice_to_status.php +++ b/plugins/TwitterBridge/scripts/initialize_notice_to_status.php diff --cc scripts/clearcache.php index 5904681edd,c67d6275d8..5904681edd mode 100644,100755..100755 --- a/scripts/clearcache.php +++ b/scripts/clearcache.php diff --cc scripts/createsim.php index e5b47df6de,624043161d..e5b47df6de mode 100644,100755..100755 --- a/scripts/createsim.php +++ b/scripts/createsim.php diff --cc scripts/dumpschema.php index 05638cda4c,9c5e3cf8b3..05638cda4c mode 100644,100755..100755 --- a/scripts/dumpschema.php +++ b/scripts/dumpschema.php diff --cc scripts/flushrouter.php index a9952b4304,51178a725c..a9952b4304 mode 100644,100755..100755 --- a/scripts/flushrouter.php +++ b/scripts/flushrouter.php diff --cc scripts/flushsite.php index 3950fb7cf7,b7f385ac45..3950fb7cf7 mode 100644,100755..100755 --- a/scripts/flushsite.php +++ b/scripts/flushsite.php diff --cc scripts/gnusocialversion.php index 91c2dc7f64,dbe9c54c5b..91c2dc7f64 mode 100644,100755..100755 --- a/scripts/gnusocialversion.php +++ b/scripts/gnusocialversion.php diff --cc scripts/importtwitteratom.php index d121179f47,a29526f27e..d121179f47 mode 100644,100755..100755 --- a/scripts/importtwitteratom.php +++ b/scripts/importtwitteratom.php diff --cc scripts/make-release.php index a3d9c70eb0,157cae067d..a3d9c70eb0 mode 100644,100755..100755 --- a/scripts/make-release.php +++ b/scripts/make-release.php diff --cc scripts/makegroupadmin.php index 3d3b1d3e84,345d93c665..3d3b1d3e84 mode 100644,100755..100755 --- a/scripts/makegroupadmin.php +++ b/scripts/makegroupadmin.php diff --cc scripts/registeruser.php index b7ee9f368c,97caf645cd..b7ee9f368c mode 100644,100755..100755 --- a/scripts/registeruser.php +++ b/scripts/registeruser.php diff --cc scripts/sessiongc.php index ef452fdb06,af55ddf3f0..ef452fdb06 mode 100644,100755..100755 --- a/scripts/sessiongc.php +++ b/scripts/sessiongc.php diff --cc scripts/settag.php index 3c234f2c31,19abce43c8..3c234f2c31 mode 100644,100755..100755 --- a/scripts/settag.php +++ b/scripts/settag.php diff --cc scripts/showcache.php index b4fe7b63ce,8ef08467d6..b4fe7b63ce mode 100644,100755..100755 --- a/scripts/showcache.php +++ b/scripts/showcache.php diff --cc scripts/showtable.php index 986260e1d2,eb18a98e20..986260e1d2 mode 100644,100755..100755 --- a/scripts/showtable.php +++ b/scripts/showtable.php diff --cc scripts/uncache_users.php index 6cd2101ad7,b5955fd5aa..6cd2101ad7 mode 100644,100755..100755 --- a/scripts/uncache_users.php +++ b/scripts/uncache_users.php diff --cc scripts/updatelocation.php index c8024cb769,abf9627cc7..c8024cb769 mode 100644,100755..100755 --- a/scripts/updatelocation.php +++ b/scripts/updatelocation.php diff --cc scripts/updateurls.php index c49187c299,35b835e494..c49187c299 mode 100644,100755..100755 --- a/scripts/updateurls.php +++ b/scripts/updateurls.php diff --cc scripts/upgrade.php index 0dd70f79f6,126ef29036..0dd70f79f6 mode 100644,100755..100755 --- a/scripts/upgrade.php +++ b/scripts/upgrade.php diff --cc scripts/userrole.php index a5eddeae5f,d1061b1832..a5eddeae5f mode 100644,100755..100755 --- a/scripts/userrole.php +++ b/scripts/userrole.php diff --cc tests/atompub/atompub_test.php index 4259c0cdc7,fb675c778e..4259c0cdc7 mode 100644,100755..100755 --- a/tests/atompub/atompub_test.php +++ b/tests/atompub/atompub_test.php diff --cc tests/oauth/oauth_post_notice.php index 6742ab1580,23fc04b531..6742ab1580 mode 100644,100755..100755 --- a/tests/oauth/oauth_post_notice.php +++ b/tests/oauth/oauth_post_notice.php