Commit Graph

40 Commits

Author SHA1 Message Date
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
Sarven Capadisli
277b464054 Created autofocus method to give focus to an element (primarily a form
control) on page onload.

Updated some of the pages to use autofocus.
2009-09-03 19:42:50 +00: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
df86aa7214 define LACONICA and accept LACONICA for backwards compatibility 2009-08-26 10:41:36 -04:00
Evan Prodromou
865b716f09 change LACONICA to STATUSNET 2009-08-25 18:42:34 -04:00
Evan Prodromou
4737563b95 a distributed -> the distributed 2009-08-25 18:14:12 -04:00
Evan Prodromou
c8b8f07af1 change Laconica and Control Yourself to StatusNet in PHP files 2009-08-25 18:12:20 -04:00
Evan Prodromou
59beff6b46 Revert "Added configuration option to only allow OpenID logins."
This reverts commit 14b46e2183.

This functionality will need to be rewritten to work with the new
OpenIDPlugin.

Conflicts:

	index.php
	lib/logingroupnav.php
2009-08-21 16:45:42 -04:00
Jeffery To
14b46e2183 Added configuration option to only allow OpenID logins.
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.
2009-08-10 13:57:39 +08:00
Craig Andrews
e804b2a500 trim the subject line of invite emails
Thanks semjaza

http://laconi.ca/trac/ticket/1746
2009-07-27 16:02:03 -04:00
Jeffery To
6328add622 Merge branch '0.8.x' into invite-enabled 2009-06-26 15:31:42 +08:00
Evan Prodromou
aec6456c91 Update copyright dates in files modified in 2009 2009-06-20 16:12:55 -07:00
Evan Prodromou
793a6a1155 change Controlez-Vous to Control Yourself 2009-06-20 16:00:04 -07:00
Jeffery To
6d308f6ffe Adds $config['invite']['enabled'] to enable/disable invites.
The invite function may not applicable for private and/or closed installs. This adds a configuration option to enable/disable invites (defaulting to enabled), hides the "Invite" nav item when necessary, and adds a check to actions/invite.php.

Note that I haven't tried the Facebook application so I didn't add any checks to actions/facebookinvite.php.
2009-06-14 16:17:22 +08:00
Evan Prodromou
6335c9cf59 make invite use the current user's design 2009-05-23 23:42:19 -04:00
Evan Prodromou
e9e75fc9d5 isReadOnly() now takes arguments
Add an array of arguments to isReadOnly() method of actions, to let
them change their results depending on what actions are called.
Primarily used by the 'api' action. Ideally in the future that will be
multiple actions. But this might still be useful.
2009-04-13 15:49:26 -04:00
sarven
0cdaf3e155 Invitation markup and style 2009-01-24 03:18:34 +00:00
Evan Prodromou
4d0ff70109 Add attributes for invite 2009-01-22 22:59:18 +00:00
Evan Prodromou
2fe16b39ba Add local nav to invite 2009-01-22 22:53:05 +00:00
Evan Prodromou
03ce6aee2e convert invite 2009-01-22 22:51:37 +00:00
Evan Prodromou
ba9f1f603b All actions now use isReadOnly() 2009-01-15 23:09:16 +00:00
Evan Prodromou
4b0cf99e56 Convert use of common_server_error and common_user_error to methods on Action 2009-01-15 23:03:38 +00:00
Evan Prodromou
eaa81d25fa Convert all actions to use new UI functions
I did a massive search-and-replace to get all the action subclasses to
use the new output function (common_element() -> $this->element(), etc.)

There's still a lot to do, but it's a first step
2009-01-15 22:57:15 +00:00
Evan Prodromou
b264c03d32 move opening brace of class declaration to next line
Another gigantor PEAR coding standards patch. Here, I've moved the
opening curly bracket on a class statement to the following line.

darcs-hash:20081223194923-84dde-77a93de314caadbcb5b70bf346a4648be77a864e.gz
2008-12-23 14:49:23 -05:00
Evan Prodromou
04ef1ba8ee change function headers to K&R style
Another huge change, for PEAR code standards compliance. Function
headers have to be in K&R style (opening brace on its own line),
instead of having the opening brace on the same line as the function
and parameters. So, a little perl magic found all the function
definitions and move the opening brace to the next line (properly
indented... usually).

