]> git.mxchange.org Git - quix0rs-gnu-social.git/log
quix0rs-gnu-social.git
13 years agoAdd a check to prevent replying to an unscoped notice
Evan Prodromou [Mon, 28 Mar 2011 16:01:08 +0000 (12:01 -0400)]
Add a check to prevent replying to an unscoped notice

13 years agoToSelector widget to send private notices
Evan Prodromou [Mon, 28 Mar 2011 15:02:20 +0000 (11:02 -0400)]
ToSelector widget to send private notices

A new widget, ToSelector (Sorry, couldn't think of anything better)
that lets you select an addressee for a notice and whether it's
private.

13 years agoMerge branch '1.0.x' into limitdist2
Evan Prodromou [Mon, 28 Mar 2011 14:04:45 +0000 (10:04 -0400)]
Merge branch '1.0.x' into limitdist2

13 years agoFix incorrect translator documentation. Spotted by AVRS.
Siebrand Mazeland [Sun, 27 Mar 2011 23:43:01 +0000 (01:43 +0200)]
Fix incorrect translator documentation. Spotted by AVRS.

13 years agoMerge branch '1.0.x' into limitdist2
Evan Prodromou [Sun, 27 Mar 2011 15:36:57 +0000 (11:36 -0400)]
Merge branch '1.0.x' into limitdist2

13 years agoMerge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
Evan Prodromou [Sun, 27 Mar 2011 15:26:57 +0000 (11:26 -0400)]
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

13 years agoNoticeForm constructor takes array of optional parameters
Evan Prodromou [Sun, 27 Mar 2011 15:25:24 +0000 (11:25 -0400)]
NoticeForm constructor takes array of optional parameters

NoticeForm::__construct() had 9 parameters, and I was about to add a
few more, so I figured it'd be better to use an $options array instead.

13 years agoUpdate grammar for feed title. Not sure why this was not "%s's". I chose the safe...
Siebrand Mazeland [Sun, 27 Mar 2011 11:05:24 +0000 (13:05 +0200)]
Update grammar for feed title. Not sure why this was not "%s's". I chose the safe, more verbose way.

13 years agoSlightly uncomplicate and disambiguate the plugin description.
Siebrand Mazeland [Sun, 27 Mar 2011 10:58:35 +0000 (12:58 +0200)]
Slightly uncomplicate and disambiguate the plugin description.
Add translator documentation.

13 years agoadd indicator for limited-scope notices
Evan Prodromou [Sat, 26 Mar 2011 20:47:36 +0000 (16:47 -0400)]
add indicator for limited-scope notices

13 years agoalways allow author to see own notices
Evan Prodromou [Sat, 26 Mar 2011 20:47:18 +0000 (16:47 -0400)]
always allow author to see own notices

13 years agoclearer scope rules for anonymous and author
Evan Prodromou [Sat, 26 Mar 2011 20:23:20 +0000 (16:23 -0400)]
clearer scope rules for anonymous and author

13 years agoadd scope limit flags to some notices in createsim.php
Evan Prodromou [Sat, 26 Mar 2011 20:06:17 +0000 (16:06 -0400)]
add scope limit flags to some notices in createsim.php

13 years agoCaller can set scope for Notice::saveNew()
Evan Prodromou [Sat, 26 Mar 2011 19:49:46 +0000 (15:49 -0400)]
Caller can set scope for Notice::saveNew()

13 years agoMerge branch '1.0.x' into limitdist2
Evan Prodromou [Sat, 26 Mar 2011 19:37:05 +0000 (15:37 -0400)]
Merge branch '1.0.x' into limitdist2

13 years agofix off-by-one and more replies
Evan Prodromou [Sat, 26 Mar 2011 19:36:47 +0000 (15:36 -0400)]
fix off-by-one and more replies

13 years agoAll groups start with a random admin
Evan Prodromou [Sat, 26 Mar 2011 19:16:04 +0000 (15:16 -0400)]
All groups start with a random admin

13 years agoAdd group posts to createsim.php
Evan Prodromou [Sat, 26 Mar 2011 19:08:27 +0000 (15:08 -0400)]
Add group posts to createsim.php

13 years agoAdd reply_to to make conversations in createsim.php
Evan Prodromou [Sat, 26 Mar 2011 18:58:11 +0000 (14:58 -0400)]
Add reply_to to make conversations in createsim.php

13 years agoupgrade DB_DataObject to 1.9.5
Evan Prodromou [Sat, 26 Mar 2011 18:45:15 +0000 (14:45 -0400)]
upgrade DB_DataObject to 1.9.5

13 years agoUpgrade PEAR to 1.9.2
Evan Prodromou [Sat, 26 Mar 2011 18:37:42 +0000 (14:37 -0400)]
Upgrade PEAR to 1.9.2

13 years agoupgrade Console_GetOpt to 1.9.2
Evan Prodromou [Sat, 26 Mar 2011 18:22:24 +0000 (14:22 -0400)]
upgrade Console_GetOpt to 1.9.2

13 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sat, 26 Mar 2011 11:21:36 +0000 (12:21 +0100)]
Localisation updates from http://translatewiki.net.

