Commit Graph

1272 Commits

Author SHA1 Message Date
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 9b75e162c7 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-10 10:07:52 -08:00
Brion Vibber 69b2f19b6f RequireValidatedEmailPlugin fixes: require email on registration form, tidy up i18n infrastructure. 2010-03-10 10:06:46 -08:00
Craig Andrews 9653cb9f0a Fix error logging 2010-03-09 21:26:48 -05: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
Zach Copley 311da86762 Use canonical URL for notification in RSSCloud plugin 2010-03-09 11:08:07 +00:00
Zach Copley d644f4148b Merge branch 'master' of git@gitorious.org:statusnet/mainline 2010-03-09 11:07:42 +00:00
Zach Copley 7afad469c2 Use canonical URL for notification in RSSCloud plugin 2010-03-09 11:07:24 +00:00
James Walker 7214db14fe wrong param order to strpos() 2010-03-09 01:24:21 -05:00
Craig Andrews 9466546705 On the OpenID settings page, allow users to remove trustroots. 2010-03-08 21:43:34 -05:00
Zach Copley 691c88bce8 Only allow RSSCloud subs to canonical RSS2 profile feeds 2010-03-08 23:12:15 +00:00
Zach Copley f8c5996758 Only allow RSSCloud subs to canonical RSS2 profile feeds 2010-03-08 23:11:52 +00:00
Craig Andrews 51a245f18c Added Memcached plugin (using pecl/memcached versus pecl/memcache) 2010-03-08 17:17:37 -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
Jeffery To 3f696ff0ed ldap_get_connection() to return null when passed a config with bad user/pw.
This mainly affects login; before if the user enters a valid username
but invalid password, ldap_get_connection() throws an
LDAP_INVALID_CREDENTIALS error. Now the user sees the regular
"Incorrect username of password" error message.
2010-03-08 13:14:41 -05:00
Brion Vibber 5355c3b7b5 OpenID fix:
- avoid notice on insert (missing sequenceKeys())
- avoid cache corruption on delete (user_id was missing from keys list, cache not cleared for user_id lookups)
2010-03-05 15:00:27 -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
root 982edc653f Another typo 2010-03-04 23:30:36 -05:00
Zach Copley b8001ea107 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-05 03:56:04 +00:00
Zach Copley e3c4b0c85d A better way to safely delete Foreign_links 2010-03-05 03:55:56 +00:00
Zach Copley 6aac7cc6cd Fix for errant deletion of all Twitter foreign_links 2010-03-05 03:55:39 +00:00
Zach Copley 6a377a4ba4 A better way to safely delete Foreign_links 2010-03-05 03:14:40 +00:00
Zach Copley 029b8c9014 Fix for errant deletion of all Twitter foreign_links 2010-03-05 02:27:01 +00: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 a6a056026d Dropping the earlier PubSubHubbub plugin; OStatus plugin is taking that portion over (with both internal and external hub options for user and group feeds).
Todo: add support for other feeds to OStatus PuSH hub implementation.
2010-03-04 17:33:56 +00: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 2a96d1d59d Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-03 16:27:19 -05: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
Zach Copley 339b0b0a4d Don't expose global Twitter consumer key and secret, because that would be idiotic. 2010-03-03 13:05:11 -08: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 e6fd387c94 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-03 13:38:31 -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
Zach Copley a82cd89a97 Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline:
  Using position relative only for the remote subscription in section
  Added group subscription button to groups mini list
  Added event hooks at the start and end of groups mini list
