GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity
11,036 Commits 8 Branches 4 Tags 309 MiB
Commit Graph

521 Commits

Author SHA1 Message Date
Brion Vibber f1bfbece06 Merge branch '1.0.x' into schema-x 2010-10-18 15:26:20 -07: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