13 years agoadd groups and joins to createsim.php
Evan Prodromou [Fri, 25 Mar 2011 21:39:14 +0000 (17:39 -0400)]
add groups and joins to createsim.php

13 years agoMerge branch '1.0.x' into limitdist2
Evan Prodromou [Fri, 25 Mar 2011 20:18:10 +0000 (16:18 -0400)]
Merge branch '1.0.x' into limitdist2

13 years agoMake function signature for getNoticeIds agree
Evan Prodromou [Fri, 25 Mar 2011 20:15:55 +0000 (16:15 -0400)]
Make function signature for getNoticeIds agree

There were some differences between defaults for the
NoticeStream::getNoticeIds() function and some of its subclasses'
implementations. So, I got them rationalized.

13 years agoMerge branch '1.0.x' into limitdist2
Evan Prodromou [Fri, 25 Mar 2011 19:57:07 +0000 (15:57 -0400)]
Merge branch '1.0.x' into limitdist2

Conflicts:
lib/groupnoticestream.php
lib/taggedprofilenoticestream.php

13 years agoAll notice streams check notice scope
Evan Prodromou [Fri, 25 Mar 2011 16:22:22 +0000 (12:22 -0400)]
All notice streams check notice scope

Added filtering code so that notice streams check notice scope.

Added new class to implement filtering a stream, FilteringNoticeStream.

Added a subclass that does the logic for checking Notice scope.

And made all the streams use ScopingNoticeStream.

13 years agoi18n fixes.
Siebrand Mazeland [Fri, 25 Mar 2011 16:12:53 +0000 (17:12 +0100)]
i18n fixes.
Translator documentation updates.

13 years agoMerge branch 'limitdist' into limitdist2
Evan Prodromou [Fri, 25 Mar 2011 15:46:49 +0000 (11:46 -0400)]
Merge branch 'limitdist' into limitdist2

13 years agoFix use of incorrect method causing i18n issue.
Siebrand Mazeland [Fri, 25 Mar 2011 09:13:26 +0000 (10:13 +0100)]
Fix use of incorrect method causing i18n issue.

13 years ago* PHP short tags "<?" to full tag "<?php".
Siebrand Mazeland [Fri, 25 Mar 2011 09:02:02 +0000 (10:02 +0100)]
* PHP short tags "<?" to full tag "<?php".
* superfluous whitespace removed.

13 years agoL10n update.
Siebrand Mazeland [Fri, 25 Mar 2011 08:55:33 +0000 (09:55 +0100)]
L10n update.
Translator documentation added.
Superfluous whitespace removed.

13 years agoTwitterBridge: discard outgoing queue items instead of retrying when Twitter API...
Brion Vibber [Fri, 25 Mar 2011 01:41:25 +0000 (18:41 -0700)]
TwitterBridge: discard outgoing queue items instead of retrying when Twitter API returns HTTP 400 or 404 error codes

We get HTTP 400 for various cases of invalid data, where retrying doesn't help at all -- previously those would loop forever, or until something died at least. :)
400 is also used for rate limiting, but retrying *immediately* will just hit the rate limit again, so better to discard if we're going over for now.

13 years agoMerge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
Evan Prodromou [Thu, 24 Mar 2011 22:05:32 +0000 (18:05 -0400)]
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

