Shashi Gowda
5a2bab07b2
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
...
Conflicts:
actions/tagother.php
classes/Profile.php
classes/Profile_tag.php
js/util.min.js
2011-03-30 15:47:42 +05:30
Evan Prodromou
65694366df
Add a scope-forcing flag to user_group
2011-03-30 05:55:10 -04:00
Evan Prodromou
f213ac33db
fix call-by-reference deprecation warning in microappplugin.php
2011-03-30 05:10:07 -04:00
Brion Vibber
2e56e11482
Note explicitly that you can pass null to Notice::inScope()
2011-03-29 17:01:53 -07:00
Brion Vibber
1c63ae29fe
typo fix in format string
2011-03-29 17:00:00 -07:00
Brion Vibber
20ca5027cc
Consolidate common code in micro-apps custom notice type display actions.
...
The ShowNoticeAction subclasses were cut-n-pasting a lot of prepare() code from ShowNoticeAction, though the only part that's different is how we look up the notice. Broke that out to a getNotice() method, so only that needs to be copied. Avoids extra copies of permission checks and other common code in this spot.
2011-03-29 16:58:15 -07:00
Brion Vibber
23436ad83d
Fix for bookmark posting: missing object was causing error output to crush ajax
2011-03-29 16:50:06 -07:00
Brion Vibber
674e3c2a0e
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
...
Conflicts:
actions/apistatusesretweet.php
actions/repeat.php
classes/Notice.php
lib/command.php
2011-03-29 16:26:20 -07:00
Brion Vibber
9adbb49fc9
Consolidate some precondition checks for repeats, fix a couple bits in the repeat command.
...
Notice::saveNew() now does these checks directly when making a repeat:
* make sure the original is valid and existing
* stop you from repeating your own message
* stop you from repeating something you've previously repeated
* prevent repeats of any non-public messages
* explicit inScope() check to make sure you can read the original too (just in case there's a funky extension at play that changes scoping rules)
These error conditions throw exceptions, which the caller either uses as an error message or passes on up the stack, without having to duplicate the checks in each i/o channel.
2011-03-29 16:20:12 -07:00
Brion Vibber
8286edce28
fix regression in group join approval due to refactoring (forgot to remove a param)
2011-03-29 16:18:51 -07:00
Siebrand Mazeland
0a19674c9f
@evan Fixed message domain for messages in plugins for recent commits.
...
Numbered parameters when more than one used in a message.
L10n updates for consistency.
i18n for non-translatable exception.
Updated translator documentation.
Removed superfluous whitespace.
2011-03-30 00:48:41 +02:00
Brion Vibber
880661de4e
Paging fix for public timeline: drop replies from the stuff we pull in for the threaded web view.
2011-03-29 15:40:07 -07:00
Brion Vibber
18a994d105
Fix typo in filteringnoticestream that caused some messages to get lost
2011-03-29 15:19:04 -07:00
Brion Vibber
d7304d5659
php notice fix -- misspelled bit
2011-03-29 15:05:54 -07:00
Evan Prodromou
9f1603462d
Merge branch 'limitdist2' into 1.0.x
2011-03-29 17:32:17 -04:00
Evan Prodromou
3898039617
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2011-03-29 17:31:17 -04:00
Siebrand Mazeland
ede8fabb55
Fix incorrect translator documentation. Spotted by AVRS.
2011-03-29 23:14:40 +02:00
Siebrand Mazeland
700018fd09
L10n/i18n updated.
...
Translator documentation updated.
FIXME added for missing class documentation.
Various documentation tweaks.
2011-03-29 23:00:29 +02:00
Siebrand Mazeland
a8af04feea
Update translator documentation.
...
Superfluous whitespace removed.
L10n consistency updates.
2011-03-29 21:30:36 +02:00
Siebrand Mazeland
f2d7c33ad3
Update translator documentation.
...
Remove superfluous whitespace.
Various L10n/i18n updates.
2011-03-29 21:30:35 +02:00
Evan Prodromou
31fd4dbe3b
Repeats keep the same scope as parent
2011-03-29 12:12:08 -04:00
Evan Prodromou
32145484c2
Disallow repeats (retweets) of private notices
...
We disallow repeating a notice (or whatever) if the scope of the
notice is too private. So, only notices that are public scope
(available to everyone in the world) or site scope (available to
everyone on the site) can be repeated.
Enforce this rule at a low level in Notice.php, and in the API,
commands, and Web UI. Repeat button doesn't appear on tightly-scoped
notices in the Web UI.
2011-03-29 11:53:26 -04:00
Evan Prodromou
b6190676b1
Merge remote branch 'evan/1.0.x' into 1.0.x
2011-03-29 10:31:09 -04:00
Evan Prodromou
908551ae3d
disallow access to out-of-scope poll
2011-03-28 22:50:52 -04:00
Evan Prodromou
2856982a1c
disallow access to out-of-scope bookmark
2011-03-28 22:50:45 -04:00
Evan Prodromou
57dee164ca
fix missing cur in Event
2011-03-28 22:50:29 -04:00
Evan Prodromou
c1d4186c98
Disallow access to events and RSVPs out of scope
2011-03-28 22:43:38 -04:00
Evan Prodromou
7b8fc701e0
don't show notices to out-of-scope viewers
2011-03-28 22:21:41 -04:00
Evan Prodromou
e862dcdb8a
Merge branch '1.0.x' into limitdist2
2011-03-28 21:56:34 -04:00
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
