Commit Graph

690 Commits

Author SHA1 Message Date
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
3b3671b228 Localisation updates from http://translatewiki.net. 2012-03-11 22:12:10 +01:00
Evan Prodromou
b4da5f3785 Merge branch 'master' into 1.0.x
Conflicts:
	plugins/Blacklist/BlacklistPlugin.php
2012-03-08 06:08:11 -06:00
Siebrand Mazeland
f34a196e83 Localisation updates from http://translatewiki.net. 2012-03-01 17:22:45 +01:00
Evan Prodromou
5b6ecef24b script to gc all feeds 2012-01-27 16:12:54 -05:00
Siebrand Mazeland
cebb565f18 Localisation updates from http://translatewiki.net. 2012-01-20 20:07:45 +01:00
Siebrand Mazeland
31305cb743 Localisation updates from http://translatewiki.net. 2011-12-28 14:00:49 +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
Evan Prodromou
9f954eddc5 remove unsupported hcard action 2011-09-27 11:43:41 -04:00
Siebrand Mazeland
e7dac240ef Localisation updates from http://translatewiki.net. 2011-09-26 00:01:00 +02:00
Evan Prodromou
0ee660af23 fix problem with using wrong arg to EndLeaveGroup event 2011-09-18 19:28:17 -04:00
Evan Prodromou
bba39c4aaf reorder routes for ostatus for better matches 2011-09-18 17:32:59 -04:00
Evan Prodromou
dbb7324b25 test for missing profile in ostatus queue handler 2011-09-18 14:36:49 -04:00
Evan Prodromou
2f1953ca25 Correct args for join event 2011-09-18 14:06:35 -04:00
Evan Prodromou
915dd9c9b5 Copy-and-paste error in OStatus button output 2011-09-18 12:44:16 -04:00
Evan Prodromou
f52d33753e problem with remote subscription on groups in OStatus 2011-09-17 17:28:01 -04:00
Siebrand Mazeland
83dc51ee79 Localisation updates from http://translatewiki.net. 2011-09-11 16:54:08 +02:00
Evan Prodromou
c5d332f40a move yet-another-rediscover-script to OStatus plugin 2011-09-07 16:56:38 -04:00
Siebrand Mazeland
7cfbe7c2d4 Localisation updates from http://translatewiki.net. 2011-08-30 11:50:01 +02:00
Evan Prodromou
01fd24ce6a Make joinAdd() explicit in OStatusPlugin::onStartProfileCompletionSearch() 2011-08-27 12:06:34 -04:00
Samantha Doherty
37bb0e6d20 Style cleanup for ostatus forms. 2011-08-26 12:51:55 -04:00
Siebrand Mazeland
ed13c9a098 Localisation updates from http://translatewiki.net. 2011-08-20 21:30:04 +02:00
Siebrand Mazeland
1fa689e913 tag -> list 2011-08-20 20:30:37 +02:00
Siebrand Mazeland
083e9773f2 Add translator documentation.
doxygen fixes.
2011-08-19 17:13:15 +02:00
Siebrand Mazeland
31556e3c00 Localisation updates from http://translatewiki.net. 2011-08-15 16:32:26 +02:00
Siebrand Mazeland
bd32b69355 Fix punctuation. 2011-08-15 16:18:21 +02:00
Siebrand Mazeland
7fcdc1a9ed Localisation updates from http://translatewiki.net. 2011-07-21 14:49:16 +02:00
Evan Prodromou
ebc5d6f676 fix call to Notice::saveNew() in Ostatus_profile::processShare() 2011-07-20 11:47:55 -04:00
Evan Prodromou
0ad7411343 Make process*() functions return existing or new notice 2011-07-20 11:33:28 -04:00
Evan Prodromou
0eeb175904 ID is a string 2011-07-20 11:13:25 -04:00
Evan Prodromou
17b1492690 better ID from shared activities 2011-07-20 11:11:05 -04:00
Evan Prodromou
e7ad9bf17a ensure a shared item's author element 2011-07-19 16:47:37 -04:00
Evan Prodromou
982426a790 handle incoming SHARE verbs 2011-07-19 15:20:06 -04:00
Zach Copley
6f0bd73e6c Squashed commit of the following:
Move OMB to a plugin

