Commit Graph

7 Commits

Author SHA1 Message Date
Brion Vibber
59119482ca Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
	actions/hostmeta.php
	actions/imsettings.php
	classes/User.php
	lib/adminpanelaction.php
	lib/channel.php
	lib/default.php
	lib/router.php
	lib/util.php
2010-10-04 12:54:36 -07:00
Siebrand Mazeland
f0716819ec * update i18n/L10n
* remove superfluous whitespace
2010-09-18 11:45:50 +02:00
Brion Vibber
b1a68e15b7 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
	lib/default.php
	lib/util.php
	plugins/UrlShortener/UrlShortenerPlugin.php (has been removed?)
2010-06-10 15:37:06 -07:00
Craig Andrews
6317f7d92b Assigning my copyrights to the Free Software Foundation 2010-05-27 18:27:33 -04:00
Craig Andrews
ecf9dc6d1b use the new maxNoticeLength and maxUrlLength functionality introduced in commit 14adb7cc41 2010-05-03 21:25:10 -04:00
Craig Andrews
edc6cf39a0 Only shorten when notice length exceeds max length 2010-04-26 15:59:13 -04:00
Craig Andrews
65796ba03b add ClientSideShortenPlugin
see plugins/ClientSideShorten/README
2010-04-21 17:14:54 -04:00