Commit Graph

282 Commits

Author SHA1 Message Date
Evan Prodromou ea95f7b7b0 move long name to shorter name for bookmarklistitem 2011-04-19 17:38:56 -04:00
Evan Prodromou 25a037ba9c Revert "autoload bookmarknoticelistitemadapter"
This reverts commit f880e6498d.
2011-04-19 17:28:24 -04:00
Evan Prodromou 501ecb33cc Revert "hard-require the adapter"
This reverts commit 8b0f45d0a7.
2011-04-19 17:28:03 -04:00
Evan Prodromou 8b0f45d0a7 hard-require the adapter 2011-04-19 16:53:34 -04:00
Evan Prodromou f880e6498d autoload bookmarknoticelistitemadapter 2011-04-19 16:26:00 -04:00
Evan Prodromou 7b397823d0 Move bookmark rendering to notice list item adapter
Move the tricky stuff with Bookmarks to a notice list item adapter.
2011-04-19 15:52:57 -04:00
Samantha Doherty e8e6d494d2 This util.min.js is pining for the fjords. 2011-04-18 12:42:00 -04:00
Siebrand Mazeland 13ae3ab259 Localisation updates from http://translatewiki.net. 2011-04-18 13:41:15 +02:00
Samantha Doherty b11bfa3c06 Add class to bookmark form thumbnail image. 2011-04-18 02:29:16 -04:00
Samantha Doherty 68bc240d4c Add JS for second step of bookmark form. 2011-04-18 00:41:42 -04:00
Zach Copley b422a0d21a spelling 2011-04-17 20:34:05 -07:00
Zach Copley f3e0cd0b30 Some special .js for the bookmark plugin, so we can control the form in the second step 2011-04-17 18:37:51 -07:00
Zach Copley d9cf0280d2 Give microapp form elements unique ids 2011-04-17 16:32:52 -07:00
Zach Copley 5f81f4c701 Fix form elements in bookmark plugin 2011-04-17 15:34:50 -07:00
Zach Copley 007d1be06d Give bookmark form elements unique ids 2011-04-17 15:09:56 -07:00
Siebrand Mazeland 5f3dbc3e98 Localisation updates http://translatewiki.net. 2011-04-17 20:30:47 +02:00
Siebrand Mazeland 4c00b830bf Localisation updates from http://translatewiki.net. 2011-04-17 01:15:30 +02:00
Evan Prodromou 1c2d4de469 scale down the thumbnail image if necessary 2011-04-14 23:57:30 -04:00
Evan Prodromou 2df98fc240 auto-fill bookmark data 2011-04-14 23:44:01 -04:00
Evan Prodromou 3bea1b5371 initial bookmark form 2011-04-13 18:37:14 -04:00
Evan Prodromou 66dee8a966 Merge branch '1.0.x' into prefillbookmark 2011-04-13 15:38:39 -04:00
Evan Prodromou 1434099ed8 better versions for BookmarkPlugin 2011-04-13 15:27:30 -04:00
Siebrand Mazeland 409550e1dc Localisation updates from http://translatewiki.net. 2011-04-13 15:48:18 +02:00
Siebrand Mazeland ab52460691 Update translator documentation.
Number parameters.
2011-04-13 15:43:05 +02:00
Evan Prodromou 820e19e197 Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x 2011-04-11 11:20:27 -04:00
Siebrand Mazeland 0644cdb6d0 Localisation updates from http://translatewiki.net. 2011-04-11 15:10:09 +02:00
Evan Prodromou a665d1f772 more information for bookmark without attachment 2011-04-10 19:27:09 -04:00
Siebrand Mazeland 396a0c08b3 Localisation updates from http://translatewiki.net. 2011-04-09 20:53:29 +02:00
Evan Prodromou bf39c95795 Bookmarks more robust to missing profiles 2011-04-06 23:47:05 -04:00
Siebrand Mazeland 553a0c8b9b i18n/L10n updates/fixes.
Translator documentation added/updated.
Whitespace updates.
2011-04-06 16:36:35 +02:00
Evan Prodromou c9ca11eb64 include limited-scope class on bookmarks in output 2011-04-05 13:43:54 -04:00
Evan Prodromou c0f63c9a69 add toselector to bookmark 2011-04-05 11:18:25 -04:00
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
Evan Prodromou a84d584971 delete the Bookmark if Notice::saveNew() fails 2011-04-01 09:30:25 -04:00
Siebrand Mazeland 4ac471f380 Localisation updates from http://translatewiki.net. 2011-03-31 23:30:07 +02:00
Evan Prodromou d5a38c62f4 Don't try to import a <dd> without a <dt> from delicious 2011-03-31 16:15:30 -04:00
Evan Prodromou 2411caa000 If Router is mucked up, force URI for Bookmark 2011-03-31 11:20:24 -04: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
Evan Prodromou 83d1997f59 incorrect name for bookmark plugin 2011-03-30 10:58:28 -04:00
Brion Vibber 1c63ae29fe typo fix in format string 2011-03-29 17:00:00 -07:00
Brion Vibber 20ca5027cc Consolidate common code in micro-apps custom notice type display actions.
The ShowNoticeAction subclasses were cut-n-pasting a lot of prepare() code from ShowNoticeAction, though the only part that's different is how we look up the notice. Broke that out to a getNotice() method, so only that needs to be copied. Avoids extra copies of permission checks and other common code in this spot.
2011-03-29 16:58:15 -07:00
Brion Vibber 23436ad83d Fix for bookmark posting: missing object was causing error output to crush ajax 2011-03-29 16:50:06 -07:00
Siebrand Mazeland 0a19674c9f @evan Fixed message domain for messages in plugins for recent commits.
Numbered parameters when more than one used in a message.
L10n updates for consistency.
i18n for non-translatable exception.
Updated translator documentation.
Removed superfluous whitespace.
2011-03-30 00:48:41 +02:00
Evan Prodromou 2856982a1c disallow access to out-of-scope bookmark 2011-03-28 22:50:45 -04:00
Siebrand Mazeland 4e64bd4e5b Localisation updates from http://translatewiki.net. 2011-03-24 16:08:03 +01:00
Siebrand Mazeland 5bb6fae307 Localisation updates from http://translatewiki.net. 2011-03-18 20:59:45 +01:00
Siebrand Mazeland 69e11bb45e Localisation updates from http://translatewiki.net. 2011-03-11 19:33:52 +01:00
Brion Vibber cbf16a4974 Bookmark and poll plugins' custom notice forms now do AJAX submit, with the resulting notice appearing in the timeline.
FormNoticeXHR now is triggered on any form labeled with class 'ajax-notice', so those other than the traditional notice form should work as long as they handle the AJAX submission and return a properly formatted notice.

