Commit Graph

1109 Commits

Author SHA1 Message Date
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
Evan Prodromou 961607bc5d Ignore non-atom updates links in Webfinger 2012-05-04 12:01:13 -04: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 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
Siebrand Mazeland 2b3b11fca6 Add translator documentation. 2011-06-06 00:34:57 +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 9f9f940833 Add translator documentation.
Change a few double quotes to single quotes.
2011-06-05 11:30:46 +02:00
Ian Denhardt 31b29fde50 Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
Conflicts:
	plugins/OStatus/actions/ostatusinit.php
2011-05-23 21:50:48 -04:00
Siebrand Mazeland 1d1a929718 Update translator documentation and L10n. 2011-05-20 16:03:53 +02:00
Siebrand Mazeland d4aef7a007 Localisation updates from http://translatewiki.net. 2011-05-05 23:24:49 +02:00
Siebrand Mazeland 4651c9d94a Fix L10n/i18n.
Some remaining people tag -> list.
Favor -> like
Update translator documentation.
Whitespace updates.
2011-04-29 18:59:47 +02:00
Siebrand Mazeland 5d72b600a1 Localisation updates from http://translatewiki.net. 2011-04-27 14:53:02 +02:00
Siebrand Mazeland 2f48f0f914 Localisation updates from http://translatewiki.net. 2011-04-21 20:54:12 +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 0d431cd6ee Localisation updates from http://translatewiki.net. 2011-04-18 00:38:35 +02:00
Siebrand Mazeland 5f3dbc3e98 Localisation updates http://translatewiki.net. 2011-04-17 20:30:47 +02:00
Siebrand Mazeland 4ab995dd1e Complete "people tag" to "list" in UI messages.
Update translator documentation accordingly.

Probably a few cases left where "tag[ged[" has to be replaced by "list[ed]".
2011-04-17 20:08:03 +02:00
Siebrand Mazeland 4c00b830bf Localisation updates from http://translatewiki.net. 2011-04-17 01:15:30 +02:00
Siebrand Mazeland c27b9c0722 Update translator documentation.
i18n/L10n updates.
Whitespace updates.
2011-04-15 15:07:35 +02:00
Shashi Gowda 53af608ef8 People tags -> Lists (only UI changes, for experimentation) 2011-04-14 19:49:42 +00:00
Siebrand Mazeland 409550e1dc Localisation updates from http://translatewiki.net. 2011-04-13 15:48:18 +02:00
Siebrand Mazeland 124070e63d Update punctuation for exceptions. 2011-04-13 15:13:14 +02:00
Zach Copley 43f542c3a2 Script to delete bad OStatus hub URIs (until we have better error handling for broken hubs) 2011-04-12 02:29:02 -07:00
Siebrand Mazeland 0644cdb6d0 Localisation updates from http://translatewiki.net. 2011-04-11 15:10:09 +02:00
Siebrand Mazeland b83e0fd0e8 Update translator documentation.
i18n fixes (gettext domain).
L10n updates.
Whitespace updates.
Some tabs to spaces.
2011-04-11 00:39:51 +02:00
Zach Copley e75c9988eb Merge branch 'people_tags_rebase' into 1.0.x
Conflicts:
	EVENTS.txt
2011-04-10 08:10:01 +00:00
Siebrand Mazeland 396a0c08b3 Localisation updates from http://translatewiki.net. 2011-04-09 20:53:29 +02:00
Shashi Gowda a0ac51c22f use notifyDeferred for tag/untag so that it gets queued offline 2011-04-09 17:18:33 +05:30
Shashi Gowda ad86eb78d3 Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
Conflicts:
	js/util.min.js
	lib/default.php
2011-04-07 23:13:45 +05:30
Evan Prodromou 36b331d469 Merge branch '1.0.x' into testing
Conflicts:
	plugins/Event/RSVP.php
2011-04-05 13:16:28 -04:00
Shashi Gowda 57198a7464 Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
Conflicts:
	actions/tagother.php
	lib/subscriberspeopleselftagcloudsection.php
	lib/subscriptionspeopleselftagcloudsection.php
2011-04-04 13:26:27 +05:30
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
Shashi Gowda 5a2bab07b2 Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
Conflicts:
	actions/tagother.php
	classes/Profile.php
	classes/Profile_tag.php
	js/util.min.js
2011-03-30 15:47:42 +05:30
Evan Prodromou a74eda4e9a don't send private notices over OStatus 2011-03-28 16:37:35 -04:00
Ian Denhardt d36f0707a4 Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline 2011-03-28 03:25:40 -04:00
Siebrand Mazeland 5502e535de Localisation updates from http://translatewiki.net. 2011-03-26 12:21:36 +01:00
Siebrand Mazeland 4e64bd4e5b Localisation updates from http://translatewiki.net. 2011-03-24 16:08:03 +01:00
Shashi Gowda bf121a695a Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
Conflicts:
	classes/Profile.php
2011-03-22 07:59:06 +05:30
Shashi Gowda 31c1177970 Merge branch '1.0.x' into people_tags_rebase
Conflicts:
	EVENTS.txt
	actions/peopletag.php
	actions/tagother.php
	classes/Notice.php
	js/util.js
	js/util.min.js
	lib/accountprofileblock.php
	lib/action.php
	lib/activityobject.php
	lib/command.php
	lib/personalgroupnav.php
	plugins/OStatus/OStatusPlugin.php
2011-03-22 07:56:25 +05:30
Brion Vibber 541dfa04fe Switch things from calling Group_member::join & leave & calling events manually to running through Profile::joinGroup() && Profile::leaveGroup(), with the events encapsulated. 2011-03-21 14:35:29 -07:00
Brion Vibber a390e3e888 Fixes for GroupPrivateMessage, OStatus due to changes in group output events, and some internal bugs using wrong vars 2011-03-18 15:00:02 -07:00
Siebrand Mazeland 5bb6fae307 Localisation updates from http://translatewiki.net. 2011-03-18 20:59:45 +01:00
Evan Prodromou 7cf12f093e Merge branch '1.0.x' into testing
Conflicts:
	lib/common.php
2011-03-17 09:20:32 -04:00
Ian Denhardt 27ef3b1d90 Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
Conflicts:
	actions/public.php
2011-03-15 12:42:58 -04:00
Shashi Gowda c335db4bbc OStatus support for people tags 2011-03-07 00:45:34 +05:30
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
Brion Vibber 641018e950 Merge branch 'master' into 0.9.x 2011-03-02 13:52:22 -08:00
Brion Vibber 9ad00f726f Add unsubscribe option to resub-feed.php 2011-03-02 12:49:37 -08:00
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
Siebrand Mazeland a86d293c93 Localisation updates from http://translatewiki.net. 2011-02-14 19:43:16 +01:00
Brion Vibber c92358fa7b add --all and --suspicious options for update-profile-data.php 2011-02-11 12:23:03 -08:00
Brion Vibber f30744c7c5 refactor for multi.... 2011-02-11 12:13:33 -08:00
Brion Vibber f7b431d60b woops 2011-02-11 12:08:35 -08:00
Brion Vibber 91535365b3 Work in progress: update-profile-data.php to update ostatus profile info from the current feed 2011-02-11 11:55:23 -08:00
Evan Prodromou dc424ab63a Merge branch 'master' of gitorious.org:statusnet/mainline 2011-02-10 22:23:06 -05:00
Brion Vibber b09276635c Merge branch 'master' into 0.9.x 2011-02-10 12:04:13 -08:00
Evan Prodromou 8fa44e58f9 Try not to wipe out good data with empty values in Ostatus_profile::updateProfile()
Output from 0.9.6 PuSH feeds seems to have a rump <author> but no
<activity:actor>. It was overwriting valid and useful data set up at
subscribe time.

This fix tries to avoid overwriting data. However, it may prevent
updates that delete data.

