Commit Graph

12833 Commits

Author SHA1 Message Date
Evan Prodromou
d69f912b00 Merge branch '1.0.x' into limitdist2 2011-03-25 16:18:10 -04:00
Evan Prodromou
7a56637baa 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.
2011-03-25 16:15:55 -04:00
Evan Prodromou
e0d5093ee5 Merge branch '1.0.x' into limitdist2
Conflicts:
	lib/groupnoticestream.php
	lib/taggedprofilenoticestream.php
2011-03-25 15:57:07 -04:00
Evan Prodromou
84984fdbfe 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.
2011-03-25 12:22:22 -04:00
Siebrand Mazeland
074be0d51e i18n fixes.
Translator documentation updates.
2011-03-25 17:12:53 +01:00
Evan Prodromou
0c3f8208cd Merge branch 'limitdist' into limitdist2 2011-03-25 11:46:49 -04:00
Siebrand Mazeland
ac955699b6 Fix use of incorrect method causing i18n issue. 2011-03-25 10:13:26 +01:00
Siebrand Mazeland
3cc7dda478 * PHP short tags "<?" to full tag "<?php".
* superfluous whitespace removed.
2011-03-25 10:02:02 +01:00
Siebrand Mazeland
41e919f3ca L10n update.
Translator documentation added.
Superfluous whitespace removed.
2011-03-25 09:55:33 +01:00
Brion Vibber
d994b4583a 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.
2011-03-24 18:41:25 -07:00
Evan Prodromou
22bf63bb46 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-03-24 18:05:32 -04:00
Evan Prodromou
44bcc942b8 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.
2011-03-24 18:04:19 -04:00
Zach Copley
c1a27922ba Merge branch '1.0.x' into qna
* 1.0.x: (26 commits)
  Fix typo in documentation.
  Fix i18n.
  Change formatting of i18n slightly. Translator hints were not picked up in pot file. May now they are.
  Localisation updates from http://translatewiki.net.
  Translator documentation updated. i18n/L10n updates. Superfluous whitespace removed. Add FIXME for missing class documentation.
  Update translator documentation. Remove superfluous whitespace. L10n/I18n updates. FIXMEs added for missing documentation or headers.
  Update translator documentation. i18n/L10n updates. Superfluous whitespace removed. Add FIXME in files with missing documentation.
  Fallback for RSVP display when Event is deleted
  Enhancement for 'ajax' form class: submit buttons behave more like normal submissions, submitting their name/values through a hidden field.
  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...
  Some fixes to make the notice stream class work
  let Inbox class go fingerpokin' in streams
  New NoticeStream class to reify streams of notices
  Refactoring on notification mail generation: common profile & footer chunks pulled out, notifications added for group joins.
  Fix typo in cf45c978
  Mass replacement of #-comments with //-comments
  Add pending members list to group navigation, if group has joins moderated or if it has pending requests open
  Split up some list/form classes, and get the 'approve' and 'cancel' links on group member queue working.
  Pending members queue list -- doesn't yet allow approval.
  Logic to have group joins turn into pending joins automatically when group is set to mod; allow users to cancel their pending group requests.
  ...
2011-03-24 14:03:04 -07:00
Siebrand Mazeland
8a8a194316 Fix typo in documentation. 2011-03-24 17:02:28 +01:00
Siebrand Mazeland
3810482d1c Fix i18n. 2011-03-24 16:52:32 +01:00
Siebrand Mazeland
53d3455749 Change formatting of i18n slightly. Translator hints were not picked up in pot file. May now they are. 2011-03-24 16:47:29 +01:00
Siebrand Mazeland
4e64bd4e5b Localisation updates from http://translatewiki.net. 2011-03-24 16:08:03 +01:00
Siebrand Mazeland
e0cccfc40d Translator documentation updated.
i18n/L10n updates.
Superfluous whitespace removed.
Add FIXME for missing class documentation.
2011-03-24 12:09:50 +01:00
Siebrand Mazeland
78edb4bf56 Update translator documentation.
Remove superfluous whitespace.
L10n/I18n updates.
FIXMEs added for missing documentation or headers.
2011-03-24 11:48:53 +01:00
Siebrand Mazeland
3be26565fb Update translator documentation.
i18n/L10n updates.
Superfluous whitespace removed.
Add FIXME in files with missing documentation.
2011-03-24 11:48:51 +01:00
Evan Prodromou
483922f1c4 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-03-23 22:11:13 -04:00
Evan Prodromou
bd11d11bfc Fallback for RSVP display when Event is deleted 2011-03-23 22:10:44 -04:00
Brion Vibber
2707a481e4 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!
2011-03-23 15:21:31 -07:00
Brion Vibber
265f9af6f7 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... 2011-03-23 15:21:12 -07:00
Evan Prodromou
eb1faa7865 Merge branch '1.0.x' into limitdist
Conflicts:
	classes/Notice.php
