Merge pull request #1 from friendica/master

test pull request

1 files changed, 149 insertions, 8 deletions

diff --git a/doc/html/globals_0x64.html b/doc/html/globals_0x64.html
index af464b9b2..77a5ed11d 100644
--- a/doc/html/globals_0x64.html
+++ b/doc/html/globals_0x64.html
@@ -145,22 +145,37 @@ $(document).ready(function(){initNavTree('globals_0x64.html','');});
 
 <h3><a class="anchor" id="index_d"></a>- d -</h3><ul>
 <li>datesel()
-: <a class="el" href="datetime_8php.html#ac265b86f384ee094ed5479aae02aa5c8">datetime.php</a>
-</li>
-<li>datesel_format()
-: <a class="el" href="datetime_8php.html#a5f29553799005b1fd4e9ce9d98ce05aa">datetime.php</a>
+: <a class="el" href="datetime_8php.html#a77bb385ae8a9e7ca663309c102c0d766">datetime.php</a>
 </li>
 <li>datetime_convert()
 : <a class="el" href="datetime_8php.html#ad6301e74b0f9267d52f8d432b5beb226">datetime.php</a>
 </li>
+<li>datetimesel()
+: <a class="el" href="datetime_8php.html#a72218e5ee21876484934bacbb6bd9ba3">datetime.php</a>
+</li>
 <li>day_translate()
 : <a class="el" href="text_8php.html#a63fb21c0bed2fc72eef2c1471ac42b63">text.php</a>
 </li>
+<li>db_concat()
+: <a class="el" href="dba__driver_8php.html#a7c1b98a710ead27382c958ad3216c4ee">dba_driver.php</a>
+</li>
+<li>db_getfunc()
+: <a class="el" href="dba__driver_8php.html#a2994daa03b1c23229a27e39bcab75e67">dba_driver.php</a>
+</li>
+<li>db_optimizetable()
+: <a class="el" href="dba__driver_8php.html#a75098bf1d59ea57f7ebae657a369137e">dba_driver.php</a>
+</li>
+<li>db_quoteinterval()
+: <a class="el" href="dba__driver_8php.html#acec84a8fb75d78daf657cbe5df74e25a">dba_driver.php</a>
+</li>
 <li>DB_UPDATE_VERSION
 : <a class="el" href="boot_8php.html#ac59a18a4838710d6c2de37aed6b21f03">boot.php</a>
 </li>
+<li>db_utcnow()
+: <a class="el" href="dba__driver_8php.html#a30e9a643be804e905f5614a3279d2645">dba_driver.php</a>
+</li>
 <li>dba_factory()
-: <a class="el" href="dba__driver_8php.html#ac10e60f6e5b95bcf67bd82cb88f37947">dba_driver.php</a>
+: <a class="el" href="dba__driver_8php.html#a5df8499634c47b30191f34069d7b98c0">dba_driver.php</a>
 </li>
 <li>dba_timer()
 : <a class="el" href="boot_8php.html#a3e0930933fb2c0bf8211cc7ab4e1c3b4">boot.php</a>
@@ -174,12 +189,30 @@ $(document).ready(function(){initNavTree('globals_0x64.html','');});
 <li>dbesc_array_cb()
 : <a class="el" href="dba__driver_8php.html#af531546fac5f0836a8557a4f6dfee930">dba_driver.php</a>
 </li>
+<li>dbesc_identifier()
+: <a class="el" href="dba__driver_8php.html#aa051799567690a124a3b865bf902f58a">dba_driver.php</a>
+</li>
+<li>dbescbin()
+: <a class="el" href="dba__driver_8php.html#a2a38996670c2936b5769270c49c57593">dba_driver.php</a>
+</li>
+<li>dbescdate()
+: <a class="el" href="dba__driver_8php.html#a2c8a72ec73f39b17a167c90737693f78">dba_driver.php</a>
+</li>
 <li>dbg()
 : <a class="el" href="dba__driver_8php.html#aa6607893d8f60ade9122bcfbd1a53ffb">dba_driver.php</a>
 </li>
 <li>dbq()
 : <a class="el" href="dba__driver_8php.html#aa377074e70981e8c4e82ca0accd068ee">dba_driver.php</a>
 </li>
+<li>DBTYPE_MYSQL
+: <a class="el" href="boot_8php.html#a8c9a11c47394244cbe18cd75b9726d5f">boot.php</a>
+</li>
+<li>DBTYPE_POSTGRES
+: <a class="el" href="boot_8php.html#a37ddabc112db443b4c67fbc0f708817e">boot.php</a>
+</li>
+<li>dbunescbin()
+: <a class="el" href="dba__driver_8php.html#afaaa1a7eff9c1b65b3b8c464ae37640e">dba_driver.php</a>
+</li>
 <li>decode_tags()
 : <a class="el" href="items_8php.html#a56b2a4abcadfac71175cd50555528cc3">items.php</a>
 </li>
