Commit Graph

2744 Commits

Author SHA1 Message Date
Samantha Doherty 8a87e9869f Show aside primary on settings pages for all themes. 2011-02-10 13:23:20 -05: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
Brion Vibber a76f067631 Partial revert of 073f3e99: restores the original non-hashbang URLs for twitter users as the remote profile.
Should fix issue #3027: twitter user avatars not getting imported.

Due to the change in URI, all twitter users that had been previously seen were getting new profile entries, which tried to save the same avatar. This would fail as Avatar.url has a unique index.
Note: now anything new seen in the last couple days in production will still potentially conflict.
2011-02-09 13:46:48 -08:00
Evan Prodromou c273876298 Merge branch 'master' of gitorious.org:statusnet/mainline 2011-02-09 03:09:24 -05:00
Evan Prodromou 10500e7f85 ensure*() functions throw exceptions for errors 2011-02-09 03:08:52 -05:00
Brion Vibber 75bf756111 LOG_WARN -> LOG_WARNING 2011-02-08 23:34:37 -08:00
Zach Copley 98af8d2a19 FacebookBridge plugin - allow Facebook app ID and secret to be
initialized via config.php
2011-02-09 04:49:39 +00:00
Evan Prodromou 399977aebf Merge remote branch 'origin/pluginstatic' into testing 2011-02-08 13:39:17 -05:00
Brion Vibber 1c3fabbc27 Add a brief explanation of what group inbox is at the top of the page (instructions section), plus a message to show when there are no private messages in the inbox. 2011-02-07 12:39:40 -08:00
Brion Vibber ac5e7b727a Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 2011-02-07 12:20:12 -08:00
Brion Vibber 4883069177 Fix group regexes that got missed in Nickname::DISPLAY_FMT update: fixes bug where group linking happened, but not actual delivery, when using _underscores_ in the !group_name 2011-02-07 12:18:41 -08:00
Evan Prodromou dbd496f901 hide feeds from group page if it's private-only 2011-02-07 14:24:35 -05:00
Evan Prodromou 204b5e8a63 Show a little indicator for private-only groups 2011-02-07 14:21:54 -05:00
Evan Prodromou 1d439ef5d8 Force notices to DMs when privacy = always 2011-02-07 12:58:42 -05:00
Evan Prodromou 80a4b9c76f Change category and copyright year 2011-02-07 12:28:58 -05:00
Evan Prodromou e759b15a92 pagination for group inbox 2011-02-07 12:08:18 -05:00
Evan Prodromou 20824292c9 Rename PrivateGroup to GroupPrivateMessage to be clearer 2011-02-07 11:57:34 -05:00
Evan Prodromou ee0bbdf89c Add group info to new group message email 2011-02-07 11:55:16 -05:00
Evan Prodromou 951df6b02f button on the group page to post a new message 2011-02-07 11:51:38 -05:00
Evan Prodromou 5db1479a95 Form for posting a group message on group inbox 2011-02-07 11:24:00 -05:00
Evan Prodromou 4a435e6670 Show group local nav on group inbox 2011-02-07 10:18:54 -05:00
Evan Prodromou 143cc4bdd0 Show private messages to groups in a list
Shows the messages to a private group in a list. New classes for
showing a group private message and list of group private messages.

New actions for showing a stream of group private messages and a
single group private message.
2011-02-07 09:46:26 -05:00
Evan Prodromou 842bc5708e Send a private group message with a d command 2011-02-04 15:51:59 -05:00
Brion Vibber 672eb17e94 Work in progress: partway through making profile_detail DB-accessible 2011-02-03 17:15:12 -08:00
Evan Prodromou a002d57736 save group privacy settings 2011-02-03 16:39:52 -05:00
Evan Prodromou 8bf57019c1 autoload private group classes 2011-02-03 15:30:57 -05:00
Evan Prodromou 094bb9e1c3 redo the group dm schema, again 2011-02-03 15:28:41 -05:00
Evan Prodromou 99db745f9d Merge branch 'testing' into privategroup
Conflicts:
	lib/groupeditform.php