2010-03-03 10:28:45 -08:00
Zach Copley 61ada4558d Fix for disappearing 'connect' menu if xmpp and sms are disabled.
All 'connect' menu panels used to be optional, so Action tried to
figure out what the first item on the 'connect' menu should be.
This is no longer necessary because we have the non-optional OAuth
client connections panel now, which is not optional and can't be
turned off.
2010-03-03 10:19:14 -08: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
Brion Vibber 9801c60bea Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-03 09:33:38 -08:00
Brion Vibber 1e63fda669 Clean up OStatus mentions finding; separate regexes keeps the code paths a bit clearer. Also switched to hitting HTTP profile first; as the common case it'll be faster. 2010-03-03 09:32:25 -08:00
Brion Vibber ffa1931c9d Avoid warning/notice spew in XRD parser. Not all DOM nodes are elements. 2010-03-03 09:31:14 -08:00
Sarven Capadisli 11750e832f Added remote join action for group profile 2010-03-03 12:02:10 -05:00
Sarven Capadisli ea10805e3f Moved the remote subscription button to subscription mini list 2010-03-03 11:22:21 -05:00
Sarven Capadisli 1a4652b1ad Changed label text for remote subscription to something similar. Given
that this button will be used within context of subscriptions, 'New'
works along with the '+' icon.
2010-03-03 10:32:54 -05:00
Craig Andrews 358556057a Bump to phpCAS 1.1.0RC6 2010-03-02 23:25:34 -05:00
Zach Copley f7ba5566bc Make Facebook plugin look for API key and secret before doing anything 2010-03-02 18:27:37 -08:00
Zach Copley 32c08f53de Show global key and secret, if defined, in Twitter bridge admin panel 2010-03-03 01:49:14 +00:00
Zach Copley 08422dfa17 Remove double word from Twitter bridge README 2010-03-02 16:53:53 -08:00
Zach Copley 9520c0996d Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline:
  OStatus: save file records for enclosures
  Changed the geo location cookie Expire to Session.
2010-03-02 16:51:21 -08:00
Zach Copley ca21f1da86 - Have Twitter bridge check for a global key and secret if it can't
find one in the local config
- Refuse to work at all if the consumer key and secret aren't set
2010-03-02 16:49:29 -08:00
Brion Vibber 79ffebb51b OStatus: save file records for enclosures
Also stripping id from foreign HTML messages (could interfere with UI) and disabled failing attachment popup for a.attachment links that don't have a proper id, so you can click through instead of getting an error.

Issues:
* any other links aren't marked and saved
* inconsistent behavior between local and remote attachments (local displays in lightbox, remote doesn't)
* if the enclosure'd object isn't referenced in the content, you won't be offered a link to it in our UI
2010-03-02 16:36:08 -08:00
Brion Vibber ddf3614c84 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-02 13:38:10 -08:00
Sarven Capadisli e9c127ddd8 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-02 15:26:27 -05:00
Sarven Capadisli 1550d1004d Don't need to float the anchor 2010-03-02 15:24:07 -05:00
Brion Vibber 72460091dd Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing 2010-03-02 12:21:48 -08:00
Craig Andrews 380439ba77 Redirect to main page when transparent SSO is in place for the CAS plugin (which is what the user expects) 2010-03-02 15:10:30 -05:00
Brion Vibber b1ffbf17d3 Performance fix on Sphinx search results: use id instead of created timestamp for reverse date sorting; should give same result but doesn't trigger a filesort. 2010-03-02 12:06:40 -08:00
Sarven Capadisli e3c2b8e0b5 Refactored remote subscribe action in OStatus 2010-03-02 12:41:18 -05:00
Sarven Capadisli 88c33bbb57 Showing remote subscription button on the personal timeline 2010-03-02 12:35:27 -05:00
Sarven Capadisli 5abff91041 Generalized style for entity remote subscription action 2010-03-02 12:34:35 -05:00
Sarven Capadisli 623faf9f2d Just a label change. Since the user already went ahead with
subscribing, in this step we are just confirming the profile.
2010-03-02 09:57:28 -05:00
Zach Copley 9816b35063 Update Facebook plugin README with info about new admin panel 2010-03-02 00:38:00 -08:00
Zach Copley 40e1b249cf Initial Facebook admin panel 2010-03-01 23:31:56 -08:00
Zach Copley 1df8c2a44d Some wording / spelling fixes 2010-03-01 22:58:27 -08:00
Zach Copley 27a49361eb - Make 'Sign in with Twitter' optional
- Updates to the Twitter bridge plugin README
2010-03-01 22:41:07 -08:00
Zach Copley 82c9714fca Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline:
  High-priority OStatus fixes:
  OStatus: support @example.com/path/to/profile mentions as well as @profile@example.com (latter requires webfinger, former doesn't)
2010-03-01 21:54:53 -08:00
Zach Copley 871b3aa6c0 Remove un-needed config variable for enabling/disabling Twitter integration 2010-03-01 21:52:31 -08:00
Zach Copley 6b2d67216e Initial Twitter bridge admin panel 2010-03-01 21:35:24 -08:00
Brion Vibber c38ed1bb19 High-priority OStatus fixes:
* PuSHing out to multiple client services could fail; only first callback got reached
* Correction for re-sub request to a known sub
2010-03-01 18:48:45 -08:00