Merge branch 'master' into nightly

2015-07-10 16:02:55 +02:00 · 2015-07-10 16:02:55 +02:00 · 7c4e550e31
parent 9a92b58057 204f6bb503
commit 7c4e550e31
66 changed files with 0 additions and 0 deletions
--- a/avatar/.gitignore
+++ b/avatar/.gitignore
--- a/extlib/DB/DataObject.php
+++ b/extlib/DB/DataObject.php
--- a/extlib/DB/DataObject/Cast.php
+++ b/extlib/DB/DataObject/Cast.php
--- a/extlib/DB/DataObject/Error.php
+++ b/extlib/DB/DataObject/Error.php
--- a/extlib/DB/DataObject/Generator.php
+++ b/extlib/DB/DataObject/Generator.php
--- a/extlib/Mail.php
+++ b/extlib/Mail.php
--- a/extlib/Mail/RFC822.php
+++ b/extlib/Mail/RFC822.php
--- a/extlib/Mail/mail.php
+++ b/extlib/Mail/mail.php
--- a/extlib/Mail/mock.php
+++ b/extlib/Mail/mock.php
--- a/extlib/Mail/null.php
+++ b/extlib/Mail/null.php
--- a/extlib/Mail/sendmail.php
+++ b/extlib/Mail/sendmail.php
--- a/extlib/Mail/smtp.php
+++ b/extlib/Mail/smtp.php
--- a/extlib/Mail/smtpmx.php
+++ b/extlib/Mail/smtpmx.php
--- a/extlib/Net/URL2.php
+++ b/extlib/Net/URL2.php
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
--- a/plugins/AntiBrute/AntiBrutePlugin.php
+++ b/plugins/AntiBrute/AntiBrutePlugin.php
--- a/plugins/DomainStatusNetwork/scripts/installforemail.php
+++ b/plugins/DomainStatusNetwork/scripts/installforemail.php
--- a/plugins/DomainStatusNetwork/scripts/proposesite.php
+++ b/plugins/DomainStatusNetwork/scripts/proposesite.php
--- a/plugins/DomainStatusNetwork/scripts/sitefordomain.php
+++ b/plugins/DomainStatusNetwork/scripts/sitefordomain.php
--- a/plugins/EmailRegistration/scripts/cancelemailregistration.php
+++ b/plugins/EmailRegistration/scripts/cancelemailregistration.php
--- a/plugins/EmailRegistration/scripts/registeremailuser.php
+++ b/plugins/EmailRegistration/scripts/registeremailuser.php
--- a/plugins/EmailReminder/scripts/sendemailreminder.php
+++ b/plugins/EmailReminder/scripts/sendemailreminder.php
--- a/plugins/FeedPoller/scripts/pollfeed.php
+++ b/plugins/FeedPoller/scripts/pollfeed.php
--- a/plugins/Mapstraction/OpenLayers/img/cloud-popup-relative.png
+++ b/plugins/Mapstraction/OpenLayers/img/cloud-popup-relative.png
--- a/plugins/OStatus/extlib/phpseclib/Crypt/RC2.php
+++ b/plugins/OStatus/extlib/phpseclib/Crypt/RC2.php
--- a/plugins/OStatus/scripts/fixup-shadow.php
+++ b/plugins/OStatus/scripts/fixup-shadow.php
--- a/plugins/OStatus/scripts/gcfeeds.php
+++ b/plugins/OStatus/scripts/gcfeeds.php
--- a/plugins/OStatus/scripts/renew-feeds.php
+++ b/plugins/OStatus/scripts/renew-feeds.php
--- a/plugins/OStatus/scripts/resub-feed.php
+++ b/plugins/OStatus/scripts/resub-feed.php
--- a/plugins/OStatus/scripts/rm_bad_feedsubs.php
+++ b/plugins/OStatus/scripts/rm_bad_feedsubs.php
--- a/plugins/OStatus/scripts/testfeed.php
+++ b/plugins/OStatus/scripts/testfeed.php
--- a/plugins/OStatus/scripts/update-profile-data.php
+++ b/plugins/OStatus/scripts/update-profile-data.php
--- a/plugins/OStatus/scripts/update-profile.php
+++ b/plugins/OStatus/scripts/update-profile.php
--- a/plugins/OStatus/scripts/update_ostatus_profiles.php
+++ b/plugins/OStatus/scripts/update_ostatus_profiles.php
--- a/plugins/OStatus/tests/slap.php
+++ b/plugins/OStatus/tests/slap.php
--- a/plugins/Realtime/scripts/cleanupchannels.php
+++ b/plugins/Realtime/scripts/cleanupchannels.php
--- a/plugins/RequireValidatedEmail/scripts/registerbyemail.php
+++ b/plugins/RequireValidatedEmail/scripts/registerbyemail.php
--- a/plugins/Sitemap/scripts/updatecounts.php
+++ b/plugins/Sitemap/scripts/updatecounts.php
--- a/plugins/TwitterBridge/daemons/twitterdaemon.php
+++ b/plugins/TwitterBridge/daemons/twitterdaemon.php
--- a/plugins/TwitterBridge/scripts/initialize_notice_to_status.php
+++ b/plugins/TwitterBridge/scripts/initialize_notice_to_status.php
--- a/scripts/clearcache.php
+++ b/scripts/clearcache.php
--- a/scripts/createsim.php
+++ b/scripts/createsim.php
--- a/scripts/dumpschema.php
+++ b/scripts/dumpschema.php
--- a/scripts/flushrouter.php
+++ b/scripts/flushrouter.php
--- a/scripts/flushsite.php
+++ b/scripts/flushsite.php
--- a/scripts/gnusocialversion.php
+++ b/scripts/gnusocialversion.php
--- a/scripts/importtwitteratom.php
+++ b/scripts/importtwitteratom.php
--- a/scripts/make-release.php
+++ b/scripts/make-release.php
--- a/scripts/makegroupadmin.php
+++ b/scripts/makegroupadmin.php
--- a/scripts/registeruser.php
+++ b/scripts/registeruser.php
--- a/scripts/sessiongc.php
+++ b/scripts/sessiongc.php
--- a/scripts/settag.php
+++ b/scripts/settag.php
--- a/scripts/showcache.php
+++ b/scripts/showcache.php
--- a/scripts/showtable.php
+++ b/scripts/showtable.php
--- a/scripts/uncache_users.php
+++ b/scripts/uncache_users.php
--- a/scripts/updatelocation.php
+++ b/scripts/updatelocation.php
--- a/scripts/updateurls.php
+++ b/scripts/updateurls.php
--- a/scripts/upgrade.php
+++ b/scripts/upgrade.php
--- a/scripts/userrole.php
+++ b/scripts/userrole.php
--- a/tests/atompub/atompub_test.php
+++ b/tests/atompub/atompub_test.php
--- a/tests/oauth/oauth_post_notice.php
+++ b/tests/oauth/oauth_post_notice.php
--- a/theme/neo-quitter/LICENSE
+++ b/theme/neo-quitter/LICENSE
--- a/theme/neo-quitter/default-avatar-mini.png
+++ b/theme/neo-quitter/default-avatar-mini.png
--- a/theme/neo-quitter/default-avatar-profile.png
+++ b/theme/neo-quitter/default-avatar-profile.png
--- a/theme/neo-quitter/default-avatar-stream.png
+++ b/theme/neo-quitter/default-avatar-stream.png
--- a/theme/neo-quitter/favicon.ico
+++ b/theme/neo-quitter/favicon.ico