Bug: 3028
2011-02-10 09:39:40 -05:00
Evan Prodromou 10500e7f85 ensure*() functions throw exceptions for errors 2011-02-09 03:08:52 -05:00
Evan Prodromou 22e8893fba OStatus uses Plugin::path() 2011-02-03 11:09:26 -05:00
Siebrand Mazeland 308e615a3f Localisation updates from http://translatewiki.net. 2011-02-03 01:31:31 +01:00
Brion Vibber 9573f725c1 Merge branch '0.9.x' into testing 2011-01-31 11:08:15 -08:00
Siebrand Mazeland 3fc323f8f9 Localisation updates from http://translatewiki.net. 2011-01-31 00:04:03 +01:00
Siebrand Mazeland e6e402cefd Localisation updates from http://translatewiki.net. 2011-01-29 23:10:15 +01:00
Brion Vibber ee9e368aa8 Fix ticket #3016: when using non-AJAX form of the ostatus subscription initiation for non-local group joins, show the "group" field instead of a blank "user" field 2011-01-26 14:57:52 -08:00
Evan Prodromou 2a59453d4c Merge branch 'testing' into moveaccount 2011-01-17 17:34:03 -05:00
Evan Prodromou a3c08faddd Erroneous code ensuring Webfinger accounts
Ostatus_profile::ensureProfileURI() was accidentally falling through to
the default switch case, and was also calling common_log() incorrectly.
2011-01-17 17:32:44 -05:00
Evan Prodromou a2aa87fbff OStatusPlugin does discovery in Profile::fromURI() 2011-01-17 15:45:03 -05:00
Evan Prodromou 0fa57948f2 move linkheader.php to core 2011-01-16 17:15:26 -05:00
Evan Prodromou 7d1f609bf0 Move discovery library from OStatus plugin to core 2011-01-16 17:15:26 -05:00
Siebrand Mazeland f1820459a8 Localisation updates from http://translatewiki.net. 2011-01-15 01:30:01 +01:00
Evan Prodromou 5c25364141 remove extraneous <dl> and <dt> tags 2011-01-14 15:36:06 -05:00
Siebrand Mazeland 380ca7187c Localisation updates from http://translatewiki.net. 2011-01-14 12:10:05 +01:00
Brion Vibber 7ec456198a Ticket #2732: add some regression tests for groups to OStatus remote-tests.php
Note that these tests won't pass on master branch yet as the join/leave don't work, and there's a bug in Activity parsing which prevents interop between new feeds and old remote subscribers (both fixed in this branch).
2011-01-06 15:13:38 -08:00
Brion Vibber 1d15145993 Salmon signature checks on incoming slaps now check both old and new signature formats. 2011-01-06 00:01:42 +00:00
Brion Vibber 437ac120b0 Outgoing Salmon slaps now use the corrected signature format; if the first hit is rejected with an HTTP error, we try again with the old format.
(This is not 100% ideal; possibly should try to distinguish between server errors and rejections, etc.)
2011-01-05 23:54:16 +00:00
Brion Vibber 946a4ac17b Add test cases for internal change in Salmon signing; fix for the new code.
Updated sig passes Tuomas's verifier, which is a good sign
2011-01-05 23:26:39 +00:00
Brion Vibber e25c34a2b6 Salmon slap / magicsig test script
Given a notice in the local system, we package it up as an Atom entry and MagicSig it up.
We run the magicenv verification on it locally to make sure our own functions can decode it.
Optionally with --verify we can send to Tuomas Koski's verification test service (not sure if this is working 100%)
If given --slap= with a target Salmon endpoint, we'll sent it on and see if it liked it. (Note that StatusNet will reject if there's not a relevant mention, but will report acceptance for dupes so you can use a message that's already been delivered as a test.)
2011-01-05 14:27:53 -08:00
Brion Vibber 51d1535f15 Added doc comments on Salmon magicsig-related stuff to help in figuring out what's going on 2011-01-05 14:05:59 -08:00
Evan Prodromou 32eb4c5e2d Merge remote branch 'gitorious/0.9.x' into 1.0.x
Conflicts:
	lib/common.php
2010-12-30 15:52:08 -08:00
Evan Prodromou d3b10959f4 Merge branch '0.9.x' into noactor 2010-12-29 15:29:29 -08:00
Evan Prodromou b54ea6767a New event for Salmon including target 2010-12-27 10:51:59 -08:00
Evan Prodromou ab92496ddc Stop using <activity:subject> for atom feeds 2010-12-27 10:03:34 -08:00
Evan Prodromou 67bde86f7c accept bookmarks over PuSH 2010-12-23 09:42:42 -08:00
Brion Vibber 26baad63f2 Merge branch '0.9.x' into 1.0.x 2010-12-22 15:25:38 -08:00
Evan Prodromou 9a6ceb3303 Merge branch 'righttoleave' into 0.9.x 2010-12-22 11:22:51 -08:00
Brion Vibber f82dd4e14f Merge branch '0.9.x' into 1.0.x 2010-12-20 14:28:43 -08:00
Brion Vibber b83e7005ed Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
	plugins/OStatus/classes/FeedSub.php
2010-12-20 14:23:15 -08:00
Brion Vibber 46123e3754 *cough* don't commit the code that breaks your code that you used to test the debug code :D 2010-12-20 13:06:58 -08:00
Brion Vibber a4e2f38356 Slightly fancier debug code for PuSH hmac mismatches -- save the post to a temp file if feedsub/debug is on in config. 2010-12-20 13:05:17 -08:00
Ian Denhardt e36399974e Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
Conflicts:
	lib/action.php
	plugins/OStatus/actions/ostatusinit.php
2010-12-20 15:19:33 -05:00
Brion Vibber dd48bdb1c4 Logging helper for bogus hmacs on PuSH in -- record the url & hub with the err msg to help tell what broke 2010-12-20 10:48:02 -08:00
Brion Vibber c71d701a3f Logging helper for bogus hmacs on PuSH in -- record the url & hub with the err msg to help tell what broke 2010-12-20 10:46:23 -08:00
Evan Prodromou 16fc5314fb move code to get an author object for a feed to a library from Ostatus_profile 2010-12-17 13:09:37 -05:00
Brion Vibber e79034e163 Merge branch '0.9.x' into 1.0.x
Conflicts:
	plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
2010-12-16 15:56:19 -08:00
Siebrand Mazeland cf824621b9 Localisation updates from http://translatewiki.net. 2010-12-16 16:30:30 +01:00
Brion Vibber 0330bad688 Cleaner code to avoid a couple PHP notices from accessing uninitialized variables in ostatus profile discovery (these cases hit checking diaspora accounts) 2010-12-15 12:14:25 -08: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
Siebrand Mazeland 6bdce2b1e5 Localisation updates from http://translatewiki.net. 2010-11-30 21:35:25 +01:00
Siebrand Mazeland ee67a0673d Localisation updates from http://translatewiki.net. 2010-11-30 18:53:04 +01:00
Matt Lee adb98ce5d1 updated 2010-11-29 16:02:17 -05:00
Matt Lee 675d902cab updated 2010-11-29 16:01:19 -05:00
Matt Lee 3277523448 updated 2010-11-29 16:00:54 -05:00
Matt Lee 4da41d95ee updated 2010-11-29 16:00:17 -05:00
Matt Lee f4dd6c2916 updated 2010-11-29 15:58:41 -05:00
Matt Lee 67db18d30b updated 2010-11-29 15:57:28 -05:00
Matt Lee 432237178f updated 2010-11-29 15:55:58 -05:00
Siebrand Mazeland ed0e91c7a1 Localisation updates from http://translatewiki.net. 2010-11-29 20:28:28 +01:00
Evan Prodromou 005a14272d Make OStatusPlugin define push feed rel 2010-11-26 22:10:18 -05:00
Evan Prodromou fcc0825b14 Make userxrd part of the default hostmeta 2010-11-26 21:46:51 -05:00
Evan Prodromou 0a4911552e Move user xrd action to core and use hooks to extend
Moved the Webfinger user XRD action from the OStatus plugin to core.
Added hooks to add OStatus-specific stuff, but kept general stuff in
the core.
2010-11-26 21:38:38 -05:00
Craig Andrews 3f3b38766f move xrd and hostmeta out of the OStatus plugin and into core
add event for setting up hostmeta, and use them in the OStatus plugin
2010-11-26 21:12:14 -05:00
Brion Vibber b716d01a41 Merge branch '0.9.x' into 1.0.x 2010-11-03 16:09:49 -07:00
Siebrand Mazeland ec79572964 Localisation updates from http://translatewiki.net. 2010-11-03 00:04:26 +01:00
Siebrand Mazeland 973a48bded i18n/L10n fixes and translator documentation addded/updated. 2010-11-02 23:48:36 +01:00
Brion Vibber 0229c22d23 Merge branch '1.0.x' into schema-x 2010-11-02 15:02:55 -07: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 5a9bb0adc4 Tossing in a basic i18n message export to script code. Plugins can hook StartScriptMessage/EndScriptMessage, or directly add needed mappings in Action::getScriptMessages(). Exported entries are accessible as SN.msg(key) at runtime.
StatusNet core code now sets the tooltip text on .attachment.more links when they receive their attachment-expansion magic; this will override the hardcoded tooltip text saved from OStatus plugin when displaying timelines in the web UI.
2010-11-02 13:05:16 -07:00
Brion Vibber e7c7fd39fc Merge branch '1.0.x' into schema-x
Conflicts:
	plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