@@ -210,6 +243,12 @@ $(document).ready(function(){initNavTree('globals_0x64.html','');});
 <li>deliver_run()
 : <a class="el" href="deliver_8php.html#a397afcb9afecf0c1816b0951189dd346">deliver.php</a>
 </li>
+<li>DerToPem()
+: <a class="el" href="crypto_8php.html#a630e1574554f34e7c38511585d9e71a2">crypto.php</a>
+</li>
+<li>DerToRsa()
+: <a class="el" href="crypto_8php.html#ae5af17db1cb5d7c91d486e1264079839">crypto.php</a>
+</li>
 <li>design_tools()
 : <a class="el" href="text_8php.html#a87a3cefc603302c78982f1d8e1245265">text.php</a>
 </li>
@@ -219,12 +258,111 @@ $(document).ready(function(){initNavTree('globals_0x64.html','');});
 <li>diaspora2bb()
 : <a class="el" href="bb2diaspora_8php.html#ac9061ee10fcfcdac69566b649614e625">bb2diaspora.php</a>
 </li>
+<li>diaspora_asphoto()
+: <a class="el" href="diaspora_8php.html#a006731620a5242d410358b32678e48e3">diaspora.php</a>
+</li>
+<li>diaspora_comment()
+: <a class="el" href="diaspora_8php.html#a0fb2abe304aae19efc040a5e6b917829">diaspora.php</a>
+</li>
+<li>diaspora_conversation()
+: <a class="el" href="diaspora_8php.html#adef30b6fac948baedcc7194d5d155b5f">diaspora.php</a>
+</li>
+<li>diaspora_decode()
+: <a class="el" href="diaspora_8php.html#a849754ec369e1a60fadae5c14584ca36">diaspora.php</a>
+</li>
+<li>diaspora_dispatch()
+: <a class="el" href="diaspora_8php.html#a6f0a67b6b17503c125af32763be931b7">diaspora.php</a>
+</li>
+<li>diaspora_dispatch_public()
+: <a class="el" href="diaspora_8php.html#ab99505944728d46585b8312989de533d">diaspora.php</a>
+</li>
+<li>diaspora_get_contact_by_handle()
+: <a class="el" href="diaspora_8php.html#aa8e551a53fcce34be3942d0c3e20d1f4">diaspora.php</a>
+</li>
+<li>diaspora_handle_from_contact()
+: <a class="el" href="diaspora_8php.html#a5ed66b910d7b0284f9b3ee04e72306ff">diaspora.php</a>
+</li>
+<li>diaspora_is_blacklisted()
+: <a class="el" href="diaspora_8php.html#a858f70153c384f8778082cf7843a19da">diaspora.php</a>
+</li>
+<li>diaspora_is_reshare()
+: <a class="el" href="diaspora_8php.html#ad9985cc4214bdfc14878785c838c8690">diaspora.php</a>
+</li>
+<li>diaspora_like()
+: <a class="el" href="diaspora_8php.html#a5d57518545baa31cf8a85a937a267681">diaspora.php</a>
+</li>
+<li>diaspora_mention_callback()
+: <a class="el" href="bb2diaspora_8php.html#a4a27604f0745f1efda672966aaca9a3b">bb2diaspora.php</a>
+</li>
+<li>diaspora_message()
+: <a class="el" href="diaspora_8php.html#a7cff2f8f11044c1b3a360f20e1bbee46">diaspora.php</a>
+</li>
+<li>diaspora_msg_build()
+: <a class="el" href="diaspora_8php.html#a4901762cba5cd8dcdc57bdf285eefb1b">diaspora.php</a>
+</li>
 <li>diaspora_ol()
 : <a class="el" href="bb2diaspora_8php.html#a8b96bd45884fa1c40b942939354197d4">bb2diaspora.php</a>
 </li>
