Merge remote-tracking branch 'upstream/master'

boot.php

@@ -497,6 +497,11 @@ define ( 'ACTIVITY_POST',        NAMESPACE_ACTIVITY_SCHEMA . 'post' );
 define ( 'ACTIVITY_UPDATE',      NAMESPACE_ACTIVITY_SCHEMA . 'update' );
 define ( 'ACTIVITY_TAG',         NAMESPACE_ACTIVITY_SCHEMA . 'tag' );
 define ( 'ACTIVITY_FAVORITE',    NAMESPACE_ACTIVITY_SCHEMA . 'favorite' );
+define ( 'ACTIVITY_CREATE',      NAMESPACE_ACTIVITY_SCHEMA . 'create' );
+define ( 'ACTIVITY_WIN',         NAMESPACE_ACTIVITY_SCHEMA . 'win' );
+define ( 'ACTIVITY_LOSE',        NAMESPACE_ACTIVITY_SCHEMA . 'lose' );
+define ( 'ACTIVITY_TIE',         NAMESPACE_ACTIVITY_SCHEMA . 'tie' );
+define ( 'ACTIVITY_COMPLETE',    NAMESPACE_ACTIVITY_SCHEMA . 'complete' );
 
 define ( 'ACTIVITY_POKE',        NAMESPACE_ZOT . '/activity/poke' );
 define ( 'ACTIVITY_MOOD',        NAMESPACE_ZOT . '/activity/mood' );
@@ -509,6 +514,7 @@ define ( 'ACTIVITY_OBJ_P_PHOTO', NAMESPACE_ACTIVITY_SCHEMA . 'profile-photo' );
 define ( 'ACTIVITY_OBJ_ALBUM',   NAMESPACE_ACTIVITY_SCHEMA . 'photo-album' );
 define ( 'ACTIVITY_OBJ_EVENT',   NAMESPACE_ACTIVITY_SCHEMA . 'event' );
 define ( 'ACTIVITY_OBJ_GROUP',   NAMESPACE_ACTIVITY_SCHEMA . 'group' );
+define ( 'ACTIVITY_OBJ_GAME',    NAMESPACE_ACTIVITY_SCHEMA . 'game' );
 define ( 'ACTIVITY_OBJ_TAGTERM', NAMESPACE_ZOT  . '/activity/tagterm' );
 define ( 'ACTIVITY_OBJ_PROFILE', NAMESPACE_ZOT  . '/activity/profile' );
 define ( 'ACTIVITY_OBJ_THING',   NAMESPACE_ZOT  . '/activity/thing' );

doc/addons.bb

@@ -15,7 +15,6 @@
 [*] dirstats - show some interesting statistics generated by the driectory server
 [*] donate - provides a project donation page
 [*] dwpost - crosspost to Dreamwidth
-[*] embedly - use the embedly (formerly ooehmbed) service to embed media from many providers
 [*] extcron - use an external cron service to run your hub's scheduled tasks
 [*] flattrwidget - provides a "Flattr Us" button
 [*] flip - create upside down text
@@ -38,6 +37,7 @@
 [*] moremoods - Additional mood options
 [*] morepokes - additional poke options (not safe for work)
 [*] msgfooter - provide legal or other text on each outgoing post
+[*] noembed - use noembed.com as an addition to Hubzilla's native oembed functionality (currently broken)
 [*] nofed - prevent "federation" of channel posts, maintains all interaction on your site
 [*] nsabait - add random terrorism related hashtags to your posts
 [*] nsfw - Highly recommended plugin to collpase posts with inappropriate content

install/INSTALL.txt

@@ -62,6 +62,14 @@ When communicating with new sites, Hubzilla always attempts connection on the
 SSL port first, before falling back to a less secure connection.  If you do not
 use SSL, your webserver MUST NOT listen on port 443 at all.
 
+If you use LetsEncrypt to provide certificates and create a file under 
+.well-known/acme-challenge so that LetsEncrypt can verify your domain ownership, 
+please remove or rename the .well-known directory as soon as the certificate is 
+generated. Hubzilla will provide its own handler for ".well-known" services when
+it is installed, and an existing directory in this location may prevent some of 
+these services from working correctly. 
+
+
 1. Requirements
     - Apache with mod-rewrite enabled and "AllowOverride All" so you can use a 
     local .htaccess file. Some folks have successfully used nginx and lighttpd.

library/blueimp_upload/server/node/server.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/nodejs
 /*
  * jQuery File Upload Plugin Node.js Example 2.1.2
  * https://github.com/blueimp/jQuery-File-Upload

library/jqupload/server/node/server.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/nodejs
 /*
  * jQuery File Upload Plugin Node.js Example 2.1.1
  * https://github.com/blueimp/jQuery-File-Upload

mod/_well_known.php

@@ -33,6 +33,19 @@ function _well_known_init(&$a){
 				break;
 
 			default:
+				// look in $WEBROOT/well_known for the requested file in case it is 
+				// something a site requires and for which we do not have a module
+
+				// @fixme - we may need to determine the content-type and stick it in the header
+				// for now this can be done with a php script masquerading as the requested file
+
+				$wk_file = str_replace('.well-known','well_known',$a->cmd);
+				if(file_exists($wk_file)) {
+					echo file_get_contents($wk_file); 
+					killme();
+				}
+				elseif(file_exists($wk_file . '.php'))
+					require_once($wk_file . '.php');
 				break;
 
 		}

mod/hostxrd.php

@@ -12,6 +12,7 @@ function hostxrd_init(&$a) {
 	));
 	$arr = array('xrd' => $x);
 	call_hooks('hostxrd',$arr);
+
 	echo $arr['xrd'];
 	killme();
 }

version.inc

@@ -1 +1 @@
-2016-01-21.1285H
+2016-01-22.1286H