2010-10-28 16:27:53 -07: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 b483a0549f Merge branch '1.0.x' into schema-x
Conflicts:
	plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
2010-10-25 13:14:33 -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
Siebrand Mazeland 1545c1228b Localisation updates from http://translatewiki.net. 2010-10-23 20:50:55 +02:00
Brion Vibber 3b6f738ab7 Convert SamplePlugin to new-style table defs, tweak some stuff to test basic checkschema 2010-10-19 17:25:56 -07:00
Brion Vibber a67160e01e Merge branch '1.0.x' into schema-x
Conflicts:
	lib/common.php
2010-10-19 15:19:46 -07:00
Brion Vibber 3593f3f132 Merge branch '0.9.x' into 1.0.x 2010-10-19 15:18:07 -07:00
Brion Vibber f1bfbece06 Merge branch '1.0.x' into schema-x 2010-10-18 15:26:20 -07:00
Siebrand Mazeland 3c10602561 Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x 2010-10-18 22:11:33 +02:00
Siebrand Mazeland e6df1b19df Localisation updates from http://translatewiki.net 2010-10-18 22:03:29 +02:00
Brion Vibber 140308bb03 Merge branch '0.9.x' into 1.0.x 2010-10-18 12:49:20 -07:00
Brion Vibber aa80d8fee3 Clean up edge cases in OStatus FeedDiscoveryTest 2010-10-18 12:45:55 -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
Brion Vibber e04a6ef93e Make HTTP timeout configurable on OStatus's remote-tests.php (needs to be pumped up a fair amount when doing Salmon pings with queues off on the test boxes, especially without the fast math library) 2010-10-18 11:27:22 -07:00
Brion Vibber 4c3aebd396 Merge branch '1.0.x' into schema-x 2010-10-15 11:40:40 -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 ecb582e419 accept profile URL as a LRDD identifier 2010-10-14 11:07:37 -04:00
Evan Prodromou 23ac961624 Show Webfinger, URI and profile page as subject and aliases 2010-10-14 11:06:57 -04:00
Brion Vibber 4101de7dd7 Merge branch '1.0.x' into schema-x 2010-10-13 15:46:45 -07:00
Brion Vibber bca215563f Clean up remote avatar temporary files if we fail before saving them into avatars directory (OMB core, OStatus, WikiHowProfile, YammerImport) 2010-10-13 11:10:04 -07: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 69b13cb279 Normalize execution guards on OStatus php files; mostly helps cut down on annoying 'class not found' errors when something spiders the dirs. :P 2010-10-08 10:42:59 -07:00
Brion Vibber 6c959c83ce Merge branch '0.9.x' into 1.0.x 2010-10-07 13:32:26 -07:00
Brion Vibber fd0768be29 Merge branch 'master' into 0.9.x 2010-10-07 13:30:34 -07:00
Brion Vibber 458f93bddd OStatus fixup-shadow.php: add check for user_group entries with 'uri' entry shadowing an actual local_group -- this can cause trouble now that we sometimes actually use the uri field for lookups, and leaving the entries around would break updating the table to fill out formerly missing uris, since the unique index entry would already be taken by the bad entry. 2010-10-07 11:26:07 -07:00
Brion Vibber a9654beb5d Fix regression in OStatus remote group delivery: local group check was bogus in updated Ostatus_profile::localGroupFromUrl() 2010-10-07 10:56:10 -07:00
Brion Vibber 99194e03fa Merge branch '1.0.x' into schema-x
Conflicts:
	plugins/OStatus/classes/Ostatus_profile.php
2010-10-06 17:16:13 -07:00
Brion Vibber 8ff45823ba Merge branch '0.9.x' into 1.0.x 2010-10-05 11:40:49 -07:00
Siebrand Mazeland 007866d340 Localisation updates from http://translatewiki.net 2010-10-05 00:59:47 +02:00
Brion Vibber f58008ebaf Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x 2010-10-04 15:22:02 -07:00
Brion Vibber d6b3d7fb1a Fix unescaped dollar signs in double-quoted strings due to localization updates (%1$s etc) 2010-10-04 14:24:04 -07:00
Brion Vibber 2295bbec9e Extra debug helper line in push callback 2010-10-04 14:22:32 -07:00
Brion Vibber 5c4723919f Merge branch '0.9.x' into 1.0.x 2010-10-04 13:06:40 -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
Brion Vibber 5b49366f49 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
	plugins/AnonymousFave/AnonymousFavePlugin.php
2010-10-04 11:42:16 -07:00
Brion Vibber 5dee862b2c Fix broken code in OStatus feed maint/test scripts (using field name from older dev code, would load up wrong record) 2010-10-04 10:27:03 -07:00
Siebrand Mazeland 458512aafd Localisation updates from http://translatewiki.net 2010-10-03 22:46:38 +02:00
Siebrand Mazeland 08054e85fe Localisation updates from http://translatewiki.net. 2010-10-01 22:34:59 +02:00
Brion Vibber 1acc7d66c6 Always specify UTF-8 targt charset for html_entity_decode(); default is 8-bit ISO-8859-1 which causes things to break when we later pass them through things that expect to work with UTF-8. For instance, running through preg_replace() with the /u option results in NULL, leading to problems with OStatus and SubMirror generating their plaintext versions and doing length-cropping. 2010-09-30 11:29:31 -07: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
Siebrand Mazeland 430d1da976 Update POT files. 2010-09-28 00:03:06 +02:00
Brion Vibber 7c4fcefd31 Enhanced OStatus fixup-shadow.php cleanup script to check for direct matches against user.uri and user_group.uri (for local groups). This should catch cases that were missed before because we were only doing pattern-matching checks, and the pattern didn't match because the site has been renamed and the old URI no longer matches the current domain / path structure.
Could use some more thorough testing in practice!
2010-09-27 14:23:10 -07:00
Brion Vibber 80e0e60c37 Add a comment in UserxrdAction warning future maintainers not to break domain migrations if adding domain checking to the webfinger lookup in future. 2010-09-27 11:38:26 -07:00
Brion Vibber 617b6f4f7d User user_group.uri to look up local groups for OStatus addressing checks when available. Will still fall back to the URL-scheme-checking code if there's no matching user_group record.
Should help with keeping remote groups working when renaming sites -- as long as user_group.uri has been filled out on the site changing its domain and other issues with POST handling are resolved.
2010-09-27 11:29:54 -07:00
Siebrand Mazeland 870be512d2 Update POT files for plugins. 2010-09-23 00:37:16 +02:00
Evan Prodromou b5cfcba471 Merge branch '0.9.x' into activityexport
Conflicts:
	plugins/OStatus/OStatusPlugin.php
