Age | Commit message (Collapse) | Author |
|
Conflicts:
README
actions/hostmeta.php
classes/File_redirection.php
lib/common.php
lib/designsettings.php
lib/router.php
lib/util.php
lib/xmppmanager.php
plugins/OStatus/OStatusPlugin.php
|
|
have been destroyed by NetBeans and will be rewritten shortly. Sigh.
|
|
Conflicts:
actions/subscriptions.php
lib/router.php
lib/xmppmanager.php
lib/xmppoutqueuehandler.php
|
|
|
|
|
|
Conflicts:
plugins/OpenID/openidlogin.php
|
|
'sometimes' SSL modes are kicked in.
The forms would already submit to SSL, but people are happier if they start on a secure page!
Note: this really should be done for sensitive/all URLs in index.php, but it seems a bit awkward to reconstruct the SSL version of the link atm. Cleanup todo!
|
|
|
|
all-rights-reserved sites.
|
|
|
|
registration form.
Note that much of that form is duplicated several times for Twitter, Facebook, and OpenID registrations -- these need to be refactored to avoid having multiple out-of-sync copies of code and messages.
|
|
registration form.
Note that much of that form is duplicated several times for Twitter, Facebook, and OpenID registrations -- these need to be refactored to avoid having multiple out-of-sync copies of code and messages.
|
|
registration. Form's checks for existing nicks & emails would incorrectly return true on the second lookup due to bad interaction with negative caching.
(was checking $obj !== false but we return null now on negative cache hits, with false for cache misses)
|
|
Conflicts:
lib/command.php
|
|
|
|
|
|
* i18n updates: number parameters if more than one are being used
|
|
|
|
This reverts commit 5ab709b73977131813884558bf56d97172a7aa26.
Missed this one yesterday...
|
|
|
|
* doesn't
* won't
* isn't
* don't
|
|
something else in most places"
This reverts commit 81b4a381d9ddc71ed8a53c074ea10910882d3156.
IMO "user" is a bit impersonal and we shouldn't go changing the tone of the UI willy-nilly when we're updating localisations.
|
|
in most places
* change some contractions to full text in UI messages
|
|
http://status.net/trac/ticket/1817
|
|
as those behind restrictive corporate firewalls, or on home systems on restrictive connections) cannot connect to any mail
systems, and this check will always fail.
|
|
Conflicts:
lib/omb.php
|
|
control) on page onload.
Updated some of the pages to use autofocus.
|
|
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
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
actions/login.php
actions/register.php
|
|
Conflicts:
actions/updateprofile.php
actions/userauthorization.php
classes/User_group.php
index.php
install.php
lib/accountsettingsaction.php
lib/logingroupnav.php
|
|
|
|
If $config['openid']['enabled'] is set to false, OpenID is removed from
the navigation and direct accesses to OpenID login pages redirect to the
login page.
If OpenID is enabled, $config['site']['openidonly'] is ignored, i.e.
OpenID is required to go OpenID-only.
|
|
If $config['site']['openidonly'] is set to true:
* the Login/Register pages will be removed from the navigation;
* directly accesses to the Login/Register pages will redirect to the
OpenID login page;
* most links to the Login/Register pages will link to the OpenID login
page instead.
The user will still need to set a password to access the API and RSS
feeds.
|
|
|
|
|
|
|
|
|
|
|
|
ProfileFormData and ProfileSaveForm.
|
|
|
|
This reverts commit 9f035e2847e0d119ca3d70e02df6f4fa73ca64c3.
It's a lot of complicated stuff, and the global handler probably does
fine.
|
|
This reverts commit 616bdd43a921b2554d21b80af28ddb0fb6cb3c16.
Kind of a long hard way to deal with a simple situation, so I'd prefer
to just use the global handler.
|
|
Renamed the Action functions to throw an exception like it. I still
think it probably makes sense to have the callback defined in both
places for finer control.
|
|
up, but are actually expected and can safely be ignored.
|
|
|