+<li>diaspora_photo()
+: <a class="el" href="diaspora_8php.html#a71fe9bb66626b4197ae018a230778bb2">diaspora.php</a>
+</li>
+<li>diaspora_post()
+: <a class="el" href="diaspora_8php.html#a20b968d64ef26afe5cb0cc75a7570a31">diaspora.php</a>
+</li>
+<li>diaspora_process_outbound()
+: <a class="el" href="diaspora_8php.html#a131abd521b218d6ae6f7d2917d8b2605">diaspora.php</a>
+</li>
+<li>diaspora_profile()
+: <a class="el" href="diaspora_8php.html#a900abf51398b2ef26cd2cd31c52f1b0f">diaspora.php</a>
+</li>
+<li>diaspora_pubmsg_build()
+: <a class="el" href="diaspora_8php.html#a586d5a3ba92d35cee14f879f290072aa">diaspora.php</a>
+</li>
+<li>diaspora_request()
+: <a class="el" href="diaspora_8php.html#ac1ab782a34552a7c6b4dc961754ed598">diaspora.php</a>
+</li>
+<li>diaspora_reshare()
+: <a class="el" href="diaspora_8php.html#a2bf43f6b5890897f425ef4325d34b007">diaspora.php</a>
+</li>
+<li>diaspora_retraction()
+: <a class="el" href="diaspora_8php.html#a938c7ee808d38725c0988fa6006805b9">diaspora.php</a>
+</li>
+<li>diaspora_send_followup()
+: <a class="el" href="diaspora_8php.html#af4698b165766f83d89ec1ea964bc92cc">diaspora.php</a>
+</li>
+<li>diaspora_send_images()
+: <a class="el" href="diaspora_8php.html#ae6f52efd81fe515cd9912bc8293abf5b">diaspora.php</a>
+</li>
+<li>diaspora_send_mail()
+: <a class="el" href="diaspora_8php.html#aeb2bb78f620dbf51d9335e6eb7444f2c">diaspora.php</a>
+</li>
+<li>diaspora_send_relay()
+: <a class="el" href="diaspora_8php.html#a0b3628a5e53332c3d3196b689fe2b94d">diaspora.php</a>
+</li>
+<li>diaspora_send_retraction()
+: <a class="el" href="diaspora_8php.html#a1704748aa2384c73e43f10e71defd31a">diaspora.php</a>
+</li>
+<li>diaspora_send_status()
+: <a class="el" href="diaspora_8php.html#a33ae0c4606a7df4d801c05507d87f668">diaspora.php</a>
+</li>
+<li>diaspora_share()
+: <a class="el" href="diaspora_8php.html#a69f250b078a46e405647428ec3399a16">diaspora.php</a>
+</li>
+<li>diaspora_signed_retraction()
+: <a class="el" href="diaspora_8php.html#aa34d2748bb97e9e193cacd572f335055">diaspora.php</a>
+</li>
+<li>diaspora_transmit()
+: <a class="el" href="diaspora_8php.html#aa704d6aa2ac77be345c0f501168e6e56">diaspora.php</a>
+</li>
 <li>diaspora_ul()
 : <a class="el" href="bb2diaspora_8php.html#adc92ccda5f85ed27e64fcc17712c89cc">bb2diaspora.php</a>
 </li>
+<li>diaspora_unshare()
+: <a class="el" href="diaspora_8php.html#ab736d6f32b5de31c97cb579fc730e200">diaspora.php</a>
+</li>
+<li>dir_flag_build()
+: <a class="el" href="dirsearch_8php.html#ab6d5fefa98da249a994b910434a669c2">dirsearch.php</a>
+</li>
 <li>dir_parse_query()
 : <a class="el" href="dirsearch_8php.html#a7d4cd9890d5ed23c3efc58e2a778a305">dirsearch.php</a>
 </li>
@@ -270,15 +408,18 @@ $(document).ready(function(){initNavTree('globals_0x64.html','');});
 <li>directory_run()
 : <a class="el" href="include_2directory_8php.html#aa75d3b0697ca1456aaabdb37a74aa0f0">directory.php</a>
 </li>
-<li>dirprofile_init()
-: <a class="el" href="dirprofile_8php.html#a3e1d30d3d93863ff5615f2df4ac7f052">dirprofile.php</a>
-</li>
 <li>dirsearch_content()
 : <a class="el" href="dirsearch_8php.html#aa1fb04e1de4f25b63349ac78f94ceb4c">dirsearch.php</a>
 </li>
 <li>dirsearch_init()
 : <a class="el" href="dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752">dirsearch.php</a>
 </li>
+<li>discover_by_url()
+: <a class="el" href="include_2network_8php.html#a5176176ddc1906d91f186df6fbd87b48">network.php</a>
+</li>
+<li>discover_by_webbie()
+: <a class="el" href="include_2network_8php.html#a63e62946e194928eb17c5a9f2bbef0fe">network.php</a>
+</li>
 <li>display_content()
 : <a class="el" href="display_8php.html#a37137c98d47bf3306f4c2bb9f5b60de0">display.php</a>
 </li>