aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/globals_0x61.html
diff options
context:
space:
mode:
authorChristian Vogeley <christian.vogeley@hotmail.de>2013-12-22 14:31:27 +0100
committerChristian Vogeley <christian.vogeley@hotmail.de>2013-12-22 14:31:27 +0100
commit870df76463a1cc9823b364db0bfb387f3f46664f (patch)
treea8c7391bfe799703aa0a8f26b9ee788f1204e8be /doc/html/globals_0x61.html
parent25a533bd72c34e9775af71c010a39db6caf7b633 (diff)
parent7e7b5bfa4930493a8feae10b0550e29797956c70 (diff)
downloadvolse-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_0x61.html')
-rw-r--r--doc/html/globals_0x61.html13
1 files changed, 5 insertions, 8 deletions
diff --git a/doc/html/globals_0x61.html b/doc/html/globals_0x61.html
index 0e079c6b2..8171bd53d 100644
--- a/doc/html/globals_0x61.html
+++ b/doc/html/globals_0x61.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>
@@ -213,6 +213,9 @@ $(document).ready(function(){initNavTree('globals_0x61.html','');});
<li>ACCOUNT_ROLE_ALLOWCODE
: <a class="el" href="boot_8php.html#a84f48897059bbd4a8738d7ee4cec6688">boot.php</a>
</li>
+<li>ACCOUNT_ROLE_SYSTEM
+: <a class="el" href="boot_8php.html#a7c2eb822d50e1554bf5c32861f36342b">boot.php</a>
+</li>
<li>account_total()
: <a class="el" href="account_8php.html#a43e3042b2723d76915a030bac3c668b6">account.php</a>
</li>
@@ -312,9 +315,6 @@ $(document).ready(function(){initNavTree('globals_0x61.html','');});
<li>add_children_to_list()
: <a class="el" href="conversation_8php.html#ad3e1d4b15e7d6d026ee182edd58f692b">conversation.php</a>
</li>
-<li>add_fcontact()
-: <a class="el" href="include_2network_8php.html#a0bdc4b0bfc54797c249dc4eca25aeda4">network.php</a>
-</li>
<li>admin_content()
: <a class="el" href="admin_8php.html#afef415e4011607fbb665610441595015">admin.php</a>
</li>
@@ -358,7 +358,7 @@ $(document).ready(function(){initNavTree('globals_0x61.html','');});
: <a class="el" href="admin_8php.html#acf51f5837a7427832144c2bf7308ada3">admin.php</a>
</li>
<li>advanced_profile()
-: <a class="el" href="profile__advanced_8php.html#aa870d2c1f558cfd52bef05bc124e8fa4">profile_advanced.php</a>
+: <a class="el" href="identity_8php.html#aa870d2c1f558cfd52bef05bc124e8fa4">identity.php</a>
</li>
<li>AES256CBC_decrypt()
: <a class="el" href="crypto_8php.html#ac852ee41392d1358c3a54d54935e0bf9">crypto.php</a>
@@ -378,9 +378,6 @@ $(document).ready(function(){initNavTree('globals_0x61.html','');});
<li>all_friends()
: <a class="el" href="socgraph_8php.html#a16ac51c505d72987ed8d6d6aed0e8586">socgraph.php</a>
</li>
-<li>allfriends_content()
-: <a class="el" href="allfriends_8php.html#aad992ddbb5f20e81c5cf2259718aec83">allfriends.php</a>
-</li>
<li>allowed_email()
: <a class="el" href="include_2network_8php.html#aba38458a2ff2d92d3536488dbb119694">network.php</a>
</li>