3885 Commits

Author SHA1 Message Date
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
Max Shinn
24e5f1806a Notifications and deleting albums 2010-12-30 08:02:59 -06: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
Max Shinn
57aef10ed2 Delete the notice *and* the photo 2010-12-29 13:03:23 -06:00
Max Shinn
35e0832ec0 Let's try that again 2010-12-28 21:14:19 -06:00
Max Shinn
d68d95e08d Fixed undefined variable while creating new albums 2010-12-28 20:59:01 -06:00
Max Shinn
e9e5fdb139 Matt's demands (ticket #217) 2010-12-28 19:45:25 -06: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
Max Shinn
e525e9ab9b Deleting photos 2010-12-28 11:20:08 -06:00
Max Shinn
407aa6a947 Updating uploaded photos 2010-12-28 10:40:58 -06:00
Max Shinn
90521450a0 Cool js photo resizing effect 2010-12-28 09:38:50 -06:00
Max Shinn
c73398fb25 External css 2010-12-28 09:10:22 -06:00
Max Shinn
46b2151f09 Pictures/albums in floating divs 2010-12-28 08:57:28 -06:00
Max Shinn
330ac5dd12 Photo albums on photos page 2010-12-28 08:31:34 -06:00
Max Shinn
22fe5d0215 Creating albums and uploading to them 2010-12-28 07:33:06 -06: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
Ian Denhardt
89d8c0c6f2 automatically create a default photo album when a user's photos page is visited if none exist. 2010-12-27 22:08:36 -05:00
Max Shinn
d61f88b979 Only show photo uploads for logged in users 2010-12-27 17:12:25 -06:00
Max Shinn
18f46958f2 Individual ids for photos 2010-12-27 16:57:13 -06:00
Max Shinn
a6bf28f3ee Fixing photo page replies and descriptions 2010-12-27 16:39:21 -06: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
Max Shinn
98cb4a4e54 Improved nav bar 2010-12-27 07:42:00 -06: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
Max Shinn
e81bdcb200 Untabify 2010-12-26 20:51:17 -06:00
Max Shinn
cbf296e804 Usability with photos tab 2010-12-26 20:42:45 -06:00