Commit Graph

231 Commits

Author SHA1 Message Date
Zach Copley b7d0746694 Merge branch '0.9.x' into 1.0.x
Conflicts:
	actions/confirmaddress.php
	actions/emailsettings.php
	actions/hostmeta.php
	actions/imsettings.php
	actions/login.php
	actions/profilesettings.php
	actions/showgroup.php
	actions/smssettings.php
	actions/urlsettings.php
	actions/userauthorization.php
	actions/userdesignsettings.php
	classes/Memcached_DataObject.php
	index.php
	lib/accountsettingsaction.php
	lib/action.php
	lib/common.php
	lib/connectsettingsaction.php
	lib/designsettings.php
	lib/personalgroupnav.php
	lib/profileaction.php
	lib/userprofile.php
	plugins/ClientSideShorten/ClientSideShortenPlugin.php
	plugins/Facebook/FBConnectSettings.php
	plugins/Facebook/FacebookPlugin.php
	plugins/NewMenu/NewMenuPlugin.php
	plugins/NewMenu/newmenu.css
2011-02-28 15:39:43 -08:00
Evan Prodromou f6e614b894 add plugins/sslpath setting, default to site path/plugins 2011-02-11 15:58:47 -05:00
Evan Prodromou 523e8c86e9 correct error in README on default for deletion 2011-02-10 10:11:30 -05:00
Evan Prodromou f06e661a9b new methods for paths to plugin static files 2011-02-03 10:36:25 -05:00
Evan Prodromou 7699bb3dba document that nickname 'panel' no longer allowed 2011-01-23 10:26:28 -05:00
Evan Prodromou f9b2feb7f5 Merge branch '0.9.x' into 1.0.x
Conflicts:
	README
2011-01-12 18:05:56 -05:00
Evan Prodromou 98a0d7f538 Configuration options for using an HTTP proxy
We can make a lot of HTTP requests from the server side. This change
adds some configuration options for using an HTTP proxy, which can
cache hits from multiple sites (good for status.net-like services, for example).
2011-01-03 10:38:32 -08:00
Brion Vibber 26baad63f2 Merge branch '0.9.x' into 1.0.x 2010-12-22 15:25:38 -08:00
Evan Prodromou 7c7b91e61a define configuration settings for account maintenance security 2010-12-13 16:28:02 -05:00
Brion Vibber 9df856e667 Merge branch '0.9.x' into merge
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
2010-12-07 10:50:05 -08:00
Evan Prodromou bb63fd4b75 Config flag to disable router caching if needed 2010-12-06 17:19:41 -05:00
Brion Vibber e317ec11ad Drop PEAR Services_oEmbed -- ended up replaced by our oEmbedHelper wrapper. The extra validation available there is problematic, and their code for building HTML for us wasn't being used anyway. 2010-11-15 12:35:15 -08:00
Brion Vibber 04ca706601 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
	actions/confirmaddress.php
	actions/othersettings.php
2010-11-02 15:02:10 -07:00
Brion Vibber e90bf6c15b README bump for 0.9.6 final 2010-10-29 14:17:18 -07:00
Brion Vibber b26eccf33c Merge branch '0.9.x' into 1.0.x 2010-10-28 16:26:34 -07:00
Brion Vibber c09487f272 readme: release candidate 0.9.6 2010-10-25 14:49:29 -07:00
Brion Vibber ca489631db Merge branch '0.9.x' into 1.0.x
Conflicts:
	actions/subscriptions.php
	lib/router.php
	lib/xmppmanager.php
	lib/xmppoutqueuehandler.php
2010-10-25 13:08:57 -07:00
Brion Vibber 8004e2809d Fix for ticket #2845: singleuser nickname configuration was being overridden by site owner in router setup.
I've consolidated the checks for which user to use for single-user mode into User::singleUser(), which now uses the configured nickname by preference, falling back to the site owner if it's unset.
This is now called consistently from the places that needed to use the primary user's nickname in routing setup.

Setting $config['singleuser']['nickname'] should now work again as expected.
2010-10-20 14:34:25 -07:00
Brion Vibber 3593f3f132 Merge branch '0.9.x' into 1.0.x 2010-10-19 15:18:07 -07:00
Siebrand Mazeland 6baba4a2e4 Fix casing of "translatewiki.net" 2010-10-19 02:26:39 +02:00
Brion Vibber d26b7a12ca Bump README to 0.9.6 2010-10-18 14:48:11 -07:00
Brion Vibber 7765ddae81 Merge branch '0.9.x' into 1.0.x
Conflicts:
	README
	lib/default.php
