 Brion Vibber
|
59119482ca
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
|
14 år sedan |
 Zach Copley
|
3960c9ad39
Move blowFavesCache() to Profile
|
14 år sedan |
|
Zach Copley
|
c19e592fa8
Move hasFave() to Profile
|
14 år sedan |
 Evan Prodromou
|
4d01f8fbb6
save a URI with the user
|
14 år sedan |
|
Brion Vibber
|
28b06864fb
Fix for #2227: 'view profile designs' and other default-on options are initially mis-set to off due to caching at account creation
|
14 år sedan |
|
Brion Vibber
|
521daf5562
Ticket #2327: fixing block to remove the blocking user's subscription to the blockee if present; also cleaning up inbox delivery to apply the block checks more consistently, instead of just to group posts.
|
14 år sedan |
|
Evan Prodromou
|
a319b40c97
common_cache_key() -> Cache::key()
|
14 år sedan |
|
Evan Prodromou
|
8f81762d68
common_memcache() => Cache::instance()
|
14 år sedan |
|
Evan Prodromou
|
9f0715a993
Merge branch '0.9.x' into 1.0.x
|
14 år sedan |
 Siebrand Mazeland
|
125ff142e8
* mark a few message for translation
|
14 år sedan |
 Eric Helgeson
|
9b899eea75
Make some messages gender neutral.
|
14 år sedan |
|
Brion Vibber
|
173778eab1
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
|
14 år sedan |
|
Zach Copley
|
b50f300566
Implement since_id and max_id param handling for /api/favorites
|
14 år sedan |
 Craig Andrews
|
39392e03a7
Merge branch '0.9.x' into 1.0.x
|
14 år sedan |
|
Brion Vibber
|
71c828de89
Allow blocking someone who's not currently subscribed to you (prevents seeing @-replies from them, or them subbing to you in future)
|
14 år sedan |
|
Brion Vibber
|
2f4438fe24
Merge branch '0.9.x' into 1.0.x
|
14 år sedan |
|
Evan Prodromou
|
d3f995846b
use Subscription::cancel() to cancel all subscriptions on block
|
14 år sedan |
|
Brion Vibber
|
01a03e34c8
Merge branch '0.9.x' into 1.0.x
|
14 år sedan |
|
Evan Prodromou
|
65766a0ebe
continue deleting even if user profile record is missing
|
14 år sedan |
|
Brion Vibber
|
e89908f261
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 1.0.x
|
15 år sedan |
|
Brion Vibber
|
cac9d23498
Fix for xmpp/sms notification options appearing to be disabled on new subscriptions.
|
15 år sedan |
|
Brion Vibber
|
1de7badd78
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
|
15 år sedan |
|
Brion Vibber
|
515cdf28a8
Ensure that DB connection is active at start of User::updateKeys() and Foreign_user::updateKeys(); calls to $this->_quote() require a live connection object and don't lazy-initialize themselves.
|
15 år sedan |
|
Evan Prodromou
|
425ddcaa26
add exception on inconsistent db to User::getProfile()
|
15 år sedan |
 Sarven Capadisli
|
4c320872d9
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
|
15 år sedan |
|
Brion Vibber
|
ce92bc7143
Drop timestamp cutoff parameter from User::getCurrentNotice() and Profile::getCurrentNotice().
|
15 år sedan |
|
Craig Andrews
|
714d920fae
Merge branch '0.9.x' into 1.0.x
|
15 år sedan |
|
Brion Vibber
|
b218aee94e
Merge commit 'origin/testing' into 0.9.x
|
15 år sedan |
|
Brion Vibber
|
3bb42d1170
Use poster's subscribed groups to disambiguate group linking when a remote group and a local group exist with the same name. (If you're a member of two groups with the same name though, there's not a defined winner.)
|
15 år sedan |
|
Brion Vibber
|
ddf3614c84
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
|
15 år sedan |
