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_0x68.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_0x68.html')
-rw-r--r-- | doc/html/globals_func_0x68.html | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/doc/html/globals_func_0x68.html b/doc/html/globals_func_0x68.html index 9bb63890e..ca8cf634e 100644 --- a/doc/html/globals_func_0x68.html +++ b/doc/html/globals_func_0x68.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> @@ -149,12 +149,6 @@ $(document).ready(function(){initNavTree('globals_func_0x68.html','');}); <li>has_permissions() : <a class="el" href="items_8php.html#a77051724d1784074ff187e73a4db93fe">items.php</a> </li> -<li>hcard_aside() -: <a class="el" href="hcard_8php.html#a956c7cae2009652a37900306e5b7b73d">hcard.php</a> -</li> -<li>hcard_init() -: <a class="el" href="hcard_8php.html#ac34f26b0e6a37eef44fa49bea135136d">hcard.php</a> -</li> <li>head_add_css() : <a class="el" href="plugin_8php.html#a23c4fccf1eb5fcd63b24783ba1f05f7a">plugin.php</a> </li> @@ -170,12 +164,24 @@ $(document).ready(function(){initNavTree('globals_func_0x68.html','');}); <li>head_get_js() : <a class="el" href="plugin_8php.html#a65ab52cb1a7030d5190e247211bef2a1">plugin.php</a> </li> +<li>head_remove_css() +: <a class="el" href="plugin_8php.html#a9ab6caae31935f6cf781ce7872db7cdf">plugin.php</a> +</li> +<li>head_remove_js() +: <a class="el" href="plugin_8php.html#a4a0ae7b881e7c8af99a69e3b03f898b4">plugin.php</a> +</li> <li>head_set_icon() : <a class="el" href="boot_8php.html#a0e4701c9742c3ef88f02ac450a042a84">boot.php</a> </li> <li>help_content() : <a class="el" href="help_8php.html#af055e15f600ffa6fbca9386fdf715224">help.php</a> </li> +<li>home_content() +: <a class="el" href="home_8php.html#aa1cf697851a646755baf537f75334c46">home.php</a> +</li> +<li>home_init() +: <a class="el" href="home_8php.html#ac4642c38b6f23a8d065dd4a75c620bde">home.php</a> +</li> <li>hostxrd_init() : <a class="el" href="hostxrd_8php.html#aa37ffc8e7900bc76c4828bd25916db92">hostxrd.php</a> </li> |