Commit Graph

137 Commits

Author SHA1 Message Date
Evan Prodromou
61419038e5 Merge branch '0.8.x' into 0.9.x
Conflicts:
	README
2009-11-02 18:11:45 -05:00
Evan Prodromou
f757ba3ca2 notes about registeruser and makegroupadmin scripts 2009-11-02 18:10:01 -05:00
Evan Prodromou
bed942271d Revert "remove mention of getfile"
This reverts commit c637fe8cf0.
2009-10-31 14:47:00 -04:00
Evan Prodromou
65cbf05f60 Revert "Revert "Added some explanatory text to README""
This reverts commit 446de62d02.

Conflicts:

	README
	htaccess.sample
2009-10-31 14:45:46 -04:00
Evan Prodromou
f36162b218 Revert "Revert "Added bit about being incompatible with file attachment virtual server""
This reverts commit a5b3ad7bf5.

Conflicts:

	README
2009-10-31 14:44:32 -04:00
Evan Prodromou
4e9ec0d0e1 merge from testing 2009-10-31 14:36:04 -04:00
Evan Prodromou
c637fe8cf0 remove mention of getfile 2009-10-31 14:34:04 -04:00
Evan Prodromou
446de62d02 Revert "Added some explanatory text to README"
This reverts commit d2bac158cd.
2009-10-31 14:33:26 -04:00
Evan Prodromou
a5b3ad7bf5 Revert "Added bit about being incompatible with file attachment virtual server"
This reverts commit afe663af82.
2009-10-31 14:33:24 -04:00
Evan Prodromou
cf199a9b73 updates to README 2009-10-31 14:19:26 -04:00
Evan Prodromou
5e27d53947 Merge branch '0.8.x' into testing 2009-10-31 12:16:30 -04:00
Jeffery To
afe663af82 Added bit about being incompatible with file attachment virtual server 2009-10-22 12:46:59 +08:00
Jeffery To
d2bac158cd Added some explanatory text to README 2009-10-22 12:46:58 +08:00
Zach Copley
ec92cab6ff Removed Facebook stuff from the StatusNet README and wrote a new README
for the Facebook plugin.
2009-10-21 17:53:23 -07:00
Zach Copley
5e536a6614 Remove Twitter bridge stuff. The relevant info has been moved to
/plugins/TwitterBridge/README
2009-10-20 06:11:40 +00:00
Evan Prodromou
fc61b71625 merge from testing 2009-10-19 18:12:00 -04:00
Evan Prodromou
728a146ec0 new codename for 0.8.2 2009-10-19 17:30:08 -04:00
Evan Prodromou
4f5badda94 remove inboxes option 2009-10-13 17:38:27 -04:00
Evan Prodromou
d103522ff3 check the schema 2009-10-01 15:11:12 -04:00
Craig Andrews
a535ccdc4e Merge remote branch 'laconica/0.8.x' into 0.9.x
Conflicts:
	lib/common.php
	lib/twitter.php
2009-09-02 16:42:15 -04:00
Craig Andrews
0c95734a68 Add Tidy requirement to the README 2009-09-02 13:39:05 -04:00
Evan Prodromou
a08c76a434 Merge branch '0.9.x' of git@gitorious.org:laconica/mainline into 0.9.x
Conflicts:
	classes/laconica.ini
2009-08-27 14:52:32 -07:00
Evan Prodromou
bbb830e14c Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x 2009-08-27 14:18:51 -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
82b0927f58 update version in README, add note about status.net 2009-08-27 10:00:45 -07:00
Evan Prodromou
03e0f73002 add changelog to README 2009-08-27 08:39:14 -07:00
Evan Prodromou
dffeb0b3b6 Update version number in README
Update version number and add release code name ("Second Guessing").
2009-08-27 08:00:47 -07:00
Evan Prodromou
e3a53251c0 last scrub of Laconica -> StatusNet 2009-08-26 03:33:43 -04:00
Zach Copley
c1c3c60713 Small update to the Facebook app section 2009-08-25 20:58:08 -07:00
Zach Copley
0e3598cea9 Small update to the Facebook app section 2009-08-25 20:45:09 -07:00
Evan Prodromou
3567b9d708 global search and replace for laconica -> statusnet 2009-08-25 18:53:24 -04:00
Evan Prodromou
2506207454 update README file 2009-08-25 18:25:01 -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
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
b2664e1ae2 Merge branch '0.8.x' into 0.9.x
Conflicts:
	actions/updateprofile.php
	actions/userauthorization.php
	classes/User_group.php
	index.php
	install.php
	lib/accountsettingsaction.php
	lib/logingroupnav.php
2009-08-21 15:42:11 -04:00
Evan Prodromou
9828c64ae8 0 means no limit for text (distinct from null) 2009-08-21 06:33:22 -04:00
Evan Prodromou
a28bbdfb0f configuration options for text limits 2009-08-21 06:33:22 -04:00
Zach Copley
d332603c2e Updated Twitter bridge section 2009-08-18 18:00:17 -07:00
Jeffery To
7dc3a90d12 Added a configuration option to disable OpenID.
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.
2009-08-13 22:18:06 +08: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
Jeffery To
5f293f0e2f Added configuration option to disable post-by-email.
This hides the relevant settings from the email settings page and
prevents maildaemon.php from processing email if the option is
disabled.
2009-08-07 01:55:31 +08:00
Jeffery To
93f585446e Added configuration options to enable/disable SMS and Twitter integration.
This disables the IM, SMS and Twitter settings pages and queue handlers
depending on the config options.
2009-08-07 01:18:17 +08:00
Evan Prodromou
ae81d36137 Site-wide design configuration
I added some code so that the site-wide design can be set, using the
configuration interface.

I also moved the configuration option from
$config['site']['design']['background'] to just
$config['design']['background'], but the old syntax will still work.
2009-07-30 16:24:04 -04:00
Craig Andrews
22466530ef Fixed: The installer checks if the avatar and background directories are writable, but fails to check the file directory used for attachments.
Thanks brion

http://laconi.ca/trac/ticket/1703
2009-07-21 13:59:34 -04:00
Craig Andrews
8894f957cd Require PHP 5.2.3 or later.
http://laconi.ca/trac/ticket/1605
2009-07-17 17:54:37 -04:00
Evan Prodromou
488befd628 add some info about plugins 2009-07-15 16:03:17 -04:00
Evan Prodromou
9e7e440be9 update release date and some extra stuff in the features 2009-07-15 15:43:21 -04:00
Zach Copley
36d2c66eee Add Craig Andrews to the credits list 2009-07-10 14:46:19 -07:00
Zach Copley
111aee9dc0 Fix conflict from merge with 0.7.x; remove conflict markers 2009-07-10 14:44:50 -07:00
Evan Prodromou
bafa1ab1c5 Merge branch '0.7.x' into 0.8.x
Conflicts:
	README
	actions/twitapiusers.php
2009-07-10 10:03:57 -07:00