Evan Prodromou
bac2d80c91
Merge branch '0.9.x' into adminpanel
...
Conflicts:
classes/User.php
2009-11-17 08:04:14 -05:00
Evan Prodromou
6a1afda259
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
classes/statusnet.ini
2009-11-17 06:25:07 -05:00
Brion Vibber
75c00f0054
Bug 1655/bug 1905: fix for Internet Explorer receiving FOAF output when clicking user links.
...
User links using the ID number (such as created for @-replies) have been failing on Internet Explorer, since IE doesn't bother to actually say it supports text/html...
We usually get something like this from IE, up through at least IE 8:
Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/x-shockwave-flash, */*
The */* ended up matching application/rdf+xml instead of text/html, so only other browsers which are more explicit would actually get sent on to the user profile/notice stream; IE visitors were directed on to the FOAF download. :(
Swapping the order of items in the server-side of the negotiation list fixes this; clients actually asking for FOAF at a higher priority than HTML will still get it, but the wildcard */* now matches text/html which is usually what we want.
Content negotiation for the user links was added August 2008 in commit 48fcfb8b0d
.
2009-11-16 17:25:38 -08:00
Zach Copley
aee6e2d91c
Merge branch '0.8.x'
2009-11-17 00:31:19 +00:00
Sarven Capadisli
a6399ce73a
Showing counter for new notices only if the window is on blur
2009-11-17 00:28:56 +00:00
Sarven Capadisli
ca31504dd9
Using the right selector for notice_reply
2009-11-17 00:07:21 +00:00
Brion Vibber
8ab40e7051
Cleanup for bug 1813: workaround sometimes-missing dl() in PHP 5.3 by defining our own bogus function rather than attempting to patch upstream libs. This keeps our fix across upstream versions (or when loading upstream library from outside extlib)
...
Note that fixes to OpenID libraries in commit fe9473ac78
were lost in just such an update.
2009-11-16 15:45:15 -08:00
Brion Vibber
6f9b909211
Fix for PHP spewing notices from commit a373d07ae0
...
Please test with error_reporting set to E_ALL!
Classnames and function names aren't first-class objects in PHP and need to be referenced as strings here. :(
2009-11-16 15:36:30 -08:00
Zach Copley
fb646654a2
Merge branch '0.8.x'
2009-11-16 22:25:58 +00:00
Sarven Capadisli
8b4fd41421
Added NoticeFavors() for received notices
2009-11-16 22:16:55 +00:00
Sarven Capadisli
be73757131
Unbinding the events from Notice reply and favor for possible memory
...
leaks
2009-11-16 22:16:08 +00:00
Sarven Capadisli
629532e2da
Added update delay and max notice count
2009-11-16 22:00:15 +00:00
Zach Copley
bcc414bc9f
Merge branch '0.8.x'
2009-11-16 21:49:51 +00:00
Craig Andrews
e4d191334f
Only show local notices or (remote notices if they're supposed to be shown)
2009-11-16 16:19:27 -05:00
Craig Andrews
a99198ba94
Do proper translations for plurals
2009-11-16 15:57:57 -05:00
Craig Andrews
003e4e2a23
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2009-11-16 15:53:09 -05:00
Craig Andrews
a373d07ae0
Allow plugin DB_DataObject classes to not have to use the .ini file by overriding keys(), table(), and sequenceKey() for them
2009-11-16 15:24:25 -05:00
Eric Helgeson
e14c88f6c5
Consistant error for groups that dont exist in API
2009-11-16 15:00:36 -05:00
Eric Helgeson
b7a08fdacc
+x deleteuser.php
2009-11-16 15:00:36 -05:00
Siebrand Mazeland
ca77d54384
Localisation updates from !translatewiki !StatusNet
2009-11-16 20:54:19 +01:00
Evan Prodromou
d59af02960
disallow email on faves from sandboxed users
2009-11-16 14:28:55 -05:00
Evan Prodromou
05ff8925bf
prevent email notification on replies by sandboxed users
2009-11-16 14:18:51 -05:00
Evan Prodromou
2ad4de45e6
block subscribes by silenced users
2009-11-16 14:12:35 -05:00
Evan Prodromou
e150d920a5
silently skip email for subs from sandboxed user
2009-11-16 14:11:14 -05:00
Evan Prodromou
440af7ed7a
silenced users can't send direct messages
2009-11-16 19:51:41 +01:00
Evan Prodromou
e9321a1806
more rights denied to silenced and sandboxed
2009-11-16 19:46:08 +01:00
Evan Prodromou
f1efb845e4
don't allow sandboxed users to post public notices
2009-11-16 19:22:22 +01:00
Evan Prodromou
d2145a5b7f
Move rights check to profile and add right for new notices
...
Added a right for new notices, realized that the hasRight() method
should be on the profile, and moved it.
Makes this a less atomic commit but that's the way it goes sometimes.
2009-11-16 19:03:59 +01:00
Evan Prodromou
02cc7af1b6
try to return to the correct page from FlagProfileForm
2009-11-16 18:29:13 +01:00
Evan Prodromou
55d00a3a90
make profile flag actions work like other profile actions
2009-11-16 18:24:59 +01:00
Evan Prodromou
bea580873f
use return-to method for adminprofileflag
2009-11-16 17:55:00 +01:00
Evan Prodromou
0580e824f0
use return-to method for UserProfile widget
2009-11-16 17:54:50 +01:00
Evan Prodromou
968058c68b
getting arguments for return-to processing
2009-11-16 17:54:34 +01:00
Eric Helgeson
d080afebbe
Refactored Recaptcha plugin to use addPlugin()
...
Also nicer log messages
2009-11-16 11:44:31 -05:00
Evan Prodromou
84e427c6c1
start showing actions for flagged profiles
2009-11-16 17:43:15 +01:00
Craig Andrews
0e7dd81a6c
Added a "groups" command
2009-11-16 11:23:00 -05:00
Craig Andrews
7177585630
getGroups was not handling the case where limit=null correctly
2009-11-16 11:22:45 -05:00
Craig Andrews
73b4d770a2
Changed to StatusNet consistent terminology
2009-11-16 11:17:14 -05:00
Craig Andrews
5b51eeeebb
Bump to version 1.0.0
2009-11-16 11:14:00 -05:00
Evan Prodromou
4f9f3665f7
add routes for silence, sandbox, delete user
2009-11-16 17:06:35 +01:00
Evan Prodromou
a723cc979b
correct constructor for DeleteUserForm
2009-11-16 17:06:12 +01:00
Evan Prodromou
ee5c9a5c90
give UnsilenceForm correct superclass
2009-11-16 17:05:39 +01:00
Evan Prodromou
9cc0d65240
give UnsandboxForm correct superclass
2009-11-16 17:05:31 +01:00
Evan Prodromou
d968b5b4f1
give SilenceForm proper superclass
2009-11-16 17:05:03 +01:00
Evan Prodromou
a2acb2eec5
DeleteUserAction
2009-11-16 17:04:40 +01:00
Evan Prodromou
e290f86c99
make block action use ProfileFormAction superclass
2009-11-16 16:14:49 +01:00
Evan Prodromou
985986e7e9
add sandbox and silence actions
2009-11-16 16:08:06 +01:00
Evan Prodromou
3e08309826
change uses of User_role to Profile_role
2009-11-16 16:06:52 +01:00
Evan Prodromou
dd10e9729b
fix exe flag after createTable
2009-11-16 16:05:22 +01:00
Evan Prodromou
fa00aed88b
remove User_role class
2009-11-16 16:04:51 +01:00