Commit Graph

6440 Commits

Author SHA1 Message Date
Ciaran Gultnieks
158a1ea551 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-11-18 08:26:14 +00:00
Ciaran Gultnieks
904baf4d27 Missing quotes in postgres db create script 2009-11-18 08:25:58 +00:00
Zach Copley
7ae45abfcc Merge branch 'admin-sections' into 0.9.x
* admin-sections:
  First draft of the admin panel for site design
  Get rid of empty select in theme dropdown
2009-11-18 00:02:02 -08:00
Zach Copley
7e0af92813 First draft of the admin panel for site design 2009-11-18 00:00:05 -08:00
Craig Andrews
7dfce35bea (Theoretically) allow users to change their passwords.
I cannot test this... but I hope it works :-)
2009-11-17 23:22:19 -05:00
Brion Vibber
b7660b3d99 A little cleanup on console.php; save readline history more aggressively; avoid some notice sloppiness) 2009-11-17 17:09:31 -08:00
Brion Vibber
88ff0eefb4 Renaming GeonamesPlugin::NAMESPACE to GeonamesPlugin::LOCATION_NS to avoid parse errors; 'namespace' is a reserved keyword in PHP 5.3 and later. 2009-11-17 16:56:43 -08:00
Zach Copley
7551464d23 Get rid of empty select in theme dropdown 2009-11-17 16:55:45 -08:00
Evan Prodromou
e3123be350 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-11-17 19:35:45 -05:00
Brion Vibber
63ebb033bf Declare global usage in common.php so setup works right when called from phpunit tests
We end up running the tests through a function in PHPUnit, so we don't have automatic global scope at the top level of files all the time...
2009-11-17 16:31:13 -08:00
Evan Prodromou
bcb49b0000 bring the 08-to-09 SQL update script up-to-date 2009-11-17 19:13:09 -05:00
Sarven Capadisli
2c2861b867 Added form_data class 2009-11-17 21:52:33 +00:00
Sarven Capadisli
b44f5753d5 Update form_settings layout 2009-11-17 21:48:00 +00:00
Sarven Capadisli
a42e128c15 Merge branch '0.9.x-mobile' into 0.9.x 2009-11-17 20:50:43 +00:00
Sarven Capadisli
14082ada6b Updated admin forms to use form_settings styles 2009-11-17 20:09:09 +00:00
Sarven Capadisli
020c2b48b6 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-11-17 19:52:19 +00:00
Evan Prodromou
3a980a75fc Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-11-17 14:51:38 -05:00
Evan Prodromou
cb4acd40bf more snapshot stuff in siteadminpanel 2009-11-17 14:51:17 -05:00
Evan Prodromou
4bbaa193d5 remove panels.txt, move to http://status.net/wiki/Settings_by_panel 2009-11-17 14:50:54 -05:00
Sarven Capadisli
f425f8538d Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-11-17 18:25:38 +00:00
Craig Andrews
4ff2d37b10 Reformatted for 80 character width, and clarified the username/nickname attribute difference 2009-11-17 13:00:45 -05:00
Brion Vibber
3d6a55a49f Fix ticket 1816: Database errors recorded as "Array"
PEAR error backtrace lines are now correctly formatted as strings in debug log, roughly as debug_print_backtrace() does (but with argument values swapped out for types to avoid being overly verbose).

Todo: exceptions and PEAR error objects should log backtraces the same way; right now it doesn't look like exceptions get backtraces logged.

Todo: At one line per line, it's potentially tough to figure out what backtrace goes with what event if traffic is heavy; even if not heavy it's awkward to jump back into a log file after grepping to find the backtrace. Consider using a random per-event ID which can go in the log output -- bonus points for exposing the error ID to users so ops can track down actual error details in logs from a user report.
2009-11-17 09:07:44 -08:00
Zach Copley
638df94f88 Need to check the Profile rather than the User. 2009-11-17 08:48:16 -08:00
Sarven Capadisli
8df388ce12 Added li for entity_flag 2009-11-17 16:45:51 +00:00
Evan Prodromou
42d6c69691 add private flag back into site admin panel 2009-11-17 10:59:50 -05:00
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
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
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