13 years agoBreak up stream code to use separate notice stream classes
Evan Prodromou [Thu, 24 Mar 2011 22:04:19 +0000 (18:04 -0400)]
Break up stream code to use separate notice stream classes

Rearchitect (again!) notice stream code to delegate different functionality up and down the stack.

Now, different classes implement NoticeStream.

13 years agoFix typo in documentation.
Siebrand Mazeland [Thu, 24 Mar 2011 16:02:28 +0000 (17:02 +0100)]
Fix typo in documentation.

13 years agoFix i18n.
Siebrand Mazeland [Thu, 24 Mar 2011 15:52:32 +0000 (16:52 +0100)]
Fix i18n.

13 years agoChange formatting of i18n slightly. Translator hints were not picked up in pot file...
Siebrand Mazeland [Thu, 24 Mar 2011 15:47:29 +0000 (16:47 +0100)]
Change formatting of i18n slightly. Translator hints were not picked up in pot file. May now they are.

13 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Thu, 24 Mar 2011 15:08:03 +0000 (16:08 +0100)]
Localisation updates from http://translatewiki.net.

13 years agoTranslator documentation updated.
Siebrand Mazeland [Thu, 24 Mar 2011 11:09:50 +0000 (12:09 +0100)]
Translator documentation updated.
i18n/L10n updates.
Superfluous whitespace removed.
Add FIXME for missing class documentation.

13 years agoUpdate translator documentation.
Siebrand Mazeland [Thu, 24 Mar 2011 10:47:57 +0000 (11:47 +0100)]
Update translator documentation.
Remove superfluous whitespace.
L10n/I18n updates.
FIXMEs added for missing documentation or headers.

13 years agoUpdate translator documentation.
Siebrand Mazeland [Thu, 24 Mar 2011 08:59:01 +0000 (09:59 +0100)]
Update translator documentation.
i18n/L10n updates.
Superfluous whitespace removed.
Add FIXME in files with missing documentation.

13 years agoMerge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
Evan Prodromou [Thu, 24 Mar 2011 02:11:13 +0000 (22:11 -0400)]
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

13 years agoFallback for RSVP display when Event is deleted
Evan Prodromou [Thu, 24 Mar 2011 02:10:44 +0000 (22:10 -0400)]
Fallback for RSVP display when Event is deleted

13 years agoEnhancement for 'ajax' form class: submit buttons behave more like normal submissions...
Brion Vibber [Wed, 23 Mar 2011 22:21:31 +0000 (15:21 -0700)]
Enhancement for 'ajax' form class: submit buttons behave more like normal submissions, submitting their name/values through a hidden field.

This should work well for simple cases, but could conceivably create false positives if there's a click handler on the specific buttons, depending on whether event processing passes it on. Double-check if you're doing such forms along with the 'ajax' class!

13 years agoRetool group join queue list ajax forms to use two buttons in one form, making it...
Brion Vibber [Wed, 23 Mar 2011 21:56:51 +0000 (14:56 -0700)]
Retool group join queue list ajax forms to use two buttons in one form, making it more ajax-submit-friendly. Needs util.js fixes for AJAX submission input buttons...

13 years agoMerge branch '1.0.x' into limitdist
Evan Prodromou [Wed, 23 Mar 2011 19:58:27 +0000 (15:58 -0400)]
Merge branch '1.0.x' into limitdist

Conflicts:
classes/Notice.php

13 years agoSome fixes to make the notice stream class work
Evan Prodromou [Wed, 23 Mar 2011 15:59:01 +0000 (11:59 -0400)]
Some fixes to make the notice stream class work

13 years agolet Inbox class go fingerpokin' in streams
Evan Prodromou [Wed, 23 Mar 2011 15:42:52 +0000 (11:42 -0400)]
let Inbox class go fingerpokin' in streams

13 years agoNew NoticeStream class to reify streams of notices
Evan Prodromou [Wed, 23 Mar 2011 15:29:55 +0000 (11:29 -0400)]
New NoticeStream class to reify streams of notices

We've been muddling through with 6- or 8-argument functions for managing streams. I'd
like to start thinking of streams as their own thing, and give them some more value.

So, the new NoticeStream class takes over the Notice::stream() function and Notice::getStreamByIds().

There's probably some fine-tuning to do on the object interface.

