diff options
| author | Habeas Codice <habeascodice@federated.social> | 2014-11-13 13:06:31 -0800 |
|---|---|---|
| committer | Habeas Codice <habeascodice@federated.social> | 2014-11-13 13:06:31 -0800 |
| commit | ac27db22c18ee7a82a52cbadb3efe2760b910499 (patch) | |
| tree | aa7002d73dbcd4136033589f1cb135184f4126c1 /doc/html/boot_8php.js | |
| parent | 1a5a5c7edb8697c93f8bababbafa80245378dd7e (diff) | |
| parent | 109cb936632c693d3f24afb9e2ce533797ad1a7f (diff) | |
| download | volse-hubzilla-ac27db22c18ee7a82a52cbadb3efe2760b910499.tar.gz volse-hubzilla-ac27db22c18ee7a82a52cbadb3efe2760b910499.tar.bz2 volse-hubzilla-ac27db22c18ee7a82a52cbadb3efe2760b910499.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
boot.php
include/dba/dba_driver.php
include/diaspora.php
include/follow.php
include/session.php
include/zot.php
mod/photos.php
mod/ping.php
Diffstat (limited to 'doc/html/boot_8php.js')
| -rw-r--r-- | doc/html/boot_8php.js | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/html/boot_8php.js b/doc/html/boot_8php.js index 742aa4d99..bebc6f291 100644 --- a/doc/html/boot_8php.js +++ b/doc/html/boot_8php.js @@ -251,6 +251,7 @@ var boot_8php = [ "PERMS_W_STREAM", "boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55", null ], [ "PERMS_W_TAGWALL", "boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777", null ], [ "PERMS_W_WALL", "boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2", null ], + [ "PHOTO_ADULT", "boot_8php.html#a921c55b9fa59a327a5f0e07fa1ccb2e0", null ], [ "PHOTO_NORMAL", "boot_8php.html#a4a49b29838ef2c45ab3556b52baec6a4", null ], [ "PHOTO_PROFILE", "boot_8php.html#ab4bc9c50ecc927b92d519e36562b0df0", null ], [ "PHOTO_THING", "boot_8php.html#a78849a1bf8ce8d9804b4cbb502e8f383", null ], @@ -291,6 +292,17 @@ var boot_8php = [ "UPDATE_FLAGS_FORCED", "boot_8php.html#ab9dca53455cd157d3c6ba2bdecdbd22d", null ], [ "UPDATE_FLAGS_UPDATED", "boot_8php.html#a9690d73434125ce594a1f5e7c2a4f7c0", null ], [ "UPDATE_SUCCESS", "boot_8php.html#ac86615ddc0763a00f5311c90e991730c", null ], + [ "VNOTIFY_ALERT", "boot_8php.html#a9f8a2938ddd9ee2867e6f8ce77b61b2f", null ], + [ "VNOTIFY_BIRTHDAY", "boot_8php.html#ac89396b9144391acd08d6d0f9b332220", null ], + [ "VNOTIFY_CHANNEL", "boot_8php.html#a7b511bd93202c43405adbe3b5bcebbfe", null ], + [ "VNOTIFY_EVENT", "boot_8php.html#ad94aca4c260b8a892397786201dc4664", null ], + [ "VNOTIFY_EVENTTODAY", "boot_8php.html#a76480b213af379c0c6c7fa4e39019ca9", null ], + [ "VNOTIFY_INFO", "boot_8php.html#a37281c30bd92cecb499878d6778c570f", null ], + [ "VNOTIFY_INTRO", "boot_8php.html#a1997c4b7d0253e036bc0fb6b20e4af71", null ], + [ "VNOTIFY_MAIL", "boot_8php.html#a0afeb43da443d6ff3526ede5ecdcc3b3", null ], + [ "VNOTIFY_NETWORK", "boot_8php.html#a997614f25e58f8313641e1eb0109fd10", null ], + [ "VNOTIFY_REGISTER", "boot_8php.html#ae09767b94688657978ff9366ec63684b", null ], + [ "VNOTIFY_SYSTEM", "boot_8php.html#a7e5627b5ca4b7464feb0f08663b19ea1", null ], [ "XCHAN_FLAGS_CENSORED", "boot_8php.html#accd6f36cc9f40225cbd720e4d12a7c6e", null ], [ "XCHAN_FLAGS_DELETED", "boot_8php.html#a9ea1290e00c6d40684892047f2c778a9", null ], [ "XCHAN_FLAGS_HIDDEN", "boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2", null ], |