2010-09-22 10:45:34 -04:00
Evan Prodromou f7ec40fa42 make some static functions public for OStatus_profile 2010-09-21 06:13:19 -04:00
Brion Vibber f9e04993dd Bump up HTTP timeout for OStatus remote-tests.php to 60 seconds; when running without queues and with only bcmath, salmon key generation is absurdly slow. 2010-09-20 16:26:50 -07:00
Siebrand Mazeland c932c0fdc1 Update pot files for plugins. 2010-09-19 17:44:29 +02:00
Siebrand Mazeland 5a6f616206 * i18n/L10n update
* translator comments added
* remove superfluous whitespace
2010-09-19 15:17:36 +02:00
Siebrand Mazeland 8135f7d960 Update pot files for plugins. 2010-09-19 00:24:48 +02:00
Brion Vibber 097d0bd2fa Ticket #2731: Fix for regression in posting to remote groups (regression in 2d4e0693c8)
Changes in 2d4e0693c8 changed Ostatus_profile::filterReplies() (which sorts out the local, remote, and group recipients on incoming remote messages) from checking for remote profiles with a safe call to Ostatus_profile::staticGet() to calls through Ostatus_profile::ensureProfileURL() and Ostatus_profile::ensureWebfinger(), which throw exceptions and thus abort processing.
Since this was done before checking for local groups, the filter would fail when the ensure* functions determined it was looking at a local group and rightfully refused to create a remote group profile for it.

Changing the calls to the ensure* functions was done so we can record remote reply recipients for future reply-to-reply processing (the staticGet() call was a cheaper way to do a lookup when we knew we only actually had to process groups that somebody signed up to); most important fix is simply to actually check for the exception! :)

Here I'm changing the order of processing so we do the local group lookup first -- where it's nice and safe -- and then when we do the remote checks, we'll go ahead and gracefully skip that entry if the full remote lookup fails, so we'll still process any following recipients.
2010-09-16 14:43:27 -07:00
Evan Prodromou 670ad53215 Merge branch '0.9.x' into activityexport 2010-09-15 23:31:20 -04:00
Siebrand Mazeland db1d348135 Update/add pot files for plugins. 2010-09-15 01:16:45 +02:00
Evan Prodromou a881ce23e7 note on why we don't use Group_member::asActivity() in OStatusPlugin 2010-09-14 11:02:54 -04:00
Evan Prodromou d9b959fc64 move code for making activities from OStatus plugin to Subscription and Fave classes 2010-09-13 11:44:20 -04:00
Siebrand Mazeland a9fad9a7ac Add translator hint. 2010-09-12 17:08:49 +02: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
Brion Vibber f2574fdd01 Fix for #2663: fix for original/96px-size avatars getting saved with bad permissions, causing failure to see images if background queues are different user from web server.
The original-size file is now forced to 0644 (all-readable), which should help. Not sure this is 100% ideal, but it's better than 0600!
(The other sizes were being created in other code and had sane read perms already.)

Watch out for similar issues in Twitter bridge etc; avatar import code should get cleaned up and consolidated.
2010-09-07 16:52:02 -07:00
Craig Andrews 8d54809c35 move xrd and hostmeta out of the OStatus plugin and into core
add event for setting up hostmeta, and use them in the OStatus plugin
2010-09-07 13:45:52 -04:00
Craig Andrews 6fe2429c41 Fix syntax error 2010-09-05 17:31:46 -04:00
Evan Prodromou 4aac47de03 syntax error in exception string in discovery.php 2010-09-03 01:41:01 -04:00
Siebrand Mazeland 1bfbe9badf * i18n/L10n updates and FIXMEs added
* whitespace fixes
2010-09-03 01:35:04 +02:00
Evan Prodromou 82b1d6daef Merge branch 'swat0' into 0.9.x 2010-09-02 16:58:55 -04:00
Evan Prodromou ebcd8644a5 Revert "debugging replyToID"
This reverts commit bb9353f6e0.
2010-09-01 18:22:54 -04:00
Evan Prodromou bb9353f6e0 debugging replyToID 2010-09-01 17:59:49 -04:00
Evan Prodromou 27626c3abf Correctly check for user's id in replies in user salmon post 2010-09-01 17:10:29 -04:00
Evan Prodromou ab88123373 correctly return oprofile from Ostatus_profile::ensureProfileURI() 2010-09-01 17:05:11 -04:00
Evan Prodromou 2d4e0693c8 save URIs of remote profiles marked for attention 2010-09-01 16:17:18 -04:00
Evan Prodromou 3baff9aa98 Handle profile-from-uri hook to return ostatus profile if there's a match 2010-09-01 16:16:38 -04:00
Evan Prodromou c82b1cda82 send a salmon slap to mentioned person when we reply to a notice 2010-09-01 14:35:43 -04:00
Evan Prodromou 468a15db00 Merge branch 'master' into 0.9.x 2010-09-01 14:21:36 -04:00
Evan Prodromou 8ebb858964 remove noop function from OStatusPlugin 2010-09-01 14:21:24 -04:00
Evan Prodromou a507f04bc4 fix incorrect function name in updateostatus.php script 2010-08-25 12:32:10 -04:00
Brion Vibber aff54d8efb Managed_DataObject initial sketches (pulling Drupal-style schema def into the data that DB_DataObject and Memcached_DataObject use; not yet functional. Converted OStatus_profile for demo.) 2010-08-16 14:02:31 -07:00
Brion Vibber b77c029aa8 Merge branch 'testing'
Conflicts:
	plugins/OStatus/classes/Ostatus_profile.php
2010-08-16 10:06:52 -07:00
Evan Prodromou 5110275a38 fix use of activity rather than act in salmonaction subclasses, too 2010-08-16 10:03:44 -07:00
Evan Prodromou 54b93aede6 typo mixing up and in salmonaction 2010-08-16 10:03:38 -07:00
Evan Prodromou 926c77246b Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
	plugins/OStatus/classes/Ostatus_profile.php
2010-08-13 14:35:49 -07:00
Evan Prodromou 029aa0c61c fix use of activity rather than act in salmonaction subclasses, too 2010-08-13 14:18:54 -07:00
Evan Prodromou 8dec16aeeb add hooks to allow plugins to handle different kinds of activities 2010-08-13 13:14:47 -07:00
Evan Prodromou 4217277d14 typo mixing up and in salmonaction 2010-08-13 13:07:25 -07:00
Brion Vibber 16f75b95c6 Fixes for RSS subscriptions: accept posts with no ActivityStreams object-type set; be more liberal about accepting posts from feeds where the author info doesn't match (we'll post under the feed's profile and just not try to update the profile info). 2010-08-13 12:23:42 -07:00
Brion Vibber f7b2bb09e6 Suppress whinging during HTML parsing in profile page discovery for things that turn out to be XML feeds with funny namespaces. 2010-08-13 12:23:28 -07:00
Brion Vibber 185f18024a Fixes for RSS subscriptions: accept posts with no ActivityStreams object-type set; be more liberal about accepting posts from feeds where the author info doesn't match (we'll post under the feed's profile and just not try to update the profile info). 2010-08-13 11:41:44 -07:00
Brion Vibber 115231f917 Suppress whinging during HTML parsing in profile page discovery for things that turn out to be XML feeds with funny namespaces. 2010-08-13 10:51:00 -07:00
Brion Vibber 08fc6053ec Fix for regression with OStatus mention processing (duplicated new and old style lead to trying to save a reply entry twice). 2010-08-10 13:49:11 -07:00
Brion Vibber 4fdfc6b1ce Fix for FeedDiscovery test cases: note that some test cases with relative URLs fail that include a schema but not a host. Not 100% sure those are legit, need to check. 2010-08-10 13:19:27 -07:00
Brion Vibber 9a53be4669 Initial support for third-party fallback hub such as Superfeedr for feed subscriptions.
If set up, this hub will be used to subscribe to feeds that don't specify a hub of their own.
Assumes that the fallback hub will, in fact, handle polling and updates for any feed we throw at it!
Authentication may be specified for the fallback hub.