13 years agoRefactoring on notification mail generation: common profile & footer chunks pulled...
Brion Vibber [Tue, 22 Mar 2011 23:26:26 +0000 (16:26 -0700)]
Refactoring on notification mail generation: common profile & footer chunks pulled out, notifications added for group joins.

13 years agoMerge branch 'limitdist' of gitorious.org:~evan/statusnet/evans-mainline into limitdist
Evan Prodromou [Tue, 22 Mar 2011 22:17:09 +0000 (18:17 -0400)]
Merge branch 'limitdist' of gitorious.org:~evan/statusnet/evans-mainline into limitdist

Conflicts:
classes/Notice.php

13 years agoadd profile to stream function
Evan Prodromou [Tue, 22 Mar 2011 22:15:53 +0000 (18:15 -0400)]
add profile to stream function

13 years agoFix typo in cf45c978
Brion Vibber [Tue, 22 Mar 2011 21:20:21 +0000 (14:20 -0700)]
Fix typo in cf45c978

13 years agomove scope check to Notice so we can have a null profile
Evan Prodromou [Tue, 22 Mar 2011 15:36:48 +0000 (11:36 -0400)]
move scope check to Notice so we can have a null profile

13 years agofunction for checking scope rules for Profile
Evan Prodromou [Thu, 17 Mar 2011 02:55:14 +0000 (22:55 -0400)]
function for checking scope rules for Profile

13 years agoadd scope flags for Notice
Evan Prodromou [Thu, 17 Mar 2011 02:54:57 +0000 (22:54 -0400)]
add scope flags for Notice

13 years agoAdd scope bitmap for notices
Evan Prodromou [Thu, 17 Mar 2011 02:30:31 +0000 (22:30 -0400)]
Add scope bitmap for notices

13 years agoMass replacement of #-comments with //-comments
Evan Prodromou [Tue, 22 Mar 2011 15:54:23 +0000 (11:54 -0400)]
Mass replacement of #-comments with //-comments

like leprous boils in our code. So, I've replaced all of them with //
comments instead. It's a massive, meaningless, and potentially buggy
change -- great one for the middle of a release cycle, eh?

13 years agoAdd pending members list to group navigation, if group has joins moderated or if...
Brion Vibber [Tue, 22 Mar 2011 00:23:13 +0000 (17:23 -0700)]
Add pending members list to group navigation, if group has joins moderated or if it has pending requests open

13 years agoSplit up some list/form classes, and get the 'approve' and 'cancel' links on group...
Brion Vibber [Tue, 22 Mar 2011 00:17:18 +0000 (17:17 -0700)]
Split up some list/form classes, and get the 'approve' and 'cancel' links on group member queue working.

13 years agoPending members queue list -- doesn't yet allow approval.
Brion Vibber [Mon, 21 Mar 2011 23:40:10 +0000 (16:40 -0700)]
Pending members queue list -- doesn't yet allow approval.

13 years agoLogic to have group joins turn into pending joins automatically when group is set...
Brion Vibber [Mon, 21 Mar 2011 23:26:41 +0000 (16:26 -0700)]
Logic to have group joins turn into pending joins automatically when group is set to mod; allow users to cancel their pending group requests.

13 years agoTweaking request_queue -> group_join_queue, easier to deal with the indexes and keys...
Brion Vibber [Mon, 21 Mar 2011 22:04:32 +0000 (15:04 -0700)]
Tweaking request_queue -> group_join_queue, easier to deal with the indexes and keys and caching this way.

13 years agoSwitch things from calling Group_member::join & leave & calling events manually to...
Brion Vibber [Mon, 21 Mar 2011 21:35:29 +0000 (14:35 -0700)]
Switch things from calling Group_member::join & leave & calling events manually to running through Profile::joinGroup() && Profile::leaveGroup(), with the events encapsulated.

13 years agoAdd request_queue table and user_group.join_policy column, for upcoming join & subscr...
Brion Vibber [Mon, 21 Mar 2011 20:30:40 +0000 (13:30 -0700)]
Add request_queue table and user_group.join_policy column, for upcoming join & subscription moderation.
UI for setting the join policy is in, but not yet used.

