Brion Vibber
d635a0685d
Merge branch '0.8.x' of git://gitorious.org/laconica/mainline into 0.9.x
2009-09-04 07:19:01 -07:00
Evan Prodromou
5d09b6b3f0
Merge branch '0.8.x' into 0.9.x
...
Conflicts:
EVENTS.txt
actions/finishremotesubscribe.php
actions/postnotice.php
actions/public.php
actions/remotesubscribe.php
actions/showstream.php
actions/updateprofile.php
actions/userauthorization.php
classes/laconica.ini
lib/common.php
lib/oauthstore.php
lib/omb.php
2009-08-27 11:16:45 -07:00
Evan Prodromou
209486d3be
add OpenID doc menu item and doc page
2009-08-21 17:01:48 -04:00
Evan Prodromou
8e21e37d70
move openid docs to OpenID plugin dir
2009-08-21 16:46:47 -04:00
Evan Prodromou
bacef32aac
Revert "Added a configuration option to disable OpenID."
...
This reverts commit 7dc3a90d12
.
Conflicts:
actions/login.php
actions/register.php
lib/accountsettingsaction.php
lib/common.php
lib/logingroupnav.php
2009-08-21 16:38:39 -04:00
Evan Prodromou
9f356b55c6
Merge branch '0.9.x' into openidplugin
...
Conflicts:
actions/login.php
actions/register.php
2009-08-21 16:27:43 -04:00
Evan Prodromou
5dc1291b59
move openid instructions to OpenIDPlugin
2009-08-04 13:27:22 -04:00
Evan Prodromou
622c0b24c3
move redirect-to-openid code to OpenID plugin
2009-08-04 13:17:43 -04:00
Evan Prodromou
2ed46ce274
move XRDS code from public action to OpenIDPlugin
2009-08-04 13:04:31 -04:00
Evan Prodromou
628a937108
say that it's OK to do OpenID login in private mode
2009-08-04 13:01:23 -04:00
Evan Prodromou
3997682d26
incorrectly moved user xrds to OpenID plugin; fixing
2009-08-04 13:01:23 -04:00
Evan Prodromou
0616ea0205
move check for SSL from util.php to OpenIDPlugin
2009-08-04 13:01:23 -04:00
Evan Prodromou
797f296974
fix require paths for OpenID plugin files
2009-08-04 13:01:23 -04:00
Evan Prodromou
f704a7029e
OpenIDPlugin autoloads class files
2009-08-04 13:01:23 -04:00
Evan Prodromou
3245357749
add account settings menu item for OpenID
2009-08-04 13:01:23 -04:00
Evan Prodromou
7a742a0572
show OpenID action in login nav
2009-08-04 13:01:23 -04:00
Evan Prodromou
6d64882270
OpenIDPlugin sets up actions for router
2009-08-04 13:01:23 -04:00
Evan Prodromou
2b79b4d21f
Move OpenID-related files to OpenID plugin directory
...
As a first step to pluginizing our OpenID support, I've moved the
important OpenID-related files to a dedicated plugin directory. Many
of these classes are still referred to by libraries that are still in
core.
2009-08-04 13:01:23 -04:00