Commit Graph

11534 Commits

Author SHA1 Message Date
Siebrand Mazeland 224a7986af Localisation updates from http://translatewiki.net. 2011-01-14 12:11:10 +01:00
Siebrand Mazeland 380ca7187c Localisation updates from http://translatewiki.net. 2011-01-14 12:10:05 +01:00
Siebrand Mazeland 9da9504823 Fix typo in extension description. 2011-01-14 12:07:57 +01:00
Evan Prodromou 906f2ed023 Merge remote branch 'gitorious/0.9.x' into 0.9.x 2011-01-10 14:59:51 -05:00
Evan Prodromou 7ca57e32aa Merge remote branch 'gitorious/testing' into testing 2011-01-10 14:59:07 -05:00
Evan Prodromou ea8b086cb2 Merge branch 'moveaccount' of gitorious.org:~evan/statusnet/evans-mainline into moveaccount
Conflicts:
	scripts/moveuser.php
2011-01-10 14:57:50 -05:00
Evan Prodromou 566f7c42a5 normalize accounts and check for return in HTTP for moving 2011-01-10 14:56:15 -05:00
Evan Prodromou 4be9fe01bf move account-moving classes to their own libraries 2011-01-07 19:48:50 -05:00
Evan Prodromou 4690d0c0db first example of moving a user 2011-01-07 19:29:10 -05:00
Evan Prodromou 6389099671 Parse properties of links in XRD files 2011-01-07 19:29:10 -05:00
Evan Prodromou c3aca938a8 Add the Atom username to the XRD output 2011-01-07 19:29:10 -05:00
Evan Prodromou 1166f9d7c1 preserve activities in object 2011-01-07 19:29:10 -05:00
Evan Prodromou df18ba2fd9 let callers pass in an XMLOutputter to output to 2011-01-07 19:29:10 -05:00
Evan Prodromou 00516fc16f execution protection on discovery.php 2011-01-07 19:29:10 -05:00
Evan Prodromou 80065e6ece PHPCS linkheader.php 2011-01-07 19:29:10 -05:00
Evan Prodromou 70bbaa9a9b PHPCS discovery.php 2011-01-07 19:29:10 -05:00
Evan Prodromou a6a8a547ab move linkheader.php to core 2011-01-07 19:29:10 -05:00
Evan Prodromou 14fc0e589a move linkheader.php to core 2011-01-07 19:29:10 -05:00
Evan Prodromou 92d7a7b96f Move discovery library from OStatus plugin to core 2011-01-07 19:29:10 -05:00
Evan Prodromou 38652f1571 Merge branch 'newmenuplugin' into 0.9.x 2011-01-07 19:28:25 -05:00
Evan Prodromou 0ff7cc474f Merge branch 'newmenuplugin' into testing 2011-01-07 19:28:18 -05:00
Evan Prodromou 5d43923941 remove help link; Everyone => Public; Logo goes home 2011-01-07 19:27:59 -05:00
Brion Vibber 74a1c9def0 Fix error handling for missing group in apigroupmembership -- was trying to call methods on the variable before we checked it, which triggers PHP fatal error 2011-01-07 16:25:58 -08:00
Brion Vibber cb56f445b8 Ticket #2166: accept aliases for local group names in API
Also simplifies the code by using User_group::getForNickname instead of duplicating half of it :D
2011-01-07 16:23:54 -08:00
Evan Prodromou 16cf7d8d40 Show some menu fixup for settings for some themes 2011-01-07 19:22:27 -05:00
Evan Prodromou 66ed9c7f30 change 'Everyone' to 'Public' 2011-01-07 18:57:34 -05:00
Evan Prodromou 9af5040693 combine account and connect menus 2011-01-07 18:56:18 -05:00
Brion Vibber 5616bfb5ff Fix warning in subscribers/subscriptions list pages where we attempted to call free() an ArrayWrapper after it was used up, thus trying to forward the call to a nonexistent object.
Removed the free calls (unneeded since destructors now work), and added an error check w/ logging & an exception for future attempts to forward calls to nonexistent object.
2011-01-07 15:29:30 -08:00
Brion Vibber 35507cd039 Fix ticket #2392: sending invitation email fails when site name contains double quotes
Gotta escape quotes!
2011-01-06 17:43:00 -08:00
Brion Vibber 36711f305a Ticket #1968: fix favoriting, reply when using InfiniteScroll 2011-01-06 16:53:39 -08:00
Brion Vibber f97380fdb5 Fix regression in last year's update of InfiniteScroll -- having debug off caused breakage due to bad code interpreting every variable as a selector, and jQuery then failing when passed 'false'.
Note that the current version of the infinitescroll jquery plugin fixes this, but I'm not updating to it because the code's been altered from the upstream version, apparently to stop it from actually working as infinite scroll. WTF? :)
2011-01-06 16:36:57 -08: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 f2a43769e7 Fix for atom/activity streams parsing: feed's <activity:subject> was being taken at a higher priority than entry's <atom:author>, which broke OStatus group posting since we retired <activity:actor>.
Added test case to ActivityParseTests.
2011-01-06 15:13:38 -08:00
Brion Vibber edf8101b29 allow group join/leave commands in api posting, at least for the moment (no other way to do remote subscribe without a preexisting local id number via api) 2011-01-06 13:46:39 -08:00
Brion Vibber 281076d5f6 Fix for PHP notice spew in group creation via API: set default 'mainpage' in User_group::register() rather than forcing all callers to do it manually. 2011-01-06 13:22:44 -08:00
Zach Copley 77eda41030 Added Start/EndRegistrationTry events to Facebook Bridge's user registration 2011-01-06 12:15:59 -08:00
Brion Vibber 4b29d0ebb6 Merge branch 'testing-sig' of gitorious.org:~brion/statusnet/brion-fixes into testing 2011-01-05 16:04:32 -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
Zach Copley f3d48d2dfe Add README with intallation/upgrade instructions to the Facebook Bridge plugin 2011-01-05 15:34:10 -08:00
Brion Vibber f5650806cc Switch autoloader from '__autoload' magic function name to registering our function with spl_autoload_register(); fixes compat problem with PHPUnit 3.5+ which seems to break the old __autoload 2011-01-05 23:27:17 +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 75dd361d29 move profile to subgroupnav 2011-01-05 11:24:24 -08:00
Evan Prodromou 60d8fcd0e7 Revert "Revert "0.9.7alpha1""
This reverts commit fd20554651.

Conflicts:

	lib/common.php
2011-01-05 10:52:44 -08:00
Craig Andrews f5a4e35059 Add Dialog Axiata to SMS carriers 2011-01-05 13:13:45 -05:00
Brion Vibber 021fa25e8d Merge branch '0.9.x' into testing 2011-01-05 09:41:29 -08:00
Brion Vibber 19a3b28898 Remove json2 author's "don't hotlink my script pls" alert line from our local copy of json2.js :D
Added json2.min.js to the makefile so it can be updated easily when json2.js changes.
2011-01-05 09:39:36 -08:00
Evan Prodromou b1e42115da new menu layout plugin 2011-01-04 19:32:36 -08:00