commit 75d21f00246bcc56d7f854936be1e28395e079a2
Merge: cea0199 d594d07
Author: Zach Copley <zach@status.net>
Date:   Fri Jul 15 11:16:54 2011 -0700

    Merge branch 'kill-omb2' of gitorious.org:~zcopley/statusnet/zcopleys-clone into kill-omb2

    * 'kill-omb2' of gitorious.org:~zcopley/statusnet/zcopleys-clone:
      Fix paths
      Oops, I left out the ability to authorize a token in ApiStatusNetOAuthDataStore
      Some odds and ends
      Remove omb stuff from queuemanager defaults
      Add check to make sure we're not untagging an OMB profile to OMB plugin
      Move some more subscription stuff and peopletag checks to OMB plugin
      Move some OMB-specific unsubscribe stuff to OMB plugin
      Finish removing libomb from core extlibs
      Fix more conflicts
      Fix queuing/queuehandling
      Move some stuff around; fix references
      Fix conflicts
      Move OMB-specific files to OMB plugin
      Move some stuff around; fix references
      Add OMB plugin README and rm references to OMB in mail StatusNet README
      Update paths
      Fix define
      Basic plugin finished
      Move OMB-specific files to OMB plugin
      Remove OMB stuff from router

commit cea019967f343042ebaea14b7bbb0d54289bcc1a
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 13 14:38:40 2011 -0700

    Fix paths

commit d412aa3c0ea0e21e65a72a16c7b9edd64ff373e1
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 12 18:17:06 2011 -0700

    Oops, I left out the ability to authorize a token in ApiStatusNetOAuthDataStore

commit b459c9f10ac283d6e774ef13f3293fc8a6948143
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 19:02:08 2011 -0700

    Some odds and ends

commit 895cfbfce58ffb3a05beebf48a90c549e00f1cce
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 19:01:23 2011 -0700

    Remove omb stuff from queuemanager defaults

commit b41b9e994f291ff83afb2460d9b37aee8ec1ec2b
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 18:46:44 2011 -0700

    Add check to make sure we're not untagging an OMB profile to OMB plugin

commit 94374d26ddd428dac8e4cd4541fd56db748c248b
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 18:34:20 2011 -0700

    Move some more subscription stuff and peopletag checks to OMB plugin

commit b91043b7820d5cd8b0ba4e9ee2a9d03c99248f11
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 16:37:25 2011 -0700

    Move some OMB-specific unsubscribe stuff to OMB plugin

commit d9430fe52975d9497b4a0d3d54da35b222e207ad
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 15:26:30 2011 -0700

    Finish removing libomb from core extlibs

commit bb6257eb85cc7ba392e91468c01503f51faeb989
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 13 12:47:32 2011 -0700

    Fix more conflicts

commit 3c760d0a4b4a083ae5fca2530d22aad5f4a9fdae
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 5 15:49:22 2011 -0700

    Fix queuing/queuehandling

commit ed635fa0c20e150673709c04ecc7f285d12e0ce2
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 5 15:29:35 2011 -0700

    Move some stuff around; fix references

commit cbc553a147941cad16e205a6b66ab4b32a5e3d3d
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 13 12:46:05 2011 -0700

    Fix conflicts

commit 5d77c81f75b57f5d5357d6b46d503650a4b3225d
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 19:10:38 2011 -0700

    Move OMB-specific files to OMB plugin

commit 2ed051dbce0ce9b44723b14922026849c39ed603
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 5 15:29:35 2011 -0700

    Move some stuff around; fix references

commit 8809b5e35b1aacb67d70ae3e55a43003b6f591b7
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 5 15:28:59 2011 -0700

    Add OMB plugin README and rm references to OMB in mail StatusNet README

commit 35ced4067c1915baca0b3e184f9533a91a951d2d
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 23:50:09 2011 -0700

    Update paths

commit 0ee5bafbce95fc9b8db98c1e828d33d26d08bc73
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 23:38:03 2011 -0700

    Fix define

commit e309dd22ffb9087d7fcf9180ede4f531dbd88c3c
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 23:30:43 2011 -0700

    Basic plugin finished

commit 00f1e930f27e080b04d1e82952f7886c84e01d97
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 19:10:38 2011 -0700

    Move OMB-specific files to OMB plugin