2010-10-18 12:17:11 -07:00
Evan Prodromou 671712f0f6 document API and nofollow config options 2010-10-18 11:41:33 -04:00
Brion Vibber 793ec16ed4 Fix ticket #2829: we have more subdirs to pull than just avatars now; updated the upgrade directions. 2010-10-14 16:57:04 -07:00
Craig Andrews 0721d8d3e2 Merge remote branch 'statusnet/0.9.x' into 1.0.x 2010-10-14 15:27:17 -04:00
Evan Prodromou 1a4dc03bfe document and default for site|ssllogo 2010-10-14 14:56:38 -04:00
Evan Prodromou b31c49c5d4 Make HTTPS urls in File::url() if necessary 2010-10-14 14:22:17 -04:00
Evan Prodromou 7fb765b2cb document sslserver and sslpath configuration options 2010-10-14 01:23:12 -04:00
Evan Prodromou 6bbc8ca234 Merge branch '0.9.x' into 1.0.x 2010-09-09 15:02:53 -04:00
Evan Prodromou 4419e43f7f Merge branch '0.9.x' into 1.0.x
Conflicts:
	EVENTS.txt
	plugins/TwitterBridge/daemons/twitterstatusfetcher.php
	plugins/TwitterBridge/twitterbasicauthclient.php
2010-09-09 15:01:03 -04:00
Evan Prodromou efa7dcc66d include changelog and version changes in text 2010-09-09 11:26:15 -04:00
Brion Vibber cb1d5049b8 Bump version to 0.9.5 2010-09-08 15:35:23 -07:00
Evan Prodromou 86a702953a Merge branch '0.9.x' into 1.0.x 2010-09-06 10:12:17 -04:00
Evan Prodromou ef1cb1cc94 explicitly license documentation under CC-BY 3.0 2010-09-03 15:26:25 -04:00
Evan Prodromou cc6e4c93e5 explicit attribution 2010-09-02 23:41:48 -04:00
Evan Prodromou 3010429579 note that images and CSS files in /themes/ are CC-BY 3.0, and that themes are exempt from AGPL copyleft 2010-09-02 23:23:46 -04:00
Brion Vibber 0cfaae48a3 Merge branch '0.9.x' into 1.0.x 2010-08-16 16:56:27 -07:00
Brion Vibber b2a5e0d09b StatusNet 0.9.4 "Orange Crush" 2010-08-16 10:09:33 -07:00
Evan Prodromou 7183175429 Merge branch 'master' into 1.0.x 2010-08-13 14:33:41 -07:00
Evan Prodromou d06bdfa54b add note about software subscription 2010-08-12 18:42:09 -07:00
Brion Vibber d15a41c96e 0.9.4beta2 update some notes in README, note the fix from beta1 2010-08-11 10:32:52 -07:00
Evan Prodromou 9f0715a993 Merge branch '0.9.x' into 1.0.x 2010-08-03 16:05:03 -07:00
Brion Vibber 452123916d Updates to README w/ summary changelist 2010-06-29 11:23:35 -04:00
Brion Vibber c9863bb864 Update version and code name: 0.9.3 Half a World Away 2010-06-28 15:08:01 -04:00
Brion Vibber 173778eab1 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
	lib/xmppmanager.php (resolved: code has moved to XmppPlugin.php)
2010-05-05 17:11:23 -07:00
Zach Copley 940a8c2c1e Updated README to include one-liner about fixed installer in the noteable changes section 2010-05-03 12:02:50 -07:00
Brion Vibber c2f620ed67 Update release date 2010-05-03 11:46:01 -07:00
Brion Vibber cae1329f3b Merge branch '0.9.x' into 1.0.x
Conflicts:
	lib/util.php
2010-04-30 13:16:13 -07:00
Zachary Copley a5761dd814 Update release notes and version number for 0.9.2 2010-04-29 16:06:04 -07:00
Evan Prodromou 14adb7cc41 Give users more control over URL shortening
Users and administrators can set how long an URL can be before it's
shortened, and how long a notice can be before all its URLs are
shortened. They can also turn off shortening altogether.

Squashed commit of the following:

commit d136b39011
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:39:00 2010 -0400

    use site and user settings to determine when to shorten URLs

commit 1e1c851ff3
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:38:40 2010 -0400

    add a method to force shortening URLs

commit 4d29ca0b91
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:37:41 2010 -0400

    static method for getting best URL shortening service

commit a9c6a3bace
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:37:11 2010 -0400

    allow 0 in numeric entries in othersettings

commit 767ff2f7ec
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:36:46 2010 -0400

    allow 0 or blank string in inputs

commit 1e21af42a6
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:01:11 2010 -0400

    add more URL-shortening options to othersettings

commit 869a6be0f5
Author: Evan Prodromou <evan@status.net>
Date:   Sat Apr 24 14:22:51 2010 -0400

    move url shortener superclass to lib from plugin

commit 9c0c9863d5
Author: Evan Prodromou <evan@status.net>
Date:   Sat Apr 24 14:20:28 2010 -0400

    documentation and whitespace on UrlShortenerPlugin

commit 7a1dd5798f
Author: Evan Prodromou <evan@status.net>
Date:   Sat Apr 24 14:05:46 2010 -0400

    add defaults for URL shortening

commit d259c37ad2
Author: Evan Prodromou <evan@status.net>
Date:   Sat Apr 24 13:40:10 2010 -0400

    Add User_urlshortener_prefs

    Add a table for URL shortener prefs, a corresponding class, and the
    correct mumbo-jumbo in statusnet.ini to make everything work.
2010-04-26 02:40:36 -04:00