13 years agoremove type hinting -- fails when ArrayWrapper gets passed in some profile list pages
Brion Vibber [Mon, 21 Mar 2011 18:18:38 +0000 (11:18 -0700)]
remove type hinting -- fails when ArrayWrapper gets passed in some profile list pages

13 years agoWidget automatically delegates unimplemented methods to attribute
Evan Prodromou [Mon, 21 Mar 2011 15:09:16 +0000 (11:09 -0400)]
Widget automatically delegates unimplemented methods to  attribute

13 years agoFew IE fixes for neo theme.
Samantha Doherty [Mon, 21 Mar 2011 13:16:00 +0000 (09:16 -0400)]
Few IE fixes for neo theme.

13 years agoRemove stray get_class() call
Zach Copley [Mon, 21 Mar 2011 02:37:25 +0000 (19:37 -0700)]
Remove stray get_class() call

13 years agoModPlus plugin -- Ticket #3095: add remote profile options popup to group membership...
Brion Vibber [Fri, 18 Mar 2011 23:35:50 +0000 (16:35 -0700)]
ModPlus plugin -- Ticket #3095: add remote profile options popup to group membership and other profile lists

Popup remote profile options menu now shown on profile lists as well as notice lists.

13 years agofix ModPlus 'remote profile options' popup for Realtime
Brion Vibber [Fri, 18 Mar 2011 23:23:22 +0000 (16:23 -0700)]
fix ModPlus 'remote profile options' popup for Realtime

Switched from one-time setup to live stuff that'll work without per-notice setup.
Used to not matter because Realtime wouldn't include the extra stuff, but new Realtime pulls the full rendering, so yay!

13 years agoFixes for GroupPrivateMessage, OStatus due to changes in group output events, and...
Brion Vibber [Fri, 18 Mar 2011 22:00:02 +0000 (15:00 -0700)]
Fixes for GroupPrivateMessage, OStatus due to changes in group output events, and some internal bugs using wrong vars

13 years agoMerge branch 'more' into 1.0.x
Brion Vibber [Fri, 18 Mar 2011 21:06:32 +0000 (14:06 -0700)]
Merge branch 'more' into 1.0.x

13 years agoTickets #1610, #1949: show permalinks on Popular Notices, attachments aside sections
Brion Vibber [Fri, 18 Mar 2011 20:58:13 +0000 (13:58 -0700)]
Tickets #1610, #1949: show permalinks on Popular Notices, attachments aside sections

These mini notice lists were previously not actually showing links to the notices, making them hard to use. There was code to output a link, but it had been unused due to the config options triggering it not being set. The links also looked bad ("( see )" with bad spacing).
Replaced that code with a call into NoticeListItem's existing code to format a relative timestamp with the notice permalink, which looks nice. Used a div rather than p to avoid clearing the float, so it flows nicely.

13 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Fri, 18 Mar 2011 19:59:45 +0000 (20:59 +0100)]
Localisation updates from http://translatewiki.net.

13 years agoTranslator documentation added/updated.
Siebrand Mazeland [Fri, 18 Mar 2011 19:37:04 +0000 (20:37 +0100)]
Translator documentation added/updated.
Superfluous whitespace removed.
L10n update.

13 years agoAdd myself to contributors array.
Siebrand Mazeland [Fri, 18 Mar 2011 19:15:57 +0000 (20:15 +0100)]
Add myself to contributors array.

13 years agoi18n updates.
Siebrand Mazeland [Fri, 18 Mar 2011 19:12:59 +0000 (20:12 +0100)]
i18n updates.
Translator documentation added.
Superfluous whitespace removed.

13 years agoTranslator documentation added/updated.
Siebrand Mazeland [Fri, 18 Mar 2011 17:03:41 +0000 (18:03 +0100)]
Translator documentation added/updated.
i18n updates.
Superfluous whitespace removed.

13 years agoFixed issues with plural handling.
Siebrand Mazeland [Fri, 18 Mar 2011 16:59:51 +0000 (17:59 +0100)]
Fixed issues with plural handling.
L10n/I18n updates.
Translator documentation added.
Superfluous whitespace removed.

13 years agoTranslator documentation added/updates.
Siebrand Mazeland [Fri, 18 Mar 2011 16:04:38 +0000 (17:04 +0100)]
Translator documentation added/updates.
L10n/i18n updates.
Superfluous whitespace removed.

