wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,802 Commits 8 Branches 0 Tags 330 MiB
8333ac33c8
Commit Graph

12802 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan Prodromou
8333ac33c8 if user has private stream flag, set that scope 2011-03-31 12:56:53 -04:00
Evan Prodromou
5afa503364 Merge remote branch 'gitorious/1.0.x' into 1.0.x 2011-03-31 09:25:03 -04:00
Brion Vibber
24945715d0 Provisional fix for ticket #3108: Facebook bridge sends "likes" as the notice's original poster instead of as the person doing the liking. 
Adds optional $profile parameter for Facebookclient constructor and uses that for the foreign_link lookup if provided instead of the notice's poster.
 2011-03-30 17:02:40 -07:00
Siebrand Mazeland
14456cbbb2 Fix gettext domain for messages in plugins "_()" to "_m()". 
Some other i18n and L10n updates, too.

i18n/L10n review not complete.
 2011-03-30 22:31:23 +02:00
Evan Prodromou
f70bcbdb6b save private stream values 2011-03-30 16:23:13 -04:00
Brion Vibber
0ac0925309 Fix timestamps in fallback content for EventPlugin 
A bunch of the common_* functions for date formatting expect an interpretable string, rather than a Unix timestamp, as input. Switched to using the DB-formatted timestamps as we put them into the object rather than the unix timestamp intermediate value when formatting the plaintext and HTML fallback content.
 2011-03-30 12:50:56 -07:00
Brion Vibber
da7c54023d Format timestamps as UTC in ActivityStreams output. While using local times is legit per spec, it's confusing to have it change around and confuses some clients that don't handle zones right. 2011-03-30 12:36:54 -07:00
Brion Vibber
d2cd5b3353 Tweak which should fix ActivityStreams output for Twitter profiles (if remote_profile entries didn't match, we ended up losing id/URI). 
Explicitly uses the Twitter profile URL as profile URI if matching, without having to check the db.
 2011-03-30 11:22:32 -07:00
Evan Prodromou
4f5355a9f2 add the private_stream attribute to User 2011-03-30 08:16:30 -04:00
Evan Prodromou
9d0ccbff01 add a privacy flag to user table 2011-03-30 06:37:13 -04:00
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