diff options
| author | zotlabs <mike@macgirvin.com> | 2017-09-28 14:24:41 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-09-28 14:24:41 -0700 |
| commit | c61853ff0b06c1e41de0e0dfff6b660b693d5e3b (patch) | |
| tree | 2091768e77876562a69d53f3d4b0abe48f3f7476 /boot.php | |
| parent | 0f36916fb40ae963652aa150e7b3aa22a9572d15 (diff) | |
| parent | bdecb61bfa170412c7db513e6b58a13d0b0930f3 (diff) | |
| download | volse-hubzilla-c61853ff0b06c1e41de0e0dfff6b660b693d5e3b.tar.gz volse-hubzilla-c61853ff0b06c1e41de0e0dfff6b660b693d5e3b.tar.bz2 volse-hubzilla-c61853ff0b06c1e41de0e0dfff6b660b693d5e3b.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'boot.php')
| -rwxr-xr-x | boot.php | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -497,6 +497,7 @@ define ( 'ACTIVITY_TAG', NAMESPACE_ACTIVITY_SCHEMA . 'tag' ); define ( 'ACTIVITY_SHARE', NAMESPACE_ACTIVITY_SCHEMA . 'share' ); define ( 'ACTIVITY_FAVORITE', NAMESPACE_ACTIVITY_SCHEMA . 'favorite' ); define ( 'ACTIVITY_CREATE', NAMESPACE_ACTIVITY_SCHEMA . 'create' ); +define ( 'ACTIVITY_DELETE', NAMESPACE_ACTIVITY_SCHEMA . 'delete' ); define ( 'ACTIVITY_WIN', NAMESPACE_ACTIVITY_SCHEMA . 'win' ); define ( 'ACTIVITY_LOSE', NAMESPACE_ACTIVITY_SCHEMA . 'lose' ); define ( 'ACTIVITY_TIE', NAMESPACE_ACTIVITY_SCHEMA . 'tie' ); @@ -1636,6 +1637,7 @@ function login($register = false, $form_id = 'main-login', $hiddens=false, $logi '$login_page' => $login_page, '$logout' => t('Logout'), '$login' => t('Login'), + '$remote_login' => t('Remote Authentication'), '$form_id' => $form_id, '$lname' => array('username', t('Login/Email') , '', ''), '$lpassword' => array('password', t('Password'), '', ''), |