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
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
1faaaed72b
Move bookmark CSS to its own file
2010-12-22 13:08:07 -08:00
402cac2f93
Merge branch '0.9.x' into socialbookmark
...
Conflicts:
lib/activityobject.php
2010-12-22 12:09:42 -08:00
35d9a065fb
Revert "initialize ActivityObject::$extra"
...
This reverts commit 3e82000d57
2010-12-22 12:07:13 -08:00
e11ca1e052
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-12-22 12:05:40 -08:00
a01742244e
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-12-22 12:03:14 -08:00
448dfb69d4
Initialize $extra member to empty array on ActivityObject
2010-12-22 12:03:05 -08:00
3e82000d57
initialize ActivityObject::$extra
2010-12-22 12:02:50 -08:00
055630516c
Merge branch 'righttoleave' into 0.9.x
2010-12-22 11:28:34 -08:00
5fe8301129
disable account deletion by default
2010-12-22 11:25:47 -08:00
9a6ceb3303
Merge branch 'righttoleave' into 0.9.x
2010-12-22 11:22:51 -08:00
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
5abd2b7d0c
fix notice error
2010-12-22 11:06:45 -08:00
1513b8eeb9
Merge branch '0.9.x' into 1.0.x
2010-12-22 10:43:19 -08:00
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
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
73dccdd7f5
Notice_bookmark::saveNew() takes a Profile argument
2010-12-22 12:35:45 -05:00
6ff8977243
Bookmarklet for Bookmark plugin
2010-12-21 14:46:31 -05:00
0665beec58
Bookmarklet for new bookmarks
...
Override the bookmarklet help page to add a new popup.
2010-12-21 14:43:03 -05:00
6670dd8450
Layout on the bookmark form
2010-12-21 12:25:23 -05:00
ccb290cb68
Break up delicious import into a queue manager by bookmark
2010-12-21 11:09:01 -05:00
b8a182dc44
PHPCS Notice_bookmark
2010-12-21 10:32:35 -05:00
d9ff466d2c
PHPCS newbookmark
2010-12-21 10:22:50 -05:00
907f1ad633
PHPCS importbookmarks
2010-12-21 10:20:49 -05:00
14babfb900
PHPCS BookmarkForm
2010-12-21 10:16:53 -05:00
c96faf065d
PHPCS BookmarkPlugin.php
2010-12-21 10:13:20 -05:00
331639d6e4
Code standards for deliciousbackupimporter.php
2010-12-21 09:42:44 -05:00
17515aacac
drop previous in oembedhelperexception code
2010-12-20 18:32:43 -05:00
f63355451d
fixup exception constructor for php 5.2
2010-12-20 18:28:42 -05:00
f82dd4e14f
Merge branch '0.9.x' into 1.0.x
2010-12-20 14:28:43 -08:00
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
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
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
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
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
704a20f58b
some corrections for double-posting of bookmarks
2010-12-20 13:39:07 -05:00
770efece83
don't reinsert existing bookmark
2010-12-20 13:38:24 -05:00
15f4e0a9f0
reindent BookmarkPlugin
2010-12-20 13:35:30 -05:00
d8de285d4e
reindent importbookmarks.php
2010-12-20 13:35:21 -05:00
24f9a991b6
Let activity objects write directly to activity's own outputter
2010-12-20 13:30:33 -05:00
6a6dd81d1f
Let activity objects write directly to activity's own outputter
2010-12-20 13:26:57 -05:00
510e79a96c
Starting point for adding bookmarks
2010-12-20 12:04:02 -05:00
cab7522476
Notice_bookmark::saveNew() takes options arg
2010-12-20 12:03:33 -05:00
cb76465cfa
Better output for activities and HTML in BookmarkPlugin
2010-12-19 10:18:33 -05:00
d6030714f3
Use Notice_bookmark::saveNew() from NewbookmarkAction
2010-12-19 10:18:07 -05:00
cee93dd15d
Move notice bookmark creation to Notice_bookmark::saveNew()
2010-12-19 10:17:23 -05:00
688841fb41
ActivityObject has attribute for other elements
2010-12-19 10:16:44 -05:00
9480bf1d10
Notice_tag::url() gets the URL for a tag string
2010-12-19 10:15:56 -05:00
c389386c8b
Merge branch '0.9.x' into socialbookmark
2010-12-18 17:26:34 -05:00
Brion Vibber
Evan Prodromou