Example:

  $config['feedsub']['fallback_hub'] = 'https://superfeedr.com/hubbub';
  $config['feedsub']['hub_user'] = 'abcd';
  $config['feedsub']['hub_pass'] = 'ckcmdkmckdmkcdk';

Also:
* Fix for WordPress-RSS-via-Superfeedr-Atom; if we have <author> info but no ID from a native ActivityStreams actor, don't freak out in the low-level processing code that checks for identity matches.
* enhanced messages for low-level FeedSub exceptions if they make it to outside display
2010-08-10 12:57:40 -07:00
James Walker c8a706081e strip whitespace from me:data and me:sig (per spec) 2010-08-07 09:48:21 -04:00
Brion Vibber 7e55fc0044 OStatus/FeedSub: tweaked PuSH feed garbage collection so other plugins can declare usage of a low-level feed or an OStatus profile besides profile subscriptions & group memberships.
SubMirror: redid add-mirror frontend to accept a feed URL, then pass that on to OStatus, instead of pulling from your subscriptions.
Profile: tweaked subscriberCount() so it doesn't subtract 1 for foreign profiles who aren't subscribed to themselves; instead excludes the self-subscription in the count query.
Memcached_DataObject: tweak to avoid extra error spew in the DB error raising

Work in progress: tweaking feedsub garbage collection so we can count other uses
2010-08-06 11:49:52 -07:00
Evan Prodromou 2ba36fc242 Merge branch 'activityhooks' into 0.9.x
Conflicts:
	classes/Notice.php
2010-08-03 16:01:18 -07:00
Evan Prodromou f83171824f correctly show <source> for atom feeds 2010-08-03 15:50:21 -07:00
James Walker 8120842780 Fix for #2429 - move OStatus XML writing to XMLStringer 2010-08-02 16:42:28 -04:00
James Walker 56294016a7 fix #2478 - ensure all XRD documents get proper content-type headers 2010-08-02 14:47:13 -04:00
James Walker 517c7483d1 move to rel="salmon" (per latest spec) 2010-08-02 13:24:38 -04:00
Brion Vibber 1339f1f908 Commit hubprepqueuehandler.php -- fix for OStatus bulk output. 2010-07-12 14:24:43 -07:00
Brion Vibber d645b342ac Commit hubprepqueuehandler.php -- fix for OStatus bulk output. 2010-07-12 14:22:36 -07:00
Brion Vibber 21f253c584 Fix regression in OStatus remote group subscribe -- a bug was previously masked silently (call to nonexistent getProfileUrl() method on User_group -- now replaced with homeUrl() which does the thing we wanted here) 2010-06-29 10:31:30 -04:00
Brion Vibber d88b208edc Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
	plugins/OpenID/openid.php
2010-06-07 10:19:40 -07:00
Brion Vibber 41e9dba729 OStatus plugin: Rolling batch queueing for PuSH output to >50 subscribing sites. Keeps latency down for other things enqueued while we work... 2010-06-07 10:03:43 -07:00
Brion Vibber 8b9436e8ae Option to divert PuSH items directly to the target site's queue when local 2010-06-03 18:06:55 -07:00
Brion Vibber 5f4c6ec626 Skip enqueueing to outgoing bridges on incoming remote messages. Twitter, Facebook, RSSCloud, and OStatus checks were enqueued on these when they'd never do anything but churn the queue servers.
Notice::isLocal() can replace a number of manual checks for $notice->is_local being LOCAL_PUBLIC or LOCAL_NONPUBLIC.
2010-06-03 16:58:45 -07:00
Brion Vibber 6eae5d6a7e Merge branch 'testing' into 0.9.x 2010-05-21 13:15:08 -07:00
Brion Vibber cbf2e7cfea Avoid PHP notice about undefined array index when no avatar photo available from Google profile 2010-05-21 10:18:13 -07:00
Brion Vibber 7005ef6661 Merge branch 'testing' into 0.9.x
Conflicts:
	plugins/OpenID/openidlogin.php
