Evan Prodromou
4b7a91bb81
Squashed commit of the following:
...
commit cd43ac412c90722e3b83ec750d9232a2ac2f12c9
Merge: dad72cc
adaf175
Author: Evan Prodromou <evan@status.net>
Date: Mon Jul 9 09:41:05 2012 -0400
Merge commit 'refs/merge-requests/196' of git://gitorious.org/statusnet/mainline into merge-requests/196
commit adaf17552d3ab35d451c00cdb32d87a107e0e56a
Author: Jeremy Pope <jpope@jpope.org>
Date: Thu Jul 5 12:33:06 2012 -0500
fix for XMPP high CPU usage - issue no 3232
commit e573e8ee6690af94259ff8793a84652a139d0662
Author: Jeremy Pope <jpope@jpope.org>
Date: Thu Jul 5 12:30:34 2012 -0500
fix for queuedaemon and imdaemon not being stopped by stopdaemons.sh
2012-07-09 09:43:40 -04:00
Siebrand Mazeland
51b28eda19
Localisation updates from http://translatewiki.net .
2012-06-30 11:10:38 +00:00
Siebrand Mazeland
f2d66082b4
Localisation updates from http://translatewiki.net .
2012-06-24 18:26:18 +00:00
Siebrand Mazeland
707076fca9
Localisation updates from http://translatewiki.net .
2012-06-17 23:26:20 +00:00
Siebrand Mazeland
c658ede37c
Localisation updates from http://translatewiki.net .
2012-06-10 23:42:52 +00:00
Siebrand Mazeland
bc733a200f
Localisation updates from http://translatewiki.net .
2012-06-04 15:02:34 +00:00
Siebrand Mazeland
f059977c57
Localisation updates from http://translatewiki.net .
2012-05-26 21:15:30 +00:00
Siebrand Mazeland
cd77348852
Localisation updates from http://translatewiki.net .
2012-05-20 11:10:38 +00:00
Siebrand Mazeland
2e4e2f693d
Localisation updates from http://translatewiki.net .
2012-05-12 18:47:41 +00:00
Siebrand Mazeland
6f557d3654
Localisation updates from http://translatewiki.net .
2012-05-06 17:08:47 +00:00
Siebrand Mazeland
eafe507068
Localisation updates from http://translatewiki.net .
2012-05-03 22:13:22 +00:00
Siebrand Mazeland
c7013ceb1a
Localisation updates from http://translatewiki.net .
2012-04-29 23:12:10 +00:00
Siebrand Mazeland
3898500ff9
Localisation updates from http://translatewiki.net .
2012-04-21 10:21:38 +00:00
Siebrand Mazeland
b2c5b9de52
Localisation updates from http://translatewiki.net .
2012-04-15 12:11:05 +00:00
Siebrand Mazeland
71a9644b35
Localisation updates from http://translatewiki.net .
2012-04-09 01:38:31 +02:00
Siebrand Mazeland
f34a196e83
Localisation updates from http://translatewiki.net .
2012-03-01 17:22:45 +01:00
Siebrand Mazeland
7f257ddb95
Localisation updates from http://translatewiki.net .
2011-12-19 02:02:49 +01:00
Siebrand Mazeland
03657a90e1
Localisation updates from http://translatewiki.net .
2011-12-03 13:09:10 +01:00
Siebrand Mazeland
b4ecb24907
Localisation updates from http://translatewiki.net .
2011-11-12 23:35:01 +01:00
Siebrand Mazeland
151ff6beb7
Localisation updates from http://translatewiki.net .
2011-10-29 14:30:42 +02:00
Siebrand Mazeland
6120af3901
Localisation updates from http://translatewiki.net .
2011-10-10 15:58:00 +02:00
Siebrand Mazeland
e7dac240ef
Localisation updates from http://translatewiki.net .
2011-09-26 00:01:00 +02:00
Siebrand Mazeland
83dc51ee79
Localisation updates from http://translatewiki.net .
2011-09-11 16:54:08 +02:00
Siebrand Mazeland
7cfbe7c2d4
Localisation updates from http://translatewiki.net .
2011-08-30 11:50:01 +02:00
Siebrand Mazeland
ed13c9a098
Localisation updates from http://translatewiki.net .
2011-08-20 21:30:04 +02:00
Siebrand Mazeland
31556e3c00
Localisation updates from http://translatewiki.net .
2011-08-15 16:32:26 +02:00
Siebrand Mazeland
7fcdc1a9ed
Localisation updates from http://translatewiki.net .
2011-07-21 14:49:16 +02:00
Siebrand Mazeland
eb90389a22
Localisation updates from http://translatewiki.net .
2011-07-01 13:02:21 +02:00
Siebrand Mazeland
42b28547d5
Localisation updates from http://translatewiki.net .
2011-06-19 13:20:34 +02:00
Siebrand Mazeland
89aebb4ef0
Localisation updates from http://translatewiki.net .
2011-06-18 18:14:28 +02:00
Siebrand Mazeland
59ee7e0f5b
Translator documentation updated.
...
Whitespace updates.
2011-06-17 22:36:29 +02:00
Siebrand Mazeland
bbb240e47e
Update translator documentation.
...
Whitespace updates.
Line break changes in README.
i18n updates.
2011-06-15 13:25:43 +02:00
Siebrand Mazeland
c3f081c583
Localisation updates from http://translatewiki.net .
2011-06-05 21:15:31 +02:00
Siebrand Mazeland
7c5fb37e59
Localisation updates from http://translatewiki.net .
2011-06-05 11:50:05 +02:00
Siebrand Mazeland
d4aef7a007
Localisation updates from http://translatewiki.net .
2011-05-05 23:24:49 +02:00
Siebrand Mazeland
5d72b600a1
Localisation updates from http://translatewiki.net .
2011-04-27 14:53:02 +02:00
Siebrand Mazeland
cb8eb4d307
Localisation updates from http://translatewiki.net .
2011-04-20 10:19:58 +02:00
Siebrand Mazeland
13ae3ab259
Localisation updates from http://translatewiki.net .
2011-04-18 13:41:15 +02:00
Siebrand Mazeland
5f3dbc3e98
Localisation updates http://translatewiki.net .
2011-04-17 20:30:47 +02:00
Siebrand Mazeland
409550e1dc
Localisation updates from http://translatewiki.net .
2011-04-13 15:48:18 +02:00
Siebrand Mazeland
396a0c08b3
Localisation updates from http://translatewiki.net .
2011-04-09 20:53:29 +02:00
Siebrand Mazeland
c50b06dd7e
Localisation updates from http://translatewiki.net .
2011-04-04 01:27:23 +02:00
Siebrand Mazeland
09523a19d7
Localisation updates from http://translatewiki.net .
2011-04-03 15:35:52 +02:00
Siebrand Mazeland
d2a2575648
Localisation updates from http://translatewiki.net .
2011-04-01 22:59:31 +02:00
Siebrand Mazeland
4ac471f380
Localisation updates from http://translatewiki.net .
2011-03-31 23:30:07 +02:00
Siebrand Mazeland
14456cbbb2
Fix gettext domain for messages in plugins "_()" to "_m()".
...
Some other i18n and L10n updates, too.
i18n/L10n review not complete.
2011-03-30 22:31:23 +02:00
Siebrand Mazeland
5502e535de
Localisation updates from http://translatewiki.net .
2011-03-26 12:21:36 +01:00
Evan Prodromou
83fb5e6023
Mass replacement of #-comments with //-comments
...
like leprous boils in our code. So, I've replaced all of them with //
comments instead. It's a massive, meaningless, and potentially buggy
change -- great one for the middle of a release cycle, eh?
2011-03-22 11:54:23 -04:00
Siebrand Mazeland
5bb6fae307
Localisation updates from http://translatewiki.net .
2011-03-18 20:59:45 +01:00
Siebrand Mazeland
69e11bb45e
Localisation updates from http://translatewiki.net .
2011-03-11 19:33:52 +01:00
Siebrand Mazeland
b9e2c72740
Localisation updates from http://translatewiki.net .
2011-03-08 02:18:32 +01:00
Siebrand Mazeland
7a9b989349
Localisation updates from http://translatewiki.net .
...
Location information removed from translation files with msgmerge --no-location to decrease size of files and reduce diff size. Unfortunately there does not appear to be a setting in msgmerge or msgattrib to remove the extracted comments ("#.") from translation files. If you do know of such a switch, please let me know!
2011-03-06 02:52:28 +01:00
Siebrand Mazeland
5fd9767e80
Localisation updates from http://translatewiki.net .
...
* Fix previous commit. Pot files were built against master instead of 1.0.x.
2011-03-03 18:39:12 +01:00
Craig Andrews
a3725de47b
handle_incoming -> handleIncoming
2010-09-03 17:50:29 -04:00
Craig Andrews
671b0f4cd9
format_notice -> formatNotice
2010-09-03 17:50:29 -04:00
Craig Andrews
f038eacca4
enqueue_incoming_raw -> enqueueIncomingRaw
2010-09-03 17:50:28 -04:00
Craig Andrews
e7a026091c
enqueue_outgoing_raw -> enqueueOutgoingRaw
2010-09-03 17:50:28 -04:00
Craig Andrews
b05ab5fc85
daemon_screenname -> daemonScreenname
2010-09-03 17:50:28 -04:00
Craig Andrews
764e0ab962
receive_raw_message -> receiveRawMessage
2010-09-03 17:50:28 -04:00
Craig Andrews
80176b0b2c
send_notice -> sendNotice
2010-09-03 17:50:28 -04:00
Craig Andrews
6a848bcc8a
send_message -> sendMessage
2010-09-03 17:50:28 -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
Brion Vibber
ddc7811a7b
Move XMPPHP from core extlibs to Xmpp plugin extlibs
2010-05-05 16:52:31 -07:00
Brion Vibber
5414396a2e
IM cleanup on 1.0.x branch:
...
* Fake_XMPP back to Queued_XMPP, refactor how we use it and don't create objects and load classes until we need them.
* fix fatal error in IM settings while waiting for a Jabber confirmation.
* Caching fix for user_im_prefs
* fix for saving multiple transport settings
* some fixes for AIM & using normalized addresses for lookups
2010-04-30 15:29:05 -07:00
Brion Vibber
2f4438fe24
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
actions/imsettings.php
lib/jabber.php
Made a quick attempt to merge the new JID validation into the XmppPlugin, have not had a chance to test that version live yet.
Should also move over the test cases.
2010-04-02 15:56:25 -07:00
Craig Andrews
714d920fae
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
classes/statusnet.ini
db/statusnet.sql
lib/jabber.php
lib/xmppmanager.php
2010-03-08 17:22:23 -05:00
Craig Andrews
c187bf5597
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
EVENTS.txt
db/statusnet.sql
lib/queuemanager.php
2010-02-24 20:52:45 -05:00
Craig Andrews
e9995b0f6a
Create IM plugin, Pluginize XMPP, Create AIM plugin
2010-01-27 13:48:35 -05:00