darcs-hash:20081223193323-84dde-a28e36ecc66672c783c2842d12fc11043c13ab28.gz
2008-12-23 14:33:23 -05:00
Evan Prodromou
eb2f9c98ac replace NULL with null
Another global search-and-replace update. Here, I've replaced the PHP
keyword 'NULL' with its lowercase version. This is another PEAR code
standards change.

darcs-hash:20081223192129-84dde-4a0182e0ec16a01ad88745ad3e08f7cb501aee0b.gz
2008-12-23 14:21:29 -05:00
Evan Prodromou
edbc0c665c replace all tabs with four spaces
The PEAR coding standards decree: no tabs, but indent by four spaces.
I've done a global search-and-replace on all tabs, replacing them by
four spaces. This is a huge change, but it will go a long way to
getting us towards phpcs-compliance. And that means better code
readability, and that means more participation.

darcs-hash:20081223191907-84dde-21e8efe210e6d5d54e935a22d0cee5c7bbfc007d.gz
2008-12-23 14:19:07 -05:00
Zach Copley
a637f36214 CSRF protection for invites.php
darcs-hash:20080829045441-7b5ce-a1382496d8d6b043a1a72c0fb32051f1b43163c8.gz
2008-08-29 00:54:41 -04:00
Evan Prodromou
9bff7c9a76 removed the preview, so use "Send" for the button
darcs-hash:20080827011921-84dde-622d4c8eab1b05ce999bba4554b85c08a5840c79.gz
2008-08-26 21:19:21 -04:00
Evan Prodromou
c55e3089c5 fix format string, again again
darcs-hash:20080827010138-84dde-db15d5a4408a9cca08822b4c4946e2dfc60ea3db.gz
2008-08-26 21:01:38 -04:00
Evan Prodromou
37991eace8 lost the names when making a new function send_invitation
darcs-hash:20080827005418-84dde-7e7a4be646c520542e8c065ba90ba759c100b481.gz
2008-08-26 20:54:18 -04:00
Evan Prodromou
ebf5d52f74 send personal message through to send_invitation function
darcs-hash:20080827005155-84dde-02a097e286800519fe5294cb7005ead533db478f.gz
2008-08-26 20:51:55 -04:00
Evan Prodromou
0ce9b20566 fix runon string in invites format
darcs-hash:20080827004854-84dde-a558664ac7f02ff319e3c29ac4516f491abef29a.gz
2008-08-26 20:48:54 -04:00
Evan Prodromou
6a57f42606 fix format for subject
darcs-hash:20080827004755-84dde-d3275abf281b1d4790806357d3d0bcba634f28f3.gz
2008-08-26 20:47:55 -04:00
Evan Prodromou
b158658caa save invitation code and improve format of outgoing mail
darcs-hash:20080827004410-84dde-226101a8482f511ff9df7546342f84dd94ceca54.gz
2008-08-26 20:44:10 -04:00
Evan Prodromou
11be8376dd correct output on invitations
darcs-hash:20080827003529-84dde-614dc517061e76d180823c0aaf3fc9f434f6480c.gz
2008-08-26 20:35:29 -04:00
Evan Prodromou
e248066b74 updates for invitations
Add the code to registration to handle invitation codes.

Some edge cases on invitations: is the user already subbed to this
person? Tell them. Is the person already on the system? Sub the user
to them, then, and tell the user.

Add some code to User to auto-sub invitees whenever the email address
changes. Call it from a new registration with an invite code, and also
from confirmaddress.

Some whitespace cleanup in the files touched.

darcs-hash:20080827001927-84dde-b50e5d921ca3f2fb894821730ff93cac09d2ba66.gz
2008-08-26 20:19:27 -04:00
Evan Prodromou
19614f33a4 skip preview, just send the darn thing
darcs-hash:20080826021227-84dde-22f709bf330bcfa46b93eadd11700723bf640a6b.gz
2008-08-25 22:12:27 -04:00
Evan Prodromou
1e78f020e9 fix instructions
darcs-hash:20080825193738-84dde-d58e63ee015a52ccf065d17a2fc16d2d1899f805.gz
2008-08-25 15:37:38 -04:00
Evan Prodromou
55fe8f8ff8 start the invite form
darcs-hash:20080825192946-84dde-c48e79699e5c0bc51ce5ab1fa921c49abbf2c4f5.gz
2008-08-25 15:29:46 -04:00