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
c91b080a8e
version 0.9.8dev
2010-12-29 16:18:43 -08:00
Evan Prodromou
d8219c07be
update version to 0.9.7
2010-12-29 16:14:00 -08:00
Evan Prodromou
80191b56df
Show <activity:subject> in Atom group notice feed
...
Version 0.9.6 and below of StatusNet assume anything in <author> is a
Person. So, we include an <activity:subject> element, which will be
checked first by those versions of the code, only for group feeds.
At some point we'll take this out, but it's useful for now.
2010-12-29 15:33:57 -08:00
Evan Prodromou
d3b10959f4
Merge branch '0.9.x' into noactor
2010-12-29 15:29:29 -08:00
Evan Prodromou
26afe79ed9
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-12-29 14:53:38 -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
48edbb3023
add hooks for the account-management tools
2010-12-29 14:02:04 -08:00
Evan Prodromou
4a9a5076ff
Web UI for importing delicious backup files
2010-12-29 13:51:59 -08:00
Evan Prodromou
39cf2338c2
Bad method call in File_to_post
2010-12-29 13:28:32 -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
d31397bd45
method to count notices linking to an URL
2010-12-28 13:44:49 -08:00
Evan Prodromou
6ab46c70f7
Delete file links when Notice is deleted
2010-12-28 13:44:18 -08:00
Evan Prodromou
a2000f889a
Merge branch '0.9.x' into socialbookmark
2010-12-28 13:42:44 -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
faf0081a8b
Fixes from testing File::stream()
2010-12-28 12:57:31 -08:00
Evan Prodromou
bf4c5cb41a
Stream of notices linking to an URL
2010-12-28 11:58:55 -08:00
Brion Vibber
e211e6228d
Merge branch '0.9.x' into 1.0.x
2010-12-28 11:38:34 -08:00
Brion Vibber
90c7ff1983
Merge branch 'master' into 0.9.x
2010-12-28 11:37:38 -08:00
Brion Vibber
d3d9797496
Prevent group creation by silenced users.
...
* adds Right::CREATEGROUP
* logic in Profile::hasRight() checks for silencing
* NewgroupAction checks for the permission before letting you see or process the form in the UI
* User_group::register() logic does a low-level check on the specified initial group admin, and rejects creation if that user doesn't have the right; guaranteeing that API methods etc will also have this restriction applied sensibly.
2010-12-28 11:34:02 -08:00
Evan Prodromou
320e73a321
If notice has been deleted before, don't store URI again
2010-12-27 22:58:13 -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
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
