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
8814fb3822
Merge branch '0.9.x' into socialbookmark
2010-12-27 22:38:36 -08:00
Evan Prodromou
3bcfee906a
document events for activity import
2010-12-27 22:37:34 -08:00
Evan Prodromou
c458bafaa1
pass through $idField and $createdField in Notice queries
2010-12-27 22:35:57 -08:00
Evan Prodromou
1996545947
add events for restoring activities
2010-12-27 22:28:20 -08:00
Evan Prodromou
4465724ed3
return saved notice to AtomPub for Bookmarks
2010-12-27 22:16:34 -08:00
Evan Prodromou
1cc8be4d8b
Merge branch '0.9.x' into socialbookmark
2010-12-27 22:13:23 -08:00
Evan Prodromou
75e671774d
Documentation for change in atompub events
2010-12-27 22:13:17 -08:00
Evan Prodromou
0bcc3ee005
include saved notice in atompub events
2010-12-27 22:11:30 -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
a85bbd9088
Add a user parameter to atom pub api events
2010-12-27 20:49:08 -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
c78170a275
Better job making an ActivityObject from an <atom:author>
2010-12-27 10:19:51 -08:00
Evan Prodromou
ab92496ddc
Stop using <activity:subject> for atom feeds
2010-12-27 10:03:34 -08:00
Evan Prodromou
f5128015be
Use outputTo() instead of asString() for including sub-elements
2010-12-27 09:46:25 -08:00
Evan Prodromou
1188d5bab2
Don't output deprecated <activity:actor> element
2010-12-27 09:25:26 -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
763a5f182d
Memcache_DataObject checks for PEAR::isError() on results
2010-12-26 21:08:20 -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
Brion Vibber
e0606d3eca
Break xbImportNode.js and geometa.js back out of util.js; the Makefile in js has been updated to combine them with util.js source when building util.min.js
...
Revert "combine our standard scripts into one big script"
This reverts parts of commit 0c5ca46ba3
2010-12-22 15:22:02 -08:00
Brion Vibber
8babcc2ad2
Makefile to compress LinkPreview's js
2010-12-22 15:04:50 -08:00
Brion Vibber
d5c2b0d216
When queueing is off, restore runs immediately. Indicate that we've already finished processing on the success page in this case; otherwise continue to show the 'will take a few minutes' message.
2010-12-22 14:55:13 -08:00
Brion Vibber
464e0f8115
Don't trust text/xml mime types; generic content detection gives useless stuff like that on SVG images! Todo: replace the extension check in this case with better content-based checks.
2010-12-22 13:56:19 -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
35d9a065fb
Revert "initialize ActivityObject::$extra"
...
This reverts commit 3e82000d57
2010-12-22 12:07:13 -08:00
Evan Prodromou
e11ca1e052
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-12-22 12:05:40 -08:00
Evan Prodromou
a01742244e
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-12-22 12:03:14 -08:00
Brion Vibber
448dfb69d4
Initialize $extra member to empty array on ActivityObject
2010-12-22 12:03:05 -08:00
Evan Prodromou
3e82000d57
initialize ActivityObject::$extra
2010-12-22 12:02:50 -08:00
Brion Vibber
055630516c
Merge branch 'righttoleave' into 0.9.x
2010-12-22 11:28:34 -08:00
Evan Prodromou
5fe8301129
disable account deletion by default
2010-12-22 11:25:47 -08:00
Evan Prodromou
9a6ceb3303
Merge branch 'righttoleave' into 0.9.x
2010-12-22 11:22:51 -08:00
Brion Vibber
754bc1b616
Error handling cleanup on backup/restore:
...
* avoid PHP notice from using wrong variable
* show a visible error instead of blank screen if no file submitted with restore form
* avoid PHP strict warning from using calling "non-static" DOMDocument::loadXML statically
* suppress PHP warning from XML parse errors
2010-12-22 11:13:57 -08:00
Brion Vibber
5abd2b7d0c
fix notice error
2010-12-22 11:06:45 -08:00
Brion Vibber
a16131526b
Partial fix for ticket #2964 : bad .po file entries
...
http://translatewiki.net/wiki/StatusNet:Cb5746be52330331844dea750bf452c0618aecb3-All_Rights_Reserved/pt-br
2010-12-22 10:20:47 -08:00
Brion Vibber
c5ab7026dd
Partial fix for ticket #2964 : bad .po files
...
http://translatewiki.net/wiki/StatusNet:08b929b29496be84ff75d266b5e60b426cff449f-Hey,_1$s._Someone_just_entered/ca
2010-12-22 10:17:22 -08:00
Evan Prodromou
73dccdd7f5
Notice_bookmark::saveNew() takes a Profile argument
2010-12-22 12:35:45 -05:00
