Commit Graph

80 Commits

Author SHA1 Message Date
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
Siebrand Mazeland ed0e91c7a1 Localisation updates from http://translatewiki.net. 2010-11-29 20:28:28 +01:00
Brion Vibber b26eccf33c Merge branch '0.9.x' into 1.0.x 2010-10-28 16:26:34 -07:00
Siebrand Mazeland 7a564276a9 Localisation updates from http://translatewiki.net. 2010-10-28 01:58:43 +02:00
Brion Vibber 5f81f6119b Merge branch '0.9.x' into 1.0.x 2010-10-12 16:33:36 -07:00
Siebrand Mazeland 5215423ea9 Localisation updates from http://translatewiki.net. 2010-10-09 16:15:48 +02:00
Brion Vibber aa02f6020e Merge branch '0.9.x' into 1.0.x 2010-10-08 11:47:50 -07:00
Brion Vibber 67dc78b621 Merge branch 'fatals' into 0.9.x 2010-10-08 11:28:51 -07:00
Brion Vibber e23ad7392f Normalize execution guards in imap plugin files. 2010-10-08 11:01:13 -07:00
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 458512aafd Localisation updates from http://translatewiki.net 2010-10-03 22:46:38 +02:00
Siebrand Mazeland f6c1b8aa49 Localisation updates from http://translatewiki.net
* adding the fuzzy messages back now that translatewiki.net processes them properly again.
2010-09-28 21:06:47 +02:00
Siebrand Mazeland ec7ab3af4d Localisation updates from http://translatewiki.net
* first export of L10n for languages other than English. Could use some testing/QA.
2010-09-28 01:09:29 +02:00
Brion Vibber a6469aeed8 Fix PHP syntax errors introduced during localization fixups in a few files. 2010-09-25 12:10:36 -07:00
Siebrand Mazeland 870be512d2 Update POT files for plugins. 2010-09-23 00:37:16 +02:00
Siebrand Mazeland 500f8e5a87 * i18n/L10n updates.
* remove superfluous whitespace.
2010-09-20 20:54:30 +02:00
Siebrand Mazeland 8135f7d960 Update pot files for plugins. 2010-09-19 00:24:48 +02:00
Siebrand Mazeland 2d119df6d3 * update i18n/L10n
* remove superfluous whitespace
2010-09-18 11:43:17 +02:00
Siebrand Mazeland db1d348135 Update/add pot files for plugins. 2010-09-15 01:16:45 +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
Brion Vibber e3e90b4c27 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x 2010-04-30 14:08:35 -07:00
Siebrand Mazeland d811f14bed Remove .po source files. Using pot files. 2010-04-30 01:57:22 +02:00
Siebrand Mazeland 5ad2d0c30c Update gettext localisation files. 2010-04-30 01:45:54 +02:00
Craig Andrews e9995b0f6a Create IM plugin, Pluginize XMPP, Create AIM plugin 2010-01-27 13:48:35 -05:00
Craig Andrews 8c54151dbd Use StartQueueDaemonIoManagers instead of removed StartIoManagerClasses event 2010-01-23 13:08:59 -05:00
Craig Andrews 681065d734 Made the IMAP plugin work in the style of the new queue/iomanagers 2010-01-13 15:35:53 -05:00
Craig Andrews a07d8dab25 i18n in the imap plugin 2010-01-09 19:04:53 -05:00
Craig Andrews c758b1b1d4 Add version information to a bunch of plugins 2010-01-09 19:04:53 -05:00
Craig Andrews 055f3fdddb Add an IMAP daemon so StatusNet can process incoming user posts via catch-all mailbox (in addition to the pre-existing script alias method) 2010-01-08 18:52:43 -05:00