2011-02-03 12:56:55 -05:00
Evan Prodromou 67b83bcca8 FacebookBridge use Plugin::path() 2011-02-03 12:22:39 -05:00
Evan Prodromou ffb7ca3e99 Realtime needs to load from own directory, not subclass's 2011-02-03 12:18:57 -05:00
Evan Prodromou 68cf2bdced Bookmark uses Plugin::path() 2011-02-03 12:04:54 -05:00
Evan Prodromou 77769e4b3c YammerImport uses Plugin::path() 2011-02-03 11:51:58 -05:00
Evan Prodromou 55af561887 ShareNotice uses Plugin::path() 2011-02-03 11:49:00 -05:00
Evan Prodromou 0c7104ec2f MobileProfile uses Plugin::path() 2011-02-03 11:46:20 -05:00
Evan Prodromou 26f0a24ab6 Merge branch 'testing' into pluginstatic 2011-02-03 11:42:58 -05:00
Evan Prodromou 70cf37cb88 fix variable name in NewMenu 2011-02-03 11:42:36 -05:00
Evan Prodromou 9ae3d3de36 NewMenu uses Plugin::path() 2011-02-03 11:41:47 -05:00
Evan Prodromou 27eeee08c1 FIXME for Plugin::path() in TinyMCE 2011-02-03 11:38:11 -05:00
Evan Prodromou 2195020566 TabFocus uses Plugin::path() 2011-02-03 11:30:14 -05:00
Evan Prodromou 50675e356b ModPlus uses Plugin::path() 2011-02-03 11:28:39 -05:00
Evan Prodromou 2f598f8c7b LinkPreview uses Plugin::path() 2011-02-03 11:25:56 -05:00
Evan Prodromou 3496559d8e InfiniteScroll uses Plugin::path() 2011-02-03 11:23:39 -05:00
Evan Prodromou 0ba450373d DirectionDetector uses Plugin::path() 2011-02-03 11:20:57 -05:00
Evan Prodromou 6494f5938c ClientSideShorten uses Plugin::path() 2011-02-03 11:19:03 -05:00
Evan Prodromou 0bab5e4a9e Autocomplete uses Plugin::path() 2011-02-03 11:16:30 -05:00
Evan Prodromou 22e8893fba OStatus uses Plugin::path() 2011-02-03 11:09:26 -05:00
Evan Prodromou c8386c7ecb TwitterBridge uses Plugin::staticPath() 2011-02-03 11:03:24 -05:00
Evan Prodromou 26407c3e35 Realtime plugin uses Plugin::path() 2011-02-03 10:58:06 -05:00
Evan Prodromou 0a6d2d24b1 MeteorPlugin uses Plugin::path() 2011-02-03 10:51:59 -05:00
Evan Prodromou 429cbb66b4 Mapstraction plugin uses Plugin::path() 2011-02-03 10:50:11 -05:00
Evan Prodromou 52c3c4468d BlankAd uses plugins server 2011-02-03 10:46:56 -05:00
Brion Vibber d1a96dc7af work in progress: prepping for storage of extended profile details 2011-02-02 17:29:34 -08:00
Brion Vibber 59f4734985 Edit page placeholder, link on main profile to details 2011-02-02 16:38:54 -08:00
Siebrand Mazeland 308e615a3f Localisation updates from http://translatewiki.net. 2011-02-03 01:31:31 +01:00
Brion Vibber 7a97243abf ExtendedProfile plugin initial checkin: stub mockup page 2011-02-02 16:23:24 -08:00
Zach Copley 317d22f565 Remove old Facebook Plugin (use FacebookBridge now) 2011-01-31 23:51:27 +00:00
Zach Copley c35d8e3a3e Remove old Facebook Plugin (use FacebookBridge now) 2011-01-31 23:50:22 +00:00
Zach Copley ad12384d8c FacebookPlugin: Fix up FBML canvas app so it keeps working after
Facebook removed Profile Boxes and some API calls it relied upon.
See: http://developers.facebook.com/roadmap/deprecations
2011-01-31 23:48:25 +00:00
Zach Copley 071d6e72e0 FacebookPlugin: Fix up FBML canvas app so it keeps working after
Facebook removed Profile Boxes and some API calls it relied upon.
See: http://developers.facebook.com/roadmap/deprecations
2011-01-31 23:47:33 +00: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
Evan Prodromou 1a96a5e695 create privacy settings on new group 2011-01-26 18:48:13 -07:00
Brion Vibber 54e98ffe22 Fix ticket #3013: MAX_FILE_SIZE hidden fields were incorrectly placed
In order to apply to PHP's POST processing, the MAX_FILE_SIZE field must appear *before* the file upload field. They were incorrectly placed after, where they had no effect on POST processing.
2011-01-26 15:49:57 -08:00
Brion Vibber 625405910f Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 2011-01-26 14:59:35 -08:00
Brion Vibber c65480fb33 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:59:24 -08:00
Samantha Doherty 1563c95cc3 Wee style update for bookmarks plugin. 2011-01-25 18:33:47 -05:00
Brion Vibber 621a7cb36d Merge branch '0.9.x' into testing 2011-01-25 12:57:49 -08:00
Evan Prodromou c309bbae93 Merge remote branch 'gitorious/testing' into testing 2011-01-24 06:54:09 -07:00
Evan Prodromou c2d7a08d07 Bookmark saving robustness fixes
First, if the tags box is empty, don't save an empty tag for the notice.