13 years agoMerge branch '1.0.x' of git://gitorious.org/statusnet/mainline into 1.0.x
Siebrand Mazeland [Fri, 18 Mar 2011 15:09:27 +0000 (16:09 +0100)]
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline into 1.0.x

13 years agoUpdate/add translator documentation.
Siebrand Mazeland [Fri, 18 Mar 2011 12:48:47 +0000 (13:48 +0100)]
Update/add translator documentation.
L10n/i18n updates.
Superfluous whitespace removed.

13 years ago* Add FIXME: $profile appears to be undefined.
Siebrand Mazeland [Fri, 18 Mar 2011 12:10:55 +0000 (13:10 +0100)]
* Add FIXME: $profile appears to be undefined.
* Update translator documentation.

13 years agoCaching for conversation root lookup, some logic fixes in threaded view
Brion Vibber [Fri, 18 Mar 2011 00:36:53 +0000 (17:36 -0700)]
Caching for conversation root lookup, some logic fixes in threaded view

13 years agoUse cached sources for favorites & repeats info on threaded notice lists
Brion Vibber [Fri, 18 Mar 2011 00:06:04 +0000 (17:06 -0700)]
Use cached sources for favorites & repeats info on threaded notice lists

13 years agoajax load for additional inline replies; /replies variant of conversationview
Brion Vibber [Thu, 17 Mar 2011 23:27:42 +0000 (16:27 -0700)]
ajax load for additional inline replies; /replies variant of conversationview

13 years agoFixes for race conditions between Realtime plugin and the AJAX display of inline...
Brion Vibber [Thu, 17 Mar 2011 22:54:40 +0000 (15:54 -0700)]
Fixes for race conditions between Realtime plugin and the AJAX display of inline replies.

* keep the notice-reply-placeholder around, but hidden
* insert things before the placeholder, rather than appending to the end of the list.
* append the active form after the hidden placeholder, so things inserted before the placeholder never come after it
* Realtime: check pre-existing notice visibility a second time after loading the HTML for a notice. Fixes bug where sometimes your own post would be shown twice because the Realtime notification arrived before the AJAX posting returned, but Realtime's AJAX fetch of the notice returned after.

13 years agoInitial use of inline reply area for marking repeats...
Brion Vibber [Thu, 17 Mar 2011 22:17:45 +0000 (15:17 -0700)]
Initial use of inline reply area for marking repeats...

13 years agoMerge branch 'faves' into 1.0.x
Brion Vibber [Thu, 17 Mar 2011 21:48:14 +0000 (14:48 -0700)]
Merge branch 'faves' into 1.0.x

13 years agoInitial inline listing of favoriters
Brion Vibber [Thu, 17 Mar 2011 21:19:03 +0000 (14:19 -0700)]
Initial inline listing of favoriters

13 years agoFavored lists in progress: 'foo, bar and baz'
Brion Vibber [Thu, 17 Mar 2011 20:51:55 +0000 (13:51 -0700)]
Favored lists in progress: 'foo, bar and baz'

13 years agowork in progress
Brion Vibber [Thu, 17 Mar 2011 20:25:20 +0000 (13:25 -0700)]
work in progress

13 years agoWork in progress: faves in the threaded reply area
Brion Vibber [Thu, 17 Mar 2011 20:07:17 +0000 (13:07 -0700)]
Work in progress: faves in the threaded reply area

13 years agoMerge branch '1.0.x' into msn-plugin
Luke Fitzgerald [Thu, 17 Mar 2011 20:00:06 +0000 (20:00 +0000)]
Merge branch '1.0.x' into msn-plugin

13 years agoMerge remote branch 'origin/1.0.x' into 1.0.x
Evan Prodromou [Thu, 17 Mar 2011 19:28:18 +0000 (15:28 -0400)]
Merge remote branch 'origin/1.0.x' into 1.0.x

13 years agosome flushing in the UI
Evan Prodromou [Fri, 21 Jan 2011 19:23:02 +0000 (14:23 -0500)]
some flushing in the UI

13 years agoFix reversed poll & poll response object types in ActivityStreams output
Brion Vibber [Thu, 17 Mar 2011 19:13:46 +0000 (12:13 -0700)]
Fix reversed poll & poll response object types in ActivityStreams output