commit 39dcd031a79b49da0b4fe25f1594d2e406b5eb65
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 19:10:01 2011 -0700

    Remove OMB stuff from router

commit d594d071be1ec42518dd5465db61e01e7e8ec036
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 13 14:38:40 2011 -0700

    Fix paths

commit 48c1064b4b50e89cf51d2cab388f708f60601247
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 12 18:17:06 2011 -0700

    Oops, I left out the ability to authorize a token in ApiStatusNetOAuthDataStore

commit 1e1168978f38c31dbf0206b3493b2b6dcbe61589
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 19:02:08 2011 -0700

    Some odds and ends

commit ac43af2b497d8b9286c49a9469a1dff950e41650
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 19:01:23 2011 -0700

    Remove omb stuff from queuemanager defaults

commit 2471af2f8800515a3db544b3a186a18f3e8a43af
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 18:46:44 2011 -0700

    Add check to make sure we're not untagging an OMB profile to OMB plugin

commit df974646459ac6d5d97a40d008f1aab66f998226
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 18:34:20 2011 -0700

    Move some more subscription stuff and peopletag checks to OMB plugin

commit 8a1427b759e791c14a7a7a22128ba05f0b4b6d12
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 16:37:25 2011 -0700

    Move some OMB-specific unsubscribe stuff to OMB plugin

commit bd24220dbb5170af22ea0dea8a3062e6d1aeb6a2
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 15:26:30 2011 -0700

    Finish removing libomb from core extlibs

commit 4c3c6f1fabb0f2c92635ccc5e8f38db2293f5456
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 13 12:47:32 2011 -0700

    Fix more conflicts

commit db44deefd731a412685c5669c4c6fa69833de922
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 5 15:49:22 2011 -0700

    Fix queuing/queuehandling

commit ea2d84d2f3d518950d3aa1956ddc8f3a25ca55f3
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 5 15:29:35 2011 -0700

    Move some stuff around; fix references

commit 8ac3e010444b41bd9a78766f5e37e49dff023b45
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 13 12:46:05 2011 -0700

    Fix conflicts

commit 0aad6e10e3637b3189a87b42c24c1d6de1b346bc
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 19:10:38 2011 -0700

    Move OMB-specific files to OMB plugin

commit d982d7076c5cb28c7b8e4b1dde8d07d7e58e278f
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 5 15:29:35 2011 -0700

    Move some stuff around; fix references

commit 4b9d39c93562ff4c45c37c940013e8b78197dec1
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 5 15:28:59 2011 -0700

    Add OMB plugin README and rm references to OMB in mail StatusNet README

commit dab0fb6647a85e6835298496d7127a398b6b9293
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 23:50:09 2011 -0700

    Update paths

commit 2cb73dac8ad971f1545dcf6ba57746c777e232ef
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 23:38:03 2011 -0700

    Fix define

commit 6f226b18a059f175b1bdd3abcb8cb95eedc22ee7
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 23:30:43 2011 -0700

    Basic plugin finished

commit 7be304beaa0f39755c3978e0b852fde768950da4
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 19:10:38 2011 -0700

    Move OMB-specific files to OMB plugin

commit 5b30da01cfa2802d6e7a4a4a4f39b8043c54f472
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 19:10:01 2011 -0700

    Remove OMB stuff from router
2011-07-15 12:13:57 -07:00
Evan Prodromou
15dafffb3b Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-07-04 12:26:41 -04:00
Evan Prodromou
db85774f25 only update the avatar of an Ostatus_profile if it's a profile 2011-07-04 12:24:59 -04:00
Siebrand Mazeland
eb90389a22 Localisation updates from http://translatewiki.net. 2011-07-01 13:02:21 +02:00
Evan Prodromou
9f8d0b36a8 Merge branch '1.0.x' of git+ssh://statusnetdev.net/var/www/evan into 1.0.x 2011-06-30 15:44:11 -04:00
Zach Copley
2471f2092a Fix avatar saving for OStatus -- how did this ever work? 2011-06-29 19:03:16 +00:00
Evan Prodromou
da4ba6a5a9 reinstate lost replies code in OStatusQueueHandler 2011-06-29 13:51:19 -04:00
Evan Prodromou
7759aa51e6 extra logging for OStatus enqueuing 2011-06-29 13:20:18 -04: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