Evan Prodromou
f1fda6c050
Merge branch '0.8.x' into 0.9.x
2009-08-27 07:56:19 -07: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
8236037bf0
Merge branch 'dbconfig' into 0.9.x
...
Conflicts:
lib/common.php
2009-08-21 16:17:06 -04:00
Evan Prodromou
538dcf2eef
load configuration options from database at runtime
2009-08-21 16:14:32 -04:00
Brion Vibber
5c21a371d6
Include php-gettext 1.0.7 into extlibs; loading it up if native gettext extension is not present.
...
This provides a pure PHP implementation of the gettext functions.
This should help get laconica running on shared hosting environments where PHP's gettext module may not be installed.
Also gets us one step closer to running on Mac OS X 10.5 with Apple's preinstalled PHP, which doesn't provide an easy way to add modules.
Source: http://savannah.nongnu.org/projects/php-gettext
Copyright (c) 2005 Steven Armstrong <sa at c-area dot ch>
GPLv2 or later
2009-08-21 16:01:51 -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
a28bbdfb0f
configuration options for text limits
2009-08-21 06:33:22 -04:00
Francois Marier
986d95b31e
Fix the default value of ['server']['path'] when running from command line scripts
...
The logic in _sn_to_path() doesn't make sense when not running via a remote server.
Default to the empty string if running from the command line and ['server']['path']
is not set manually in config.php
2009-08-20 17:46:26 +12: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
Craig Andrews
e9ed20a69d
Merge commit 'jeff-themovie/0.8.x-openidonly' into 0.8.x
2009-08-10 11:53:35 -04:00
Zach Copley
17dcf1c317
Merge branch 'twitter-oauth' into 0.8.x
...
Conflicts:
scripts/getvaliddaemons.php
2009-08-10 07:49:51 +00: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
7c9e12a0b8
Fixed IM and SMS enabled options to default to true.
2009-08-07 01:57:43 +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
6937704ebd
give plugins a chance to autoload their classes
2009-08-04 07:34:58 -04:00
Evan Prodromou
b995370d4a
0.9.0 dev version
2009-08-04 06:05:04 -04:00
Zach Copley
dccd4aa68d
Merge branch '0.8.x' into twitter-oauth
2009-08-03 22:47:57 +00:00
Zach Copley
6f4b2f0ac2
Twitter OAuth server dance working
2009-08-01 08:20:44 +00: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
7fff454ff9
Revert "0.9.0 dev version"
...
This reverts commit 7cfb2f569d
.
This should have never been committed to the 0.8.x branch.
2009-07-23 13:00:34 -04:00
Evan Prodromou
c07c4b2050
change version to 0.8.1dev
2009-07-15 23:36:08 -04:00
Evan Prodromou
6a0f0e32d5
Merge branch '0.8.x' into 0.9.x
2009-07-10 10:06:20 -07:00
Evan Prodromou
15f6309dea
add a little syntactical sugar for adding plugins
2009-07-09 23:12:53 -07:00
Evan Prodromou
03ccb74052
0.9.0 dev version
2009-07-09 18:22:46 -04:00
Evan Prodromou
efd94b4e54
change version number to 0.8.0
2009-07-09 18:22:10 -04:00
Evan Prodromou
b78801becb
correct the newuser default setting in common.php
2009-07-09 18:19:13 -04:00
Zach Copley
d80c553e5f
Make logging facility configurable
2009-07-02 16:06:13 -07:00
Jeff Mitchell
b416df9312
Add site-wide option to change the length at which URLs are auto-shortened
2009-06-30 16:46:33 -07:00
Zach Copley
b10dba2798
Merge commit 'jeff-themovie/invite-enabled' into 0.8.x
...
* commit 'jeff-themovie/invite-enabled':
Adds $config['invite']['enabled'] to enable/disable invites.
2009-06-30 16:10:12 -07:00
Evan Prodromou
871f598dcc
debug flag for sessions
2009-06-27 08:11:09 -07:00
Evan Prodromou
71dad1ff62
use the session class to store sessions
2009-06-27 06:20:24 -07:00
Jeffery To
6328add622
Merge branch '0.8.x' into invite-enabled
2009-06-26 15:31:42 +08:00
Evan Prodromou
63f12c48a8
make stomp server work with username and password
2009-06-24 19:17:41 -07:00
Sarven Capadisli
2d3e990ed4
Using default theme design values (it was previously set to identica
...
theme)
2009-06-23 21:26:47 +00:00
Evan Prodromou
7bcaa858af
make file command configurable
2009-06-23 05:35:20 -07:00
Evan Prodromou
205d8afe54
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-06-22 17:13:28 -07:00
Evan Prodromou
9171f16b73
add commandline.inc for parsing
2009-06-22 15:29:24 -07:00
Evan Prodromou
0461aafeef
Merge branch '0.8.x' into cmdline
2009-06-22 14:51:17 -07:00
Zach Copley
09e24af683
Add upload location to attachments config section
2009-06-22 21:36:04 +00:00
Evan Prodromou
7cf0a4c647
theme dir, path configurable
2009-06-22 09:31:55 -07:00
Evan Prodromou
876ab05927
Add like for search
2009-06-21 21:50:35 -07:00
Evan Prodromou
02a4ca9e2e
got rid of 'skin' concept a while ago
2009-06-21 21:38:16 -07: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
Evan Prodromou
198afa0a1d
change scripts to take server and path from commandline
2009-06-20 14:58:47 -07:00
Evan Prodromou
597df6a234
better calculation of path
2009-06-18 16:19:26 -07:00
Zach Copley
164588ef0f
Merge branch '0.8.x' into userdesign
2009-06-17 21:40:52 +00:00
Robin Millette
b58dc5e961
Added config option to enable or disable file uploads with notices.
2009-06-17 16:55:01 -04:00