Commit Graph

13101 Commits

Author SHA1 Message Date
Evan Prodromou
865c1bc278 Merge remote branch 'gitorious/1.0.x' into 1.0.x 2011-03-28 21:55:59 -04:00
Brion Vibber
c1683d9925 Durr... got items in wrong order :D Fixed email notification for pending subscribes 2011-03-28 17:22:37 -07:00
Brion Vibber
5d31dd259a Subscription pending notification mail 2011-03-28 17:15:48 -07:00
Brion Vibber
e5b5c256a3 Working subscription approval! 2011-03-28 17:08:04 -07:00
Brion Vibber
a70e68e09c Work in progress: can create & cancel sub requests 2011-03-28 16:12:51 -07:00
Brion Vibber
df5def8ce4 Work in progress: subscription approval policy field in place on user, hooked up to settings. Queue not 100% tidied up, no UI for queue or management yet. 2011-03-28 15:13:59 -07:00
Brion Vibber
11b40ddb1b work in progress... 2011-03-28 13:59:48 -07:00
Brion Vibber
4eb02c624e Subscription_queue class for subscription approval 2011-03-28 13:59:48 -07:00
Evan Prodromou
a74eda4e9a don't send private notices over OStatus 2011-03-28 16:37:35 -04:00
Evan Prodromou
798b03fb5f set default address for showstream 2011-03-28 16:24:28 -04:00
Evan Prodromou
a7380d5933 set default address for showgroup 2011-03-28 16:24:17 -04:00
Evan Prodromou
ec5a43bf4f let actions set a default address for toselector 2011-03-28 16:24:02 -04:00
Evan Prodromou
dca5e20b91 Make the to-selector clear left 2011-03-28 16:23:31 -04:00
Evan Prodromou
cbe003eb38 don't leak private notices to facebook 2011-03-28 16:10:24 -04:00
Evan Prodromou
683bd3f2b5 don't push twitter stuff public if its not public 2011-03-28 12:56:18 -04:00
Evan Prodromou
7dd06b5246 ShortenAction::handle() had bad args 2011-03-28 12:20:00 -04:00
Evan Prodromou
b1783e8d49 make to_user/to_profile consistent in NoticeForm 2011-03-28 12:13:46 -04:00
Evan Prodromou
b0deaad700 Add a check to prevent replying to an unscoped notice 2011-03-28 12:01:08 -04:00
Evan Prodromou
5147404ea2 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.
2011-03-28 11:02:20 -04:00
Evan Prodromou
133def8370 Merge branch '1.0.x' into limitdist2 2011-03-28 10:04:45 -04:00
Siebrand Mazeland
52d29a17a0 Fix incorrect translator documentation. Spotted by AVRS. 2011-03-28 01:43:01 +02:00
Evan Prodromou
c1fd36c043 Merge branch '1.0.x' into limitdist2 2011-03-27 11:36:57 -04:00
Evan Prodromou
889b35be9c Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-03-27 11:26:57 -04:00
Evan Prodromou
c7defb32f9 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.
2011-03-27 11:25:24 -04:00
Siebrand Mazeland
1adaa6a2ab Update grammar for feed title. Not sure why this was not "%s's". I chose the safe, more verbose way. 2011-03-27 13:05:24 +02:00
Siebrand Mazeland
f06f8d51fd Slightly uncomplicate and disambiguate the plugin description.
Add translator documentation.
2011-03-27 12:58:35 +02:00
Evan Prodromou
53a3fd822d add indicator for limited-scope notices 2011-03-26 16:47:36 -04:00
Evan Prodromou
e11c69fd81 always allow author to see own notices 2011-03-26 16:47:18 -04:00
Evan Prodromou
82b38b62a4 clearer scope rules for anonymous and author 2011-03-26 16:23:20 -04:00
Evan Prodromou
47b3fdf059 add scope limit flags to some notices in createsim.php 2011-03-26 16:06:17 -04:00
Evan Prodromou
c7f866b032 Caller can set scope for Notice::saveNew() 2011-03-26 15:49:46 -04:00
Evan Prodromou
cd8717ca09 Merge branch '1.0.x' into limitdist2 2011-03-26 15:37:05 -04:00
Evan Prodromou
841a9130e9 fix off-by-one and more replies 2011-03-26 15:36:47 -04:00
Evan Prodromou
efab3c6558 All groups start with a random admin 2011-03-26 15:16:04 -04:00
Evan Prodromou
6902c0af35 Add group posts to createsim.php 2011-03-26 15:08:27 -04:00
Evan Prodromou
bc2f64d7ab Add reply_to to make conversations in createsim.php 2011-03-26 14:58:11 -04:00
Evan Prodromou
a5fd9b705a upgrade DB_DataObject to 1.9.5 2011-03-26 14:45:15 -04:00
Evan Prodromou
75baffc970 Upgrade PEAR to 1.9.2 2011-03-26 14:37:42 -04:00
Evan Prodromou
d1d5d234f8 upgrade Console_GetOpt to 1.9.2 2011-03-26 14:22:24 -04:00
Siebrand Mazeland
5502e535de Localisation updates from http://translatewiki.net. 2011-03-26 12:21:36 +01:00
Evan Prodromou
3e293363f6 add groups and joins to createsim.php 2011-03-25 17:39:14 -04:00
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