2011-03-23 15:58:27 -04:00
Evan Prodromou
2b901894c2 Some fixes to make the notice stream class work 2011-03-23 11:59:01 -04:00
Evan Prodromou
efb6a7b441 let Inbox class go fingerpokin' in streams 2011-03-23 11:42:52 -04:00
Evan Prodromou
0b35ce7c37 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.
2011-03-23 11:29:55 -04:00
Brion Vibber
14a6ab2b04 Refactoring on notification mail generation: common profile & footer chunks pulled out, notifications added for group joins. 2011-03-22 16:50:27 -07:00
Evan Prodromou
fd8dad3963 Merge branch 'limitdist' of gitorious.org:~evan/statusnet/evans-mainline into limitdist
Conflicts:
	classes/Notice.php
2011-03-22 18:17:09 -04:00
Evan Prodromou
31e7d46a5b add profile to stream function 2011-03-22 18:15:53 -04:00
Brion Vibber
a12680e8d5 Fix typo in cf45c978 2011-03-22 14:20:21 -07:00
Evan Prodromou
26a4bd7dbf move scope check to Notice so we can have a null profile 2011-03-22 11:56:28 -04:00
Evan Prodromou
7fc5679e7e function for checking scope rules for Profile 2011-03-22 11:56:28 -04:00
Evan Prodromou
6cdbe47e72 add scope flags for Notice 2011-03-22 11:56:28 -04:00
Evan Prodromou
7f74aa6c20 Add scope bitmap for notices 2011-03-22 11:56:28 -04:00
Evan Prodromou
83fb5e6023 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?
2011-03-22 11:54:23 -04:00
Zach Copley
7f4bd6b69f Work on QnA notice display -- in progress 2011-03-21 20:57:19 -07:00
Brion Vibber
61960d3668 Add pending members list to group navigation, if group has joins moderated or if it has pending requests open 2011-03-21 17:23:13 -07:00
Brion Vibber
942887ca8c Split up some list/form classes, and get the 'approve' and 'cancel' links on group member queue working. 2011-03-21 17:17:18 -07:00
Zach Copley
b0ed4cb89a * Move stuff around again
* Make answers save
2011-03-21 16:51:38 -07:00
Brion Vibber
6bdb1053ad Pending members queue list -- doesn't yet allow approval. 2011-03-21 16:40:10 -07:00
Brion Vibber
471a480587 Logic to have group joins turn into pending joins automatically when group is set to mod; allow users to cancel their pending group requests. 2011-03-21 16:26:41 -07:00
Zach Copley
73c3344cc3 * Fix plugin filename
* Make questions save!
2011-03-21 15:50:36 -07:00
Brion Vibber
a54eb0941e Tweaking request_queue -> group_join_queue, easier to deal with the indexes and keys and caching this way. 2011-03-21 15:05:36 -07:00
Brion Vibber
541dfa04fe Switch things from calling Group_member::join & leave & calling events manually to running through Profile::joinGroup() && Profile::leaveGroup(), with the events encapsulated. 2011-03-21 14:35:29 -07:00
Brion Vibber
0bec9cfdbc 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.
2011-03-21 13:51:13 -07:00
Brion Vibber
01ecca5e60 remove type hinting -- fails when ArrayWrapper gets passed in some profile list pages 2011-03-21 11:20:16 -07:00
Evan Prodromou
0a71622aa7 Widget automatically delegates unimplemented methods to attribute 2011-03-21 11:09:16 -04:00
Samantha Doherty
fac0d8496e Few IE fixes for neo theme. 2011-03-21 09:16:00 -04:00