Second, if URL shortening fails, just use the regular URL.
2011-01-23 12:57:20 -05:00
Evan Prodromou 592e2be5e1 Make new menu the default menu
There's a new menu layout in this version of the software. It was
implemented as a plugin in 0.9.x to avoid clashes with existing themes,
but we're going to break that compatibility in this version, so we're just going for it.

This change involved moving all the changes in NewMenuPlugin into the
default code that was calling it. In addition, since
accountsettingsaction and connectsettingsaction differed only by menu,
I removed them, changed all references to them to the settingsmenu, and moved
the combined nav to its own class.

Let's put that episode behind us.

The CSS shim that was loaded by NewMenuPlugin for certain themes and certain actions
was removed.
2011-01-23 12:35:35 -05:00
Evan Prodromou b72fe00ae3 remove boilerplate from NewMenuPlugin 2011-01-23 12:03:28 -05:00
Evan Prodromou e53793edf4 make 'admin' a safe user name
'admin' is a pretty common username that people try when installing;
it was blacklisted because all of our admin panels were at /admin/*,
which would conflict with the admin user's namespace.

Changed the location of all admin panels to /panel/*, blacklisted the
nickname 'panel', and allowed 'admin'. Tested with a fresh install;
seems to work great.
2011-01-23 10:18:35 -05:00
Siebrand Mazeland 4642b024cc Localisation updates from http://translatewiki.net. 2011-01-22 20:17:19 +01:00
Brion Vibber 1f4b63d533 Add email field to Twitter registration form; needed when RequireValidatedEmail plugin is present.
Since Twitter doesn't provide email address back to us here, we only prefill the field if we have an invite.
2011-01-20 17:02:34 -08:00
Brion Vibber 06d895ee67 Add email field on openid registration; needed to register if RequireValidatedEmail plugin is also present. 2011-01-20 16:56:48 -08:00
Brion Vibber ddde99cd89 Event hook points needed for recaptcha on facebook login form (untested, but should be legit -- same adds as openid & twitter reg forms) 2011-01-20 15:55:36 -08:00
Brion Vibber c1e4be6ab9 Event hook points needed to run Recaptcha on Twitter registration 2011-01-20 15:49:57 -08:00
Brion Vibber 7a9040e360 Fix inconsistent use of 'name' vs 'fullname' in tw_fields member variable 2011-01-20 15:47:51 -08:00
Brion Vibber 7dc9d9c1fe Add Start/EndRegistrationData event hooks in finishopenidlogin: allows recaptcha to add its captcha display to the form (checked since addition of StartRegistrationTry) 2011-01-20 15:40:59 -08:00
Brion Vibber 6fa0bea76d Merge branch '0.9.x' into testing 2011-01-20 15:12:57 -08:00
Brion Vibber 6455461c19 Merge branch 'master' into 0.9.x 2011-01-20 15:08:31 -08:00
Evan Prodromou edeaf8a2f8 new group message layout 2011-01-20 16:08:22 -05:00
Brion Vibber 7c3f820ff0 Ticket #2999: RequireValidatedEmail plugin now also prevents group creation by unvalidated users. 2011-01-20 13:05:58 -08:00
Siebrand Mazeland 03acf301ba Localisation updates from http://translatewiki.net. 2011-01-20 21:12:51 +01:00
Evan Prodromou 4618641da2 data structures 2011-01-19 18:31:07 -05:00
Brion Vibber 963e7576f2 Merge branch 'testing' into moveaccount 2011-01-19 10:41:14 -08:00
Evan Prodromou 4c4d63ee16 Merge branch 'testing' into privategroup 2011-01-19 10:13:47 -05:00
Brion Vibber b1897e0190 viz cleanup on AddMirrorWizard 2011-01-18 18:13:24 -08:00
Brion Vibber aa901bb61c Work in progress: AJAXy interface for grabbing feed subscription helper detail forms.
Currently they all show the regular subform. :)
2011-01-18 18:01:57 -08:00
Brion Vibber ade2d04cb3 Work in progress on helper wizard for feed mirror discovery/setup 2011-01-18 15:58:28 -08:00
Evan Prodromou deffcc1442 non-working version of private groups 2011-01-18 16:55:51 -05:00
Brion Vibber b502755978 SubMirror: add mirrored feeds count & management link to stats section when showing your own profile sidebar. 2011-01-18 13:35:36 -08:00
Brion Vibber 56e2bc10d9 Cleanup stray PHP 4-style references in hook calls for navigation bars. We can't replace the live action from here, and don't need a reference to keep the object mutable. Dumping the references helps ensure we don't end up getting errors when things calling the hooks might forget to use the reference and the PHP error reporting settings expose this fact at us. 2011-01-18 12:34:27 -08:00
Brion Vibber d0d1257d99 SubMirror: switch the mirror setup tab from account settings to subscriptions/groups/invites area 2011-01-18 12:34:04 -08:00
Brion Vibber ea31051401 TwitterBridge fix: merge down remaining 64-bit Snowflake ID fixes for twitterstatusfetcher.php from 0.9.x
Original fixes in c169dcb5221cf3dd452c291bf97374bb459cc5b9; didn't get merged in 39cad55711 because the code had been broken out to another file, but manual merge went smooth.

These affect twitterstatusfetcher.php on all 32-bit installs and some 64-bit installs (depending on whether the version of the JSON library reads the large numbers as long or double internally). 64-bit bug is harder to see as it tends to manifest as off-by-one due to losing a bit of precision off the end.
2011-01-18 11:08:32 -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
Siebrand Mazeland 89727549a6 Localisation updates from http://translatewiki.net. 2011-01-15 00:47:49 +01:00
Siebrand Mazeland b59bc2f48b Add translator comments. 2011-01-15 00:31:26 +01:00
Siebrand Mazeland 2460301d24 Add punctuation for consistency. 2011-01-14 21:53: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
Siebrand Mazeland 9da9504823 Fix typo in extension description. 2011-01-14 12:07:57 +01:00
Evan Prodromou f9b2feb7f5 Merge branch '0.9.x' into 1.0.x
Conflicts:
	README
2011-01-12 18:05:56 -05: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 5d43923941 remove help link; Everyone => Public; Logo goes home 2011-01-07 19:27:59 -05: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 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
Zach Copley 77eda41030 Added Start/EndRegistrationTry events to Facebook Bridge's user registration 2011-01-06 12:15:59 -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 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
Brion Vibber d0d39b51b8 Fixes for RegisterThrottle plugin: alt registration methods (OpenID, FBConnect, Twitter) weren't triggering the throttle check or recording of IPs.
Added StartRegistrationTry/EndRegistrationTry calls into those three, and moved the actual recording hook to EndUserRegister which is guaranteed to be called from User::register (so we don't need to worry about other auth methods forgetting to call the other UI-code hooks).
2011-01-05 12:28:02 -08:00
Evan Prodromou 75dd361d29 move profile to subgroupnav 2011-01-05 11:24:24 -08:00
Evan Prodromou b1e42115da new menu layout plugin 2011-01-04 19:32:36 -08:00
Evan Prodromou 3dcf8f1ef6 change bookmark-info from a <p> to a <div> 2011-01-04 13:10:32 -08:00
Brion Vibber ae59046b1e Bookmark plugin: tweak post-upload success message to distinguish between "already done" (UnQueueManager) and "started, should finish eventually" (other queue manager) 2010-12-31 12:42:26 -08:00
Brion Vibber 3368c33be7 Bookmark plugin: fix for delicious import with queues enabled
We were passing DOM nodes directly into the queues for the final bookmark import stage; unfortunately these don't actually survive serialization.
Moved the extraction of properties from the HTML up to the first-stage handler, so now we don't have to worry about moving DOM nodes from one handler to the next. Instead passing an associative array of properties, which is fed into the Bookmark::saveNew by the per-bookmark handler.
2010-12-31 12:33:51 -08:00
Brion Vibber fedfde9bbb Bookmark plugin: fixes for bad DOM element nesting in delicious import data
delicious bookmark exports use the godawful HTML bookmark file format that ancient versions of Netscape used (and has thus been the common import/export format for bookmarks since the dark ages of the web :)
This arranges bookmark entries as an HTML definition list, using a lot of implied close tags (leaving off the </dt> and </dd>).
DOMDocument->loadHTML() uses libxml2's HTML mode, which generally does ok with muddling through things but apparently is really, really bad about handling those implied close tags.

Sequences of adjacent <dt> elements (eg bookmark without a description, followed by another bookmark "<dt><dt>"), end up interpreted as nested ("<dt><dt></dt></dt>") instead of as siblings ("<dt></dt><dt></dt>").
The first round of code tried to resolve the nesting inline, but ended up a bit funky in places.
I've replaced this with a standalone run through the data to re-order the elements, based on our knowing that <dt> and <dd> cannot directly contain one another; once that's done, our main logic loop can be a bit cleaner. I'm not 100% sure it's doing nested sublists correctly, but these don't seem to show up in delicious export (and even if they do, with the way we flatten the input it shouldn't make a difference).

Also fixed a clearer edge case where some bookmarks didn't get imported when missing descriptions.
2010-12-31 12:09:54 -08:00
Brion Vibber 5687531848 Bookmark plugin: graceful error out for failure to import a delicious bookmark due to it being already bookmarked 2010-12-31 12:09:15 -08:00
Evan Prodromou 5dfc9e1b18 Generated an extra class on bookmark notice <li>s 2010-12-30 16:57:28 -08:00
Evan Prodromou 5d7f5212f0 switch bookmark CSS classes to use dash instead of underscore 2010-12-30 16:54:01 -08:00
Evan Prodromou 7793d3b7ad Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 2010-12-30 16:21:45 -08:00
Evan Prodromou 682e11bb8b don't show some bookmark elements if empty 2010-12-30 16:21:22 -08:00
Brion Vibber b71a09a1a9 Tweak the post-form return on bookmarklet if we're not in a popup that we can close 2010-12-30 16:14:41 -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 6fc7e5b05b Use UUIDs for Bookmark unique ID
I was trying to generate URIs for Bookmarks based on (profile, crc32(url), created).

I failed at that. CRC32s are unsigned ints, and our schema code didn't like that.

On top of that, my code to encode and restore created timestamps was problematic.

So, I switched back to using a meaningless unique ID for Bookmarks.

One way to do this would be to use an auto-incrementing integer ID. However, we've been
kind of crabbed out a few times for exposing auto-incrementing integer IDs as URIs, so
I thought maybe using a random UUID would be a better way to do it.

So, this patch sets random UUIDs for URIs of bookmarks.
2010-12-30 13:21:14 -08:00
Evan Prodromou d3b10959f4 Merge branch '0.9.x' into noactor 2010-12-29 15:29:29 -08:00
Evan Prodromou 2d576aea30 don't distribute when restoring archived delicious bookmarks 2010-12-29 14:52:43 -08:00
Evan Prodromou 3fea4aba7f phpcs showbookmark.php 2010-12-29 14:24:30 -08:00
Evan Prodromou f3999ab92d phpcs noticebyurl.php 2010-12-29 14:22:41 -08:00
Evan Prodromou f5256eb028 phpcs importdelicious.php 2010-12-29 14:21:25 -08:00
Evan Prodromou b00d113bb4 phpcs Bookmark.php 2010-12-29 14:17:32 -08:00
Evan Prodromou 10fa41454d phpcs BookmarkPlugin.php 2010-12-29 14:16:15 -08:00
Evan Prodromou 68f44dad82 Add link to delicious bookmark importer to profile settings 2010-12-29 14:02:31 -08:00
Evan Prodromou 4a9a5076ff Web UI for importing delicious backup files 2010-12-29 13:51:59 -08:00
Evan Prodromou db43195fbf fixup date handling in showbookmark for PHP 5.2 2010-12-28 23:36:25 +00:00
Evan Prodromou dcd0e3ec7e show count of other bookmarks with link to stream 2010-12-28 13:45:24 -08:00
Evan Prodromou 821770966b Page with a list of notices that link to an URL 2010-12-28 12:58:10 -08:00
Evan Prodromou c8bbde69df import bookmarks from backups 2010-12-27 22:57:35 -08:00
Evan Prodromou 0a56e88a64 Don't double-insert a bookmark 2010-12-27 22:57:11 -08:00
Evan Prodromou 4465724ed3 return saved notice to AtomPub for Bookmarks 2010-12-27 22:16:34 -08:00
Evan Prodromou 7b9ea62259 Make AtomPub work for bookmarks 2010-12-27 22:09:29 -08:00
Evan Prodromou 6393326557 Merge branch '0.9.x' into socialbookmark 2010-12-27 20:49:31 -08:00
Evan Prodromou 141b4b67b3 Better UI for bookmark popup 2010-12-27 12:57:03 -08:00
Evan Prodromou 45b2059cd8 better layout for single-bookmark page 2010-12-27 12:08:55 -08:00
Evan Prodromou 29103f5d0e send and receive bookmarks by Salmon 2010-12-27 11:29:16 -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 4777c927ad Fix bookmark replies handling so doesn't overwrite 2010-12-27 09:14:11 -08:00
Evan Prodromou 14113b267e replace call to protected Ostatus_profile method 2010-12-26 21:38:28 -08:00
Evan Prodromou bf75119b3c Fix bugs in BookmarkPlugin 2010-12-26 21:25:26 -08:00
Evan Prodromou 7d56f1cd19 Some fixes from debugging of bookmark plugin URI foramt
Tightened up the URI format, fixed some auto-loading issues,
and forced the url_crc32 column to be unsigned.
2010-12-26 21:11:27 -08:00
Evan Prodromou ca28140107 remove debugging outputter from delicious backup importer 2010-12-26 21:10:54 -08:00
Evan Prodromou ea1676cb0a UTC only and tighter date format for showbookmark 2010-12-26 21:10:23 -08:00
Evan Prodromou 4048d1ec3d Radical differences in Bookmark storage
Had some problems with PuSH and Salmon use of Bookmarks; they were
being required to generate Atom versions of the bookmark _before_ the bookmark was saved.

So, I reversed the order of how things are saved, and associate notices and bookmarks
by URI rather than notice_id.
2010-12-24 20:34:15 -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 ae64963d71 Reformat bookmark output 2010-12-22 15:24:13 -08:00
Brion Vibber 8babcc2ad2 Makefile to compress LinkPreview's js 2010-12-22 15:04:50 -08:00
Evan Prodromou 1faaaed72b Move bookmark CSS to its own file 2010-12-22 13:08:07 -08:00
Evan Prodromou 402cac2f93 Merge branch '0.9.x' into socialbookmark
Conflicts:
	lib/activityobject.php
2010-12-22 12:09:42 -08:00
Evan Prodromou 9a6ceb3303 Merge branch 'righttoleave' into 0.9.x 2010-12-22 11:22:51 -08:00
Evan Prodromou 73dccdd7f5 Notice_bookmark::saveNew() takes a Profile argument 2010-12-22 12:35:45 -05:00
Evan Prodromou 6ff8977243 Bookmarklet for Bookmark plugin 2010-12-21 14:46:31 -05:00
Evan Prodromou 0665beec58 Bookmarklet for new bookmarks
Override the bookmarklet help page to add a new popup.
2010-12-21 14:43:03 -05:00
Evan Prodromou 6670dd8450 Layout on the bookmark form 2010-12-21 12:25:23 -05:00
Evan Prodromou ccb290cb68 Break up delicious import into a queue manager by bookmark 2010-12-21 11:09:01 -05:00
Evan Prodromou b8a182dc44 PHPCS Notice_bookmark 2010-12-21 10:32:35 -05:00
Evan Prodromou d9ff466d2c PHPCS newbookmark 2010-12-21 10:22:50 -05:00
Evan Prodromou 907f1ad633 PHPCS importbookmarks 2010-12-21 10:20:49 -05:00
Evan Prodromou 14babfb900 PHPCS BookmarkForm 2010-12-21 10:16:53 -05:00
Evan Prodromou c96faf065d PHPCS BookmarkPlugin.php 2010-12-21 10:13:20 -05:00
Evan Prodromou 331639d6e4 Code standards for deliciousbackupimporter.php 2010-12-21 09:42:44 -05: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
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 704a20f58b some corrections for double-posting of bookmarks 2010-12-20 13:39:07 -05:00
Evan Prodromou 770efece83 don't reinsert existing bookmark 2010-12-20 13:38:24 -05:00
Evan Prodromou 15f4e0a9f0 reindent BookmarkPlugin 2010-12-20 13:35:30 -05:00
Evan Prodromou d8de285d4e reindent importbookmarks.php 2010-12-20 13:35:21 -05:00
Evan Prodromou 510e79a96c Starting point for adding bookmarks 2010-12-20 12:04:02 -05:00
Evan Prodromou cab7522476 Notice_bookmark::saveNew() takes options arg 2010-12-20 12:03:33 -05:00
Evan Prodromou cb76465cfa Better output for activities and HTML in BookmarkPlugin 2010-12-19 10:18:33 -05:00
Evan Prodromou d6030714f3 Use Notice_bookmark::saveNew() from NewbookmarkAction 2010-12-19 10:18:07 -05:00
Evan Prodromou cee93dd15d Move notice bookmark creation to Notice_bookmark::saveNew() 2010-12-19 10:17:23 -05:00
Evan Prodromou fce2078dfb code done on debugging in bookmarks 2010-12-18 17:21:40 -05:00
Evan Prodromou 6b7931bcc8 delete bookmark stuff when deleting notice 2010-12-18 02:39:44 -05:00
Evan Prodromou 563f067508 save title and description of bookmark 2010-12-18 02:39:24 -05:00
Evan Prodromou 85d54cbdb7 save title and description of bookmark 2010-12-18 02:36:13 -05:00
Evan Prodromou f641034471 First pass at storing bookmarks
Form for saving bookmarks that looks like the delicious.com form.

Save a new notice with the right text, but attach a new notice_bookmark
table which marks this as a bookmark. Tags, URLs are kept the same.
2010-12-18 02:27:14 -05:00
Brion Vibber d8a3a88ec8 Merge branch '0.9.x' into 1.0.x
Conflicts:
	classes/Memcached_DataObject.php
2010-12-17 17:13:21 -08:00
Zach Copley 073f3e99cb Update Twitter calls to use documented API endpoints
see: http://groups.google.com/group/twitter-api-announce/msg/34b013f4d092737f
2010-12-17 15:57:22 -08:00
Craig Andrews 786250e3d9 In LdapCommon checkPassword/changePassword only get the 'dn' attribute as an optimization as no other attributes are necessary.
Thanks to drslump reported at http://status.net/open-source/issues/2955
2010-12-17 17:22:52 -05:00
Brion Vibber 0e7a283883 only run explain on selects 2010-12-17 12:08:46 -08:00
Brion Vibber 66b89de256 SQLProfile: quickie plugin to run DB queries through 'explain' and log ones that trigger filesort or temporary table 2010-12-17 11:41:40 -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 ae65f93b2b L10n updates and removal of superfluous whitespace. 2010-12-16 16:33:39 +01: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 bf20258f4b Merge branch '0.9.x' into 1.0.x 2010-12-15 11:59:31 -08:00
Brion Vibber 6c67114198 Mark OembedAction, XrdAction, and (plugin) AutocompleteAction as read-only. Tweaked ApiStatusesShow and ApiTimelineUser to still claim read-only when hit with a HEAD request (usually link checkers or a precursor to a GET, and should be semantically equivalent to a GET without actually transferring data) 2010-12-14 16:14:15 -08:00
Brion Vibber 39cad55711 TwitterBridge: partial merge of id_str usage from 0.9.x for improved 32-bit and pre-5.2.10 compatibility. (on 64-bit in 5.2.6 we can pull the integer IDs, but silently lose some precision on the end.)
Fixes for Twitter bridge breakage on 32-bit servers. New "Snowflake" 64-bit IDs have become too big to fit in the integer portion of double-precision floats, so to reliably use these IDs we need to pull the new string form now.
Machines with 64-bit PHP installation should have had no problems (except on Windows, where integers are still 32 bits)

Conflicts:

	plugins/TwitterBridge/twitterimport.php <- as this hasn't been broken out, the import code is NOT FULLY UPDATED HERE.
2010-12-13 12:13:24 -08:00
Brion Vibber f947fe5d0c Disable InProcessCache plugin for CLI scripts, which are more likely to be long-running, greatly increasing the chance of data corruption. 2010-12-09 10:24:06 -08:00
Evan Prodromou 99f3964394 Merge remote branch 'gitorious/0.9.x' into 0.9.x 2010-12-09 10:48:12 -05:00
Evan Prodromou f5f6a742cb Additional in-process cache plugin InProcessCache
Some of our caching systems, like the disk cache or memcached, have
significant overhead (network connections or disk I/O).

This plugin adds an additional layer of in-process cache, so we don't
need to reconnect to external cache systems when we've already
received a data item from the cache. There are some concurrency issues
here, but typically they won't be important at the level of a single
web hit.
2010-12-09 10:45:36 -05:00
Brion Vibber e25d4683c8 Merge branch 'master' into 0.9.x 2010-12-08 18:13:20 -08:00
Brion Vibber 516161213f Tweak to PiwikAnalytics plugin to help browsers to pre-load piwik.js, may shave a little off load time.
Piwik's current default recommended JS for loading creates a <script> tag via document.write(). In addition to being generally evil, this means the browser doesn't know it's going to need piwik.js until that chunk of script gets executed... which can't happen until all scripts referenced *before* it have been loaded and executed.

The only reason for that bit of script though seems to be to pick 'http' or 'https' depending on the current page's scheme. This can be done more simply by using a protocol-relative link (eg "//piwik.status.net/piwik.js"), which the browser will resolve as appropriate. Since it's now sitting in the <script> tag, the browser's lookahead code will now see it and be able to start loading it while earlier things are parsing/executing.
May be better still to move to an asynchronous load after DOM-ready, but I'm not sure if that'll screw with the analytics code (eg, not being able to start things on the DOM-ready events since they're past).
2010-12-08 17:39:04 -08:00
Brion Vibber d8d9edfc99 Merge branch 'master' into 0.9.x 2010-12-08 15:01:25 -08:00
Brion Vibber 26bd15ec0a Mapstraction plugin: use minified sources for OpenLayers
The default full build of OpenLayers.js is 943kb as of 2.10; this gzips down to a couple hundred kb
but is still rather nasty, plus loading it off a remote host could slow things down.

Using a local copy let us cut down the size significantly by discarding unused features, and further
minification with yui-compressor shaves a bit more off. Cuts down to about 1/5 the size of the
original.

Also threw in a bundled & minified copy of the Mapstraction classes plus our usermap.js,
which covers the common case of using the default OpenLayers provider. This cuts out three
additional script loads, two of which weren't getting launched until after the mxn.js main
file got loaded.
2010-12-08 14:54:02 -08:00
Brion Vibber fb315c6f61 Create a bundled & minified JS file for Mapstraction's common case (using OpenLayers); this'll avoid waiting on additional script loads for mxn.core.js and mxn.openlayers.core.js, and removes the need to load usermap.js separately as well. 2010-12-08 14:52:26 -08:00
Brion Vibber 34569017ce Add stripped and minified local copy of OpenLayers 2.10, about 1/5 the size of the full version.
Included Makefile will recreate the OpenLayers.js using the statusnet.cfg strip configuration file
and yui-compressor to do some extra minification at the end. Requires fetching the OpenLayers
source download and dropping it in:

http://openlayers.org/download/OpenLayers-2.10.tar.gz
2010-12-08 14:28:55 -08:00
Brion Vibber db4d69f099 Quick hack to discard twitter broadcast queue items on failure *IF* config option 'twitter' 'ignore_errors' is on:
$config['twitter']['ignore_errors'] = true;

A longer-term solution is to patch up the indirect retry handling to count retries better, or delay for later retry sensibly.
2010-12-07 12:11:37 -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
Brion Vibber 4b4b763255 For good measure, don't return autocomplete results when not logged in. 2010-12-06 17:20:14 -08:00
Brion Vibber 6662141328 reindent 2010-12-06 17:16:47 -08:00
Brion Vibber febcf7258c Tweak router target URL for Autocomplete suggestions 2010-12-06 17:15:56 -08:00
Brion Vibber ee9e95877c Update Autocomplete readme: current state seems to work fine on private sites, so removing that note. 2010-12-06 17:13:02 -08:00
Brion Vibber 4868aaf9ea Ticket #2924: include mini avatars in Autocomplete plugin drop-down list
Ticket #2923: don't show "(null)" for some profiles with no full name set
2010-12-06 16:55:16 -08:00
Brion Vibber daae13df1c Start tweaking Autocomplete js 2010-12-06 16:20:54 -08:00
Brion Vibber 851dbf1361 fix breakage in AutocompletePlugin 2010-12-06 15:23:12 -08:00
Brion Vibber c40fde900a minify LinkPreview JS code 2010-12-06 15:11:42 -08:00
Brion Vibber bb50e773e6 Ticket #2921: cleanup on LinkPreview to make fewer requests while typing. Will now wait for each link's preview request to complete (successfully or unsuccessfully) before re-running it) 2010-12-06 14:49:24 -08:00
Brion Vibber fb1fc8a046 Use short API-style error responses for LinkPreview's oembed proxy 2010-12-06 13:37:57 -08:00
Evan Prodromou 89f5dd4c18 updated NoticeTitle plugin to use new activity events 2010-12-05 16:31:43 -05:00
Brion Vibber aa96c3c1d9 Fix for tickets #2917, #2262: user URL shortening options not being applied in non-web channels
common_shorten_links() can only access the web session's logged-in user, so never properly took user options into effect for posting via XMPP, API, mail, etc.

Adds an optional $user parameter on common_shorten_links(), and a $user->shortenLinks() as a clearer interface for that.
Tweaked some lower-level functions so $user gets passed down -- making the $notice_id param previously there for saving URLs at notice save time generalized a little.

Note also ticket #2919: there's a lot of duplicate code calling the shortening, checking the length, and reporting near-identical error messages. These should be consolidated to aid in code and translation maintenance.
2010-12-02 13:41:56 -08:00
Siebrand Mazeland c4f67f7647 * fix typo in parameter notation
* add FIXME for unused message
* remove superfluous whitespace
2010-12-02 12:42:58 +01:00
Brion Vibber bc9fcaf2eb Fix for ticket #2911: Hitting enter on the "associate with current account" in OpenID flow failed due to forms being mixed together
Separating the two forms (one to create a local account, the other to attach the OpenID to an existing account) gets them working -- enter activates the appropriate default button.
2010-12-01 12:21:00 -08:00
Brion Vibber f68d4e7d06 Fix dumb mistake -- changed function names partway through writing Nickname and forgot to update a couple places. :) 2010-12-01 11:21:00 -08:00
Evan Prodromou 0410462c4b add OpenID data to the Webfinger XRD file so you can login with it elsewhere 2010-12-01 13:43:34 -05:00
Brion Vibber 18cbdfb49b Ticket #2913: Realtime background update marker no longer triggers false positives when clearing the marker on switching away from the tab in Firefox 4
We were clearing the counter on the window title in the blur event, which gets fired *after* we switch away, thus triggering Firefox to mark the tab as updated again.
Clearing the counter on *focus* instead avoids this, and keeps the counter out of the way as well.
2010-12-01 01:09:14 +00:00
Brion Vibber c6f5975554 Fix ticket #2914: Realtime no longer tells you it's got a message queued up when it's really the one you just sent out and is already visible. 2010-11-30 16:46:11 -08:00
Brion Vibber f222e2132d Went through realtimeupdate.js and added documentation comments -- does not alter the minified version. :)
Identified several bugs and fixmes, and added more thorough labeling of the issues with replicating the entire HTML structure of notices (no i18n, missing new features, maintenance problems, possible other issues)
2010-11-30 16:39:09 -08:00