diff options
author | Christian Vogeley <christian.vogeley@hotmail.de> | 2013-12-22 14:31:27 +0100 |
---|---|---|
committer | Christian Vogeley <christian.vogeley@hotmail.de> | 2013-12-22 14:31:27 +0100 |
commit | 870df76463a1cc9823b364db0bfb387f3f46664f (patch) | |
tree | a8c7391bfe799703aa0a8f26b9ee788f1204e8be /doc/html/globals_func_0x73.html | |
parent | 25a533bd72c34e9775af71c010a39db6caf7b633 (diff) | |
parent | 7e7b5bfa4930493a8feae10b0550e29797956c70 (diff) | |
download | volse-hubzilla-870df76463a1cc9823b364db0bfb387f3f46664f.tar.gz volse-hubzilla-870df76463a1cc9823b364db0bfb387f3f46664f.tar.bz2 volse-hubzilla-870df76463a1cc9823b364db0bfb387f3f46664f.zip |
Merge remote-tracking branch 'upstream/master' into bootstrap
Conflicts:
view/php/theme_init.php
Diffstat (limited to 'doc/html/globals_func_0x73.html')
-rw-r--r-- | doc/html/globals_func_0x73.html | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/doc/html/globals_func_0x73.html b/doc/html/globals_func_0x73.html index ccec53426..4c27ae318 100644 --- a/doc/html/globals_func_0x73.html +++ b/doc/html/globals_func_0x73.html @@ -28,7 +28,7 @@ <table cellspacing="0" cellpadding="0"> <tbody> <tr style="height: 56px;"> - <td id="projectlogo"><img alt="Logo" src="rhash-64.png"/></td> + <td id="projectlogo"><img alt="Logo" src="rm-64.png"/></td> <td style="padding-left: 0.5em;"> <div id="projectname">The Red Matrix </div> @@ -146,12 +146,12 @@ $(document).ready(function(){initNavTree('globals_func_0x73.html','');}); <li>sanitise_acl() : <a class="el" href="text_8php.html#a9fbeae13c9abd6e27cb4d8d1817f969c">text.php</a> </li> -<li>saved_searches() -: <a class="el" href="mod_2network_8php.html#a36e03af6f2efe62ecaa247509365bfad">network.php</a> -</li> <li>scale_external_images() : <a class="el" href="include_2network_8php.html#ae8d9c41a11000fb8667039fc71b4f73f">network.php</a> </li> +<li>script_path() +: <a class="el" href="plugin_8php.html#a0e8c2ea50bfdbc39e17ccccaea21ddc3">plugin.php</a> +</li> <li>search() : <a class="el" href="text_8php.html#a876e94892867019935b348b573299352">text.php</a> </li> @@ -170,6 +170,9 @@ $(document).ready(function(){initNavTree('globals_func_0x73.html','');}); <li>search_saved_searches() : <a class="el" href="search_8php.html#aa911f7c7f0cdb0284e35d0ed610f19c6">search.php</a> </li> +<li>searchbox() +: <a class="el" href="text_8php.html#aae91e4d2a2c6f7a9daccd2c186ae3447">text.php</a> +</li> <li>select_timezone() : <a class="el" href="datetime_8php.html#a633dadba426fa2f60b25fabdb19ebc1f">datetime.php</a> </li> @@ -203,9 +206,6 @@ $(document).ready(function(){initNavTree('globals_func_0x73.html','');}); <li>set_xconfig() : <a class="el" href="include_2config_8php.html#afe117b70f1bba2f6348d9300b601f86e">config.php</a> </li> -<li>settings_aside() -: <a class="el" href="settings_8php.html#ae5aebccb006bee1300078576baaf5582">settings.php</a> -</li> <li>settings_init() : <a class="el" href="settings_8php.html#a3a4cde287482fced008583f54ba2a722">settings.php</a> </li> @@ -305,9 +305,6 @@ $(document).ready(function(){initNavTree('globals_func_0x73.html','');}); <li>subthread_content() : <a class="el" href="subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3">subthread.php</a> </li> -<li>suggest_aside() -: <a class="el" href="suggest_8php.html#a4df91c84594d51ba56b5918de414230d">suggest.php</a> -</li> <li>suggest_content() : <a class="el" href="suggest_8php.html#a58748a8235d4523f8333847f3e42dd91">suggest.php</a> </li> |