Things to watch out for:
* to determine whether the resulting notice should show on the current timeline, the JS code needs to be able to check the author and such. Keeping the existing vcard bits helps for this!
* the notice form submission stuff clears out inputs from your form -- test to make sure this behaves correctly
* error messages returned from the thingy _should_ come through, but this needs more testing for consistency
* while form components that aren't in a custom form should just be ignored, this should be tested more. (eg there's no location or attachment box for poll or bookmark plugins)
* NoticeListItem isn't currently reachable via autoloader -- touch NoticeList explicitly before calling into it for now.
2011-03-08 15:10:30 -08:00
Siebrand Mazeland b9e2c72740 Localisation updates from http://translatewiki.net. 2011-03-08 02:18:32 +01:00
Brion Vibber 541613ce69 More doc comments on MicroApp stuff; some of the show-notice code & the ActivityStreams stuff is a bit wonky and may need smoothing out 2011-03-07 15:15:21 -08:00
Brion Vibber 9a837ee33b Doc comments for MicroAppPlugin 2011-03-07 13:36:15 -08:00
Evan Prodromou 095e2a74d4 fix object errors with bookmark notices 2011-03-07 14:25:37 -05:00
Evan Prodromou f5782e9e56 save the object type when saving a new bookmark notice 2011-03-07 14:25:05 -05:00
Evan Prodromou 7aa55f8200 made the input-form switcher work, kinda 2011-03-07 03:34:20 -05:00
Evan Prodromou 52952d13c0 first (non-working) move to microapp structure for bookmarks 2011-03-07 03:34:20 -05:00
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
Siebrand Mazeland a86d293c93 Localisation updates from http://translatewiki.net. 2011-02-14 19:43:16 +01:00
Evan Prodromou 68cf2bdced Bookmark uses Plugin::path() 2011-02-03 12:04:54 -05:00
Brion Vibber 9573f725c1 Merge branch '0.9.x' into testing 2011-01-31 11:08:15 -08:00
Siebrand Mazeland e6e402cefd Localisation updates from http://translatewiki.net. 2011-01-29 23:10:15 +01:00
Samantha Doherty 1563c95cc3 Wee style update for bookmarks plugin. 2011-01-25 18:33:47 -05: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
Siebrand Mazeland 03acf301ba Localisation updates from http://translatewiki.net. 2011-01-20 21:12:51 +01:00
Siebrand Mazeland 89727549a6 Localisation updates from http://translatewiki.net. 2011-01-15 00:47:49 +01:00
Siebrand Mazeland 380ca7187c Localisation updates from http://translatewiki.net. 2011-01-14 12:10:05 +01: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 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 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 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 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
Evan Prodromou ae64963d71 Reformat bookmark output 2010-12-22 15:24:13 -08:00
Evan Prodromou 1faaaed72b Move bookmark CSS to its own file 2010-12-22 13:08:07 -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
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