2010-05-19 12:51:25 -07:00
Zach Copley 6187266205 - OStatusPlugin should return true if it doesn't need to handle source
attribution
- Remove stray break statement from NoticeList
2010-05-18 15:16:03 -07:00
James Walker 1999b836c0 accept either salmon endpoint (until they're unified in the spec) 2010-05-14 16:43:41 -04:00
James Walker 275002d88a allow hyphens in subdomains for webfinger addresses 2010-05-14 16:43:41 -04:00
Zach Copley ce177400f8 - OStatusPlugin should return true if it doesn't need to handle source
attribution
- Remove stray break statement from NoticeList
2010-05-06 21:48:12 +00:00
Brion Vibber e05415f621 Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
	locale/ca/LC_MESSAGES/statusnet.po
	locale/de/LC_MESSAGES/statusnet.po
	locale/statusnet.pot
2010-05-05 17:07:50 -07:00
Brion Vibber 5f5d9518bd Avoid spewing giant debug backtrace into exception in certain OStatus subscription failure cases.
The code pattern 'new XXXException($e)' to chain exceptions doesn't actually work as intended, as exceptions are actually expecting a string message here.
This caused an implicit string conversion from HTTP_Request2_Exception, which is a PEAR_Exception, which defines an absurdly detailed __toString() method including a giant HTML table with a backtrace if you happen to be on a web request.
Simply passing $e->getMessage() instead clears this up, as we'll get the nice short message like 'Couldn't connect to tcp://blahblah:80'
2010-05-04 17:11:43 -07:00
Brion Vibber 67eeaa9cf4 Pull localization updates from 0.9.x branch 2010-05-03 12:27:44 -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
Brion Vibber ae2986527c Pull localization updates from 0.9.x 2010-04-29 15:52:10 -07:00
Brion Vibber 2260d6ec7c Merge branch 'testing' into 0.9.x
Conflicts:
	index.php
2010-04-29 15:14:51 -07:00
Brion Vibber 9c8052e755 Rerun feed discovery and update the feed, salmon, and hub for the given OStatus remote profile. Restarts subscription fresh as well.
update-profile.php -sexample.com http://example.com/path/to/profile/url
2010-04-23 12:54:31 -07:00
Brion Vibber fd9d520aeb OStatus: CLI script to force a renewal on the given PuSH subscription. May help when we get out of sync with the hub.
php plugins/OStatus/scripts/resub-feed.php -smysite http://example.com/some/atom/feed
2010-04-22 06:14:40 +02:00
Evan Prodromou a129c455a2 Fix exceptions with bad gravatar URLs 2010-04-21 18:19:16 -07:00
Brion Vibber 056cce4b5e Merge branch 'testing' into 0.9.x 2010-04-19 19:46:46 +02:00
Brion Vibber acea534044 Disable the send-notice form at the top of the page OStatus subscription confirmation page to work around bugs in Cloudy theme.
This is really just a hack for the broken CSS in the Cloudy theme, I think; copying from other non-notice-navigation pages that do this as well. There will be plenty of others also broken.
2010-04-19 19:45:01 +02:00
Evan Prodromou 76cce8a3c5 Merge branch 'master' into 0.9.x 2010-04-07 10:46:23 -04:00
Brion Vibber d352e5f5c4 Handle attempt to subscribe a local user via their remote webfinger reference more gracefully.
The ensure* family of functions will now return an OStatusShadowException in this case, which gives us a pleasant error message instead of a giant exception backtrace when you do 'sub somebody@this.local.server'.

Can be extended later to allow actually using the local profile, since we could figure it out.
2010-04-06 16:35:24 -07:00
Brion Vibber 5dc169260d Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-04-06 15:22:23 -07:00
Brion Vibber 3ac3bc32fc Some localization cleanup and doc to aid in customization:
* added locale/en/LC_MESSAGES/statusnet.po to make it easier to start customizing English texts
* added notes to locale/README about customizing and how to disable languages you haven't customized
* renamed PO templates from *.po to *.pot to match general conventions and reduce confusion for people trying to find which file they're supposed to edit
2010-04-05 13:19:16 -07:00
Brion Vibber dbaa93d1aa Clean up and clarify output on fix-shadow.php 2010-04-05 11:21:17 -07:00
Brion Vibber df9eb4164a Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-31 12:48:24 -07:00
Brion Vibber 6046a6cc6a Include meta charset header in saved HTML file for long OStatus messages; without, DOMDocument::loadHTML assumed Latin-1 instead of UTF-8. 2010-03-29 16:29:57 -07:00
Brion Vibber 990bbea07e Include meta charset header in saved HTML file for long OStatus messages; without, DOMDocument::loadHTML assumed Latin-1 instead of UTF-8. 2010-03-29 16:27:50 -07:00
Evan Prodromou f0d905112e Merge branch 'master' into 0.9.x
Conflicts:
	lib/attachmentlist.php
2010-03-28 15:25:02 -04:00
James Walker 3227122ac3 move base64_url_(encode|decode) to static functions in Magicsig 2010-03-26 10:43:41 -07:00
Evan Prodromou 75b2bf2a4e Do ostatus queue first
We do the OStatus queue first, so if we're sending a notice to the
same server twice (e.g., with OMB), our richer and more featureful
notice comes in first.
2010-03-26 08:45:23 -04:00
Brion Vibber e91bf2b8a9 Tweak to OStatus long message cropping: use original source notice URL for the link in the text version, don't shorten the link for the HTML so we can append params to it in JS.
Conflicts:

	plugins/OStatus/classes/Ostatus_profile.php
2010-03-25 16:08:09 -07:00
Brion Vibber 013647f0ba Add doc comments on saveHTMLFile; drop the extra <div> wrapping the contents to make it easier to extract without getting extra markup. 2010-03-25 23:11:06 +01:00
Sarven Capadisli 8336e24179 Using &#8230; (hellip) instead of "more" for link text 2010-03-25 22:18:21 +01:00
Brion Vibber c11064a539 Updated 'more' anchor for attachments to do an XHR GET
Conflicts:

	lib/attachmentlist.php
	plugins/OStatus/classes/Ostatus_profile.php

Merge tried to delete things that it seems it shouldn't, very confusing order. Hope rest of the cherry-picking isn't a problem.
2010-03-25 14:15:54 -07:00
Brion Vibber ecb009bcf5 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-24 13:57:20 -07:00
James Walker 9e0b9857f4 Make sure we're requiring the library 2010-03-24 15:26:03 -04:00
James Walker cfca789b34 Updated Math_Biginteger from upstream - removing safe* workarounds 2010-03-24 15:18:41 -04:00
James Walker c4273f0ef3 Check for 0.9.0 bad keys from old Crypt_RSA library 2010-03-24 15:15:20 -04:00
James Walker 10410907a0 A bit safer checking in the keypair parsing 2010-03-24 14:27:35 -04:00
Zach Copley 7b1b6045e6 Look for the first object in the Activity 2010-03-24 00:00:55 -07:00
Brion Vibber fcf86b4fdf Improve legibility of OStatus remote tests output 2010-03-23 18:56:40 -07:00
Brion Vibber 9380eed794 add a general PuSHed post and an @-reply back to a subscribee by name to OStatus remote test cases 2010-03-23 18:44:54 -07:00
Brion Vibber 2ae61307bb Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-23 14:20:14 -07:00
Brion Vibber df8c9090c0 Add basic subscribe/unsubscribe test to OStatus test cases 2010-03-23 14:19:12 -07:00
Brion Vibber 5f32cf32cd Don't spew XML parse warnings to output when checking a remote XRD page 2010-03-23 14:18:45 -07:00
Brion Vibber a5c78a6f1a Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-23 08:21:32 -07:00
Zach Copley 5b0b6097e0 Fix reference. Look at the first ActivityObject in the list. 2010-03-22 21:48:21 -07:00
Zach Copley b8e97ac709 Some initial media parsing
- Activity now returns a list of activity objects
- Processing of photo objects
2010-03-22 18:55:17 -07:00
Brion Vibber 68a5fba248 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-22 17:08:05 -07:00
Brion Vibber 3678e7b89b OStatus remote sending test cases. Doesn't actually run within PHPUnit right now, must be run from command line -- specify base URLs to two StatusNet sites that will be able to communicate with each other.
Current test run includes:
* register accounts (via web form)
* local post
* @-mention using path (@domain/path/to/user)

Subscriptions, webfinger mentions, various paths to subscription and unsubscription, etc to come.
2010-03-22 17:01:50 -07:00
Brion Vibber 26f49de0dd Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
	lib/attachmentlist.php
2010-03-22 12:37:45 -07:00
Brion Vibber 27bfd1211d Math_BigInteger doesn't correctly handle serialization/deserialization for a value of 0, which can end up spewing notices to output and otherwise intefering with Salmon signature setup and verification when using memcached.
Worked around this with a subclass that fixes the wakeup, used for the stored 0 value in the subclassed Crypt_RSA.
2010-03-22 12:17:45 -07:00
Brion Vibber 3bb639699c Confirm there's actually user and domain portions of acct string before assigning things from output of explode(); avoids notice message when invalid input passed to main/xrd 2010-03-22 11:27:39 -07:00
James Walker a20880ee1e Fixing HTTP Header LRDD parsing (sites in subdirectories need this) 2010-03-22 13:45:13 -04:00
Evan Prodromou edee1fc09e ignore unrecognized object types 2010-03-22 08:17:14 -04:00
Brion Vibber be7efe7504 Merge branch 'testing' into 0.9.x 2010-03-21 16:28:56 -07:00
Brion Vibber fcb614d0eb Pull <atom:author> info as well as <activity:actor> when we have an old-style ActivityStreams feed. This fixes subscription setup for Cliqset feeds, which currently have a bogus activity:actor/atom:id but a good atom:author/atom:uri 2010-03-21 16:25:12 -07:00
Brion Vibber b228da628d Accept 'tag' and other non-http id URIs in Ostatus_profile::getActivityObjectProfileURI().
(If there's not a valid ID we fall back to the link, which we do still validate as http/s.)
2010-03-21 15:46:28 -07:00
Brion Vibber 5d3bce49b8 OStatus profile setup cleanup
* drop OStatusPlugin::localProfileFromUrl(), we can just look up on user.uri
* clean up a few edge cases that returned null through Ostatus_profile::ensure* code paths, now throws clear exception when we can't find a feed from the given profile url
* add some doc comments on the ensure* methods
2010-03-21 15:18:37 -07:00
Evan Prodromou 0f1f7ab79b only use Posterous author data if it matches the profile URL 2010-03-21 07:37:58 -05:00
Evan Prodromou c2afdfbbf5 use Posterous element if available for RssChannel discovery 2010-03-20 17:18:55 -05:00
Evan Prodromou e458e9fe63 Merge branch 'testing' into 0.9.x
Conflicts:
	lib/activity.php
2010-03-20 16:11:42 -05:00
Evan Prodromou fb2b45c68a use feedEl for discovery 2010-03-20 09:46:22 -05:00
Evan Prodromou 515acb8513 fall back to summary or title if content not available 2010-03-20 09:30:57 -05:00
Evan Prodromou 25cb917523 Allow PuSH posts without author information
Superfeedr (sp.?) posts entries without author information. We can
assume that this is intended to be by the original author.
Re-structured the checks for entries that come in by PuSH so they can
either have no author or an empty author, but not a different author.
2010-03-20 08:25:56 -05:00
Evan Prodromou f558508784 handle RSS as well as Atom in Ostatus push hits 2010-03-20 07:23:13 -05:00
Evan Prodromou c0f6572001 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-20 06:44:55 -05:00
Evan Prodromou 51283a1b34 try to make a nickname from the user profile url before using the URI 2010-03-20 06:44:38 -05:00
Brion Vibber db0cf50f65 Avoid notices for accessing undefined array indices in hcard processing 2010-03-19 15:54:54 -07:00
Brion Vibber a02e5b302b Avoid notices for accessing undefined array indices in hcard processing 2010-03-19 15:54:16 -07:00
Brion Vibber 7e2af3dcae Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
	plugins/OStatus/extlib/hkit/hkit.class.php
	plugins/OStatus/lib/discoveryhints.php
2010-03-19 15:51:22 -07:00
Brion Vibber c84c4c6839 OStatus: be a little laxer about attempts to start/stop PuSH subscriptions that were left in an inconsistent state.
Instead of aborting, we'll try to reconfirm the sub/unsub, which once confirmed will replace whatever the previous state was on the server side.
2010-03-19 15:47:43 -07:00
Brion Vibber 79ec565104 Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing 2010-03-19 15:29:00 -07:00
Evan Prodromou db9e57f761 ensure from an RSS channel 2010-03-19 15:50:06 -05:00
Evan Prodromou 5092f98c0d return empty hints if no hcard in the html 2010-03-19 15:28:06 -05:00
Evan Prodromou 1e03968d91 define a 'root' attribute for the channel or feed 2010-03-19 15:23:30 -05:00
Brion Vibber b97400bd6f clarify output on fixup-shadow.php 2010-03-19 11:17:56 -07:00
Brion Vibber 3d1c99c258 Merge branch 'ostatus-crop' of git@gitorious.org:~brion/statusnet/brion-fixes into 0.9.x 2010-03-19 10:27:03 -07:00
Brion Vibber d2e6664132 Validate OStatus avatar URL before fetching. 2010-03-19 10:16:12 -07:00
Brion Vibber 9e3e1d3d56 Validate OStatus avatar URL before fetching. 2010-03-19 10:15:00 -07:00
Evan Prodromou ac609e8040 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Conflicts:
	plugins/OStatus/extlib/hkit/hkit.class.php
	plugins/OStatus/lib/discoveryhints.php
2010-03-18 20:57:38 -05:00
Evan Prodromou 17c50f338c Remove hkit and do our own hcard parsing
Parsing hcards for the data we need wasn't hard enough to justify using
hkit. It was dependent on a number of external systems (something to
run tidy), and only could handle XHTML.

We now parse HTML with the PHP dom libraries used elsewhere, and
scrape out our own hcards. Seems to work nicer and faster and most of
all works with Google Buzz profile URLs.
2010-03-18 20:52:00 -05:00
Brion Vibber 4a6c9e4451 Work around weird bug with HTML normalization via PHP DOM module; if source had xmlns and xml:lang I ended up with double output, breaking the subsequent parsing. Will have to track this down later and report upstream if not already resolved. 2010-03-18 17:57:58 -07:00
Brion Vibber 08faff2278 Work around weird bug with HTML normalization via PHP DOM module; if source had xmlns and xml:lang I ended up with double output, breaking the subsequent parsing. Will have to track this down later and report upstream if not already resolved. 2010-03-18 17:55:21 -07:00
Brion Vibber 3e2e88b0df Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-18 17:19:28 -07:00
Brion Vibber 1301877dfe OStatus discover fixes:
* Subscription::start was sometimes passing users instead of profiles to hooks, which broke OStatus subscription notifications; now normalizing to profiles for processing.
* H-card parsing would trigger a lot of PHP warnings and notices in hKit. Now suppressing warnings and notices for the duration of the call to keep them out of output when display_errors is on.
* H-card parsing would trigger a PHP fatal error if the source page was not well-formed XML and Tidy was not present on the system. Switched normalization to use the PHP DOM module which is always present, as we have no need for Tidy's extra features here.
* Trying to fetch avatars from Google profiles failed and triggered a PHP warning due to the relative URL not being resolved during h-card parsing. Now passing profile page URL into hKit by sneaking a <base> tag in while we normalize the HTML source.
* Profile pages without a "Link" header could trigger PHP notices due to a bad NULL -> array(NULL) conversion in LinkHeader::getLink(). Now checking that there was a return value before converting single return value into array.
2010-03-18 17:08:19 -07:00
Brion Vibber c8e3d08a8f Fix notice warning about unused var -- was renamed during refactoring. 2010-03-18 15:11:25 -07:00
Brion Vibber cac9d23498 Fix for xmpp/sms notification options appearing to be disabled on new subscriptions.
Base problem is that our caching-on-insert interferes with relying on column default values; the cached object is missing those fields, so they appear to be empty (null) when the object is retrieved from cache.
Now explicitly setting them when inserting subscriptions, and cleaned up some code that had alternate code paths.

May also have made auto-subscription work for remote OStatus subscribers, but can't test until magic sigs are working again.
2010-03-18 14:26:32 -07:00
Brion Vibber f1b3d84b7d Fix some remote subscription regressions from f21f78364a
Ostatus_profile::ensureProfile() has been renamed to Ostatus_profile::ensureProfileURL()
2010-03-18 13:13:57 -07:00
Brion Vibber 1de7badd78 Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing 2010-03-18 10:55:20 -07:00
Sarven Capadisli 052466ceab Using &#8230; (hellip) instead of "more" for link text 2010-03-18 14:26:30 +01:00
Evan Prodromou a764603e73 reverse order from delete, insert to insert, delete on ostatus conversion 2010-03-18 08:04:22 -05:00
Evan Prodromou f1af583e3e catch exceptions in OStatus updates, log, and continue 2010-03-18 07:55:14 -05:00
Sarven Capadisli d8a533274f Updated 'more' anchor for attachments to do an XHR GET 2010-03-18 00:19:32 +01:00
Brion Vibber dc71833ce6 Add doc comments on saveHTMLFile; drop the extra <div> wrapping the contents to make it easier to extract without getting extra markup. 2010-03-17 15:49:10 -07:00
Brion Vibber a9c731798e Tweak to OStatus long message cropping: use original source notice URL for the link in the text version, don't shorten the link for the HTML so we can append params to it in JS. 2010-03-17 14:16:43 -07:00
Brion Vibber 3a72c70b7e When too-long messages come in via OStatus, mark the attachment link up as a "more" link in the HTML output, marked with class="attachment more" so JS code can fold it out smartly. Text output will still include the raw link. 2010-03-17 12:34:35 -07:00
Brion Vibber 67f2f01c5e Merge branch 'testing' into 0.9.x 2010-03-17 12:15:40 -07:00
Evan Prodromou 4761c07ad8 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-17 09:38:39 -05:00
Evan Prodromou f21f78364a Change the workflow to get better discovery
Tried to re-structure the workflow of discovery to get more and richer
data and hints.
2010-03-16 11:25:18 -05:00
Brion Vibber 2b684f6954 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-15 14:39:14 -07:00
Brion Vibber dfac4bfd09 Fix feed discovery: html:link@rel can contain multiple values; saw rel="updates alternate" in the wild at http://tantek.com/ which broke old discovery code. 2010-03-15 20:26:42 +00:00
Brion Vibber c9232d8f26 Ticket #2242: fix reading of inline XHTML content in Atom feeds for OStatus input.
Lookup of the <div> needed to check for the XHTML namespace.
2010-03-15 20:21:55 +00:00
Brion Vibber c89e1865f7 Merge branch 'testing' into 0.9.x 2010-03-15 12:45:38 -07:00
James Walker 7aa49b5e87 use canonical user url in xrd 2010-03-15 15:17:31 -04:00
James Walker 85cf90cf0f Performing & allowing host-meta discovery by http url (in addition to webfinger acct) 2010-03-13 18:35:00 -05:00
James Walker 99ca84e68e changing keypair to text to hold a full 1024bit keypair 2010-03-13 15:46:54 -05:00
Brion Vibber 56402597dd Throw a quick button label into ostatus .po file for french to test with 2010-03-13 12:19:07 -08:00
James Walker 9111c5c6fe allow profile_url to be used in ostatus:attention 2010-03-13 14:36:51 -05:00
James Walker 135c0c8a7f cleaning up key generation 2010-03-12 21:44:18 -05:00
James Walker 4e44cf906b converting key generation to new crypt library 2010-03-12 20:02:00 -05:00
James Walker 520faaf67d updating phpseclib to latest cvs - fixes a bunch of key generation issues 2010-03-12 20:01:34 -05:00
James Walker c5bb41176e converted toString to new crypt library 2010-03-12 19:42:48 -05:00
James Walker 23d44c7d59 converted sign, verify and fromString to new crypt lib 2010-03-12 19:34:45 -05:00
James Walker 41d2ff662c Adding Crypt library from http://phpseclib.sourceforge.net/ 2010-03-12 19:34:24 -05:00
James Walker 114f046691 removing deprecated PEAR Crypt_RSA 2010-03-12 18:50:00 -05:00
Brion Vibber 9e9ab23e1f Fixes for updating indices, charset/collation and engine type on plugin-created tables.
Under MySQL, new tables will be created as InnoDB with UTF-8 (utf8/utf8_bin) same as core tables.
Existing plugin tables will have table engine and default charset/collation updated, and string columns will have charset updated, at checkschema time.

Switched from 'DESCRIBE' to INFORMATION_SCHEMA for pulling column information in order to get charset. A second hit to INFORMATION_SCHEMA is also needed to get table properties.

Indices were only being created at table creation time, which ain't so hot. Now also adding/dropping indices when they change.

Fixed up some schema defs in OStatus plugin that were a bit flaky, causing extra alter tables to be run.

TODO: Generalize this infrastructure a bit more up to base schema & pg schema classes.
2010-03-12 13:16:32 -08:00
Sarven Capadisli 4c320872d9 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-11 16:39:07 -05:00
James Walker 512e511053 fix invalid separator in magic-public-key XRD and matching parsing. 2010-03-11 14:49:12 -05:00
James Walker 06612e35e4 remove hard-coded me:env check in magicenvelope 2010-03-11 14:49:12 -05:00
James Walker 89582e7226 base64_encode/decode -> base64_url_encode/decode 2010-03-11 14:49:12 -05:00
Brion Vibber c6f09306b1 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-10 17:04:51 -08:00
Brion Vibber 66518df435 OStatus: reject attempts to create a remote profile for a local user or group.
Some stray shadow entries were ending up getting created, which would steal group posts from remote users.
Run plugins/OStatus/scripts/fixup-shadow.php for each site to remove any existing ones.
2010-03-10 17:00:05 -08:00
Brion Vibber 8bf1b54abd Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-09 13:07:52 -08:00
Brion Vibber 32532c7c42 Merge branch 'commands' into testing 2010-03-09 13:05:51 -08:00
Brion Vibber 80a17387bf Command input processing now has centralized places for looking up notice, user/profile, and group arguments.
OStatus plugin overrides these to allow using webfinger (user@example.com), profile URL (http://example.com/user) and bare profile URL (example.com/user) as arguments.
2010-03-09 13:03:32 -08:00
Brion Vibber 6c4ade4251 Merge branch 'testing' into 0.9.x 2010-03-09 11:27:53 -08:00
Brion Vibber 58192ad687 OStatus: fix exception thrown on HTTP error during feed discovery 2010-03-09 10:56:33 -08:00
James Walker 7214db14fe wrong param order to strpos() 2010-03-09 01:24:21 -05:00
Brion Vibber 42463e160d Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-08 13:37:45 -08:00
Brion Vibber 89e313e45b OStatus fix: send the feed's root element, not the DOM document, down to low-level feed processing as entry context on PuSH input. 2010-03-05 10:55:07 -08:00
Brion Vibber 2f41e93339 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-04 14:44:38 -08:00
Sarven Capadisli a4ec64ff45 Slight right alignment for remote button in minilists 2010-03-04 13:43:28 -05:00
Brion Vibber 7bd0b8e17e Pull latest .po files from 0.9.x to testing 2010-03-04 10:20:10 -08:00
Brion Vibber f969d6349c Merge branch 'testing' into 0.9.x
Conflicts:
	db/08to09.sql
2010-03-04 10:16:59 -08:00
Brion Vibber 8f1762cb95 OStatus: fix for remote group join via non-logged-in 'join' button.
Bad lookup was sending us to the first group instead of the selected group.
2010-03-04 09:24:47 -08:00
James Walker 45f11d9637 adding plugin version to OStatus 2010-03-04 12:02:44 -05:00
Brion Vibber b218aee94e Merge commit 'origin/testing' into 0.9.x
Conflicts:
	lib/action.php
	lib/adminpanelaction.php
2010-03-04 06:07:28 -08:00
James Walker ddc4a7d2ff Catch a previously uncaught exception and add some additional debug logs for signature verification 2010-03-04 01:46:34 -05:00
James Walker 9cbeac5695 Merge remote branch 'statusnet/testing' into testing 2010-03-04 01:31:19 -05:00
James Walker 849f5783c4 update xrd -> userxrd 2010-03-04 01:30:15 -05:00
Sarven Capadisli b97ac60209 Changed text for authorizing/confirming remote profile 2010-03-03 23:47:27 -05:00
Sarven Capadisli f54fa6b10b Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-03 23:36:05 -05:00
Sarven Capadisli 38503096d9 Puts All groups and Remote sub button in the mini list on the same line 2010-03-03 23:34:48 -05:00
James Walker 1c8399fde1 refactor xrd to allow for ownerxrd - xrd document for the site owner.
introduced $config['webfinger']['owner'] for a custom xrd subject
2010-03-03 23:20:30 -05:00
Sarven Capadisli 239750aa00 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-03 22:58:28 -05:00
Sarven Capadisli de687d00c0 Updated OStatus subscription error messages to be more user friendly.
Hopefully.
2010-03-03 22:56:50 -05:00
Brion Vibber 24835c1164 OStatus: catchable exception instead of fatal when parsing valid XML that isn't a valid XRD doc 2010-03-03 18:31:35 -08:00
Brion Vibber 14065ca350 OStatus: code cleanup on webfinger fallback path 2010-03-03 18:28:39 -08:00
Brion Vibber a4d9171306 Fix up catching of webfinger setup fails 2010-03-03 18:23:28 -08:00
Sarven Capadisli 6a5a629afa Updated label and note text for user and group remote subscribe forms 2010-03-03 20:08:55 -05:00
Brion Vibber 9fadf8da11 Put all required field setup into AtomUserNoticeFeed and AtomGroupNoticeFeed, consolidating some code. (RSS feeds pulling title, logo etc from the Atom data structure so we don't dupe it.)
OStatus now calling the feed classes directly instead of faking a call into the API, should be less flakey.
2010-03-03 16:33:20 -08:00
Sarven Capadisli b3969be85a Updated remote subscribe button style in aside 2010-03-03 17:48:00 -05:00
Brion Vibber 628338265c OStatus: fix up remote join button on group profiles 2010-03-03 14:06:05 -08:00
Brion Vibber 4bad176088 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-03 13:41:00 -08:00
Brion Vibber a42d1116db Separate the UI paths for ostatussub and ostatusgroup. They'll redirect to each other transparently if they find you've put a remote entity of the other type. 2010-03-03 13:40:26 -08:00
Sarven Capadisli 219e15ac64 Returning true instead for group remote subscription. If not logged
in, it gives the chance to use the logged in join/leave instead.
2010-03-03 16:26:02 -05:00
Sarven Capadisli d3c1888256 Generalized style for remote subscription button 2010-03-03 15:31:16 -05:00
Sarven Capadisli 3c55edde39 Showing the remote subscribe button on the user groups page 2010-03-03 15:30:43 -05:00
Evan Prodromou ccd0db1e0a add remote subscribe button for not-logged-in users looking a profile list with local users in it 2010-03-03 14:32:03 -05:00
Sarven Capadisli 023b9bb00f Renamed subscribe button from New to Remote since it only does remote
subscriptions at the moment.
2010-03-03 13:30:14 -05:00
Sarven Capadisli 7d7847295a Using position relative only for the remote subscription in section 2010-03-03 13:17:00 -05:00
Sarven Capadisli 2c9887bce5 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-03 12:57:03 -05:00
Sarven Capadisli c8bdf3cacb Added group subscription button to groups mini list 2010-03-03 12:56:19 -05:00
Brion Vibber f3cea24304 Fix for hcard parsing: typo caused notice spew accessing unset array index 2010-03-03 09:36:26 -08:00