Commit Graph

2092 Commits

Author SHA1 Message Date
Zach Copley
a36612866e Fix bad function call 2009-11-30 14:55:02 -08:00
Zach Copley
9dc888894b Merge branch 'master' into 0.9.x
* master: (67 commits)
  Ticket 2038: fix bad bug tracker link
  Fix regression in group posting: bug introduced in commit 1319002e15. Need to use actual profile object rather than an id on a variable that doesn't exist when checking blocks :D
  Log database errors when saving notice_inbox entries
  Drop the username from the log id for now; seems to trigger an error loop in some circumstances
  request id on logs... pid + random id per web request + username + method + url
  Add OpenID ini info back into statusnet.ini as a stopgap until we can
  Some changes to the OpenID DataObjects to make them emit the exact same
  OpenID plugin should set 'user_openid.display' as unique key
  Remove relationship: user_openid.user_id -> user.id. I don't think this
  Have OpenID plugin DataObjects emit their own .ini info
  Revert "Allow plugin DB_DataObject classes to not have to use the .ini file by overriding keys(), table(), and sequenceKey() for them"
  Catch and report exceptions from notice_to_omb_notice() instead of letting the OMB queue handler die.
  Fix regression in remote subscription; added hasRole() shadow method on Remote_profile.
  Fix fatal error on OMB subscription for first-timers
  Remove annoying log msg
  Drop error message on setlocale() failure; this is harmless, since we actually have a working locale set up.
  Catch uncaught exception
  Fixed bug where reply-sync bit wasn't getting saved
  Forgot to render the nav menu when on FB Connect login tab
  Facebook plugin no longer takes over Login and Connect settings nav menus
  ...

Conflicts:
	db/08to09_pg.sql
	db/statusnet_pg.sql
	locale/pt_BR/LC_MESSAGES/statusnet.mo
	plugins/Mapstraction/MapstractionPlugin.php
2009-11-30 10:28:58 -08:00
Siebrand Mazeland
1b9e801703 Fix typo in UI string 2009-11-28 20:52:46 +01:00
Brion Vibber
f1b64c4db5 Fix fatal error on OMB subscription for first-timers 2009-11-25 12:11:41 -08:00
Sarven Capadisli
d5e4360036 Removed unnecessary className 2009-11-25 12:23:58 +00:00
Siebrand Mazeland
bd063b8d5a Capitalise "same as password above" 2009-11-21 16:53:25 +01:00
Brion Vibber
a7be30857a Fix bug 1997: notice search rss utter failure
Since commit c4072ef7c9 in March there's no longer an automatic run of $this->getNotices() from RssAction parent class; added to the subclass.

It might make sense to put it back in the parent class, but of course only if those dupe calls can be resolved.
2009-11-20 14:54:59 -08:00
Brion Vibber
05a0f45de5 Fix bug 1997: notice search rss utter failure
Since commit c4072ef7c9 in March there's no longer an automatic run of $this->getNotices() from RssAction parent class; added to the subclass.

It might make sense to put it back in the parent class, but of course only if those dupe calls can be resolved.
2009-11-20 14:52:29 -08:00
Siebrand Mazeland
ac67847f9d UI text fixes and tweaks. 2009-11-20 16:03:27 +01:00
Evan Prodromou
224d82793c Revert "Added 'login' command that gives you a link that can be used to login to the website"
This reverts commit b9d40f723b.

Conflicts:

	actions/login.php
	classes/statusnet.ini
	db/08to09.sql
	db/08to09_pg.sql
	db/statusnet_pg.sql
	lib/command.php
	lib/commandinterpreter.php
2009-11-20 02:50:43 -08:00
Zach Copley
377f95a20f Left a form_data class of a <ul> in the user admin panel 2009-11-19 15:24:34 -08:00
Zach Copley
288d875b79 Added validation to fields in user admin panel 2009-11-19 15:17:24 -08:00
Zach Copley
8618b064e2 Added a user admin panel 2009-11-19 15:02:25 -08:00
Craig Andrews
9a74a094ed Add location form elements to the noticeform, and save their values on submission 2009-11-19 15:17:57 -05:00
Eric Helgeson
26a86402cd Use the $user object nickname, as login name doesnt have to == nickname anymore with plugins such as ldap/etc 2009-11-19 15:00:28 -05:00
Zach Copley
b8de14af2c Moved most path and server settings to a new paths admin panel 2009-11-19 11:55:07 -08:00
Craig Andrews
4463768bae tobyink's location RDF patch 2009-11-19 12:00:25 -05:00
Sarven Capadisli
643318e98c Updated form markup for email settings 2009-11-19 11:27:49 +00:00
Sarven Capadisli
1e5bb7fa68 Added fieldsets for site admin page 2009-11-19 10:34:43 +00:00
Zach Copley
3ec022307c Merge branch 'admin-sections/3' into 0.9.x
* admin-sections/3:
  Added locales_path to site admin panel
  Site admin panel mostly done.  Still need to add CC license chooser.
2009-11-19 01:59:50 -08:00
Zach Copley
409ce3556d Added locales_path to site admin panel 2009-11-19 01:56:29 -08:00
Zach Copley
08165c8f03 Site admin panel mostly done. Still need to add CC license chooser. 2009-11-19 01:46:14 -08:00
Sarven Capadisli
4d589e4c2d Updated markup and style for design admin fieldsets 2009-11-19 07:40:03 +00:00
Zach Copley
6165c9601d Merge branch 'admin-sections/2' into 0.9.x
* admin-sections/2:
  Design admin panel mostly done.
2009-11-18 18:52:09 -08:00
Zach Copley
cf7188a458 Design admin panel mostly done. 2009-11-18 18:25:36 -08:00
Brion Vibber
f7a3e508ba Check profile->update() result against false exactly; we may legitimately get 0 back if no rows were changed. DB objects normally would return true, but the comparisons aren't 100% reliable when we've got numbers which could be ints or strings or floats.
Caused failures saving profile settings with Geonames plugin enabled; the lat/lon/id fields would get re-set with freshly looked up values which no longer matched the previous values as far as the data object could tell, but which saved as the same ol' numbers.
2009-11-18 17:36:55 -08:00
Craig Andrews
cac5a417f2 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x 2009-11-18 17:04:42 -05:00
Craig Andrews
745ea277d8 Should not canonicalize nickname before calling common_check_user 2009-11-18 16:09:58 -05:00
Eric Helgeson
199ccdb53f Consolidate group creation into static function in User_group 2009-11-18 15:54:24 -05:00
Craig Andrews
3bff3b2b32 Improve the not authorized error message 2009-11-18 14:44:39 -05:00
Brion Vibber
18835403fc Notice: Undefined variable: source in actions/apistatusesupdate.php on line 88 2009-11-18 09:29:55 -08:00
Sarven Capadisli
4fc99f8246 Updated admin design form markup 2009-11-18 09:47:04 +00:00
Zach Copley
7e0af92813 First draft of the admin panel for site design 2009-11-18 00:00:05 -08:00
Zach Copley
7551464d23 Get rid of empty select in theme dropdown 2009-11-17 16:55:45 -08:00
Sarven Capadisli
2c2861b867 Added form_data class 2009-11-17 21:52:33 +00:00
Sarven Capadisli
14082ada6b Updated admin forms to use form_settings styles 2009-11-17 20:09:09 +00:00
Evan Prodromou
cb4acd40bf more snapshot stuff in siteadminpanel 2009-11-17 14:51:17 -05: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
Eric Helgeson
e14c88f6c5 Consistant error for groups that dont exist in API 2009-11-16 15:00:36 -05: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
ff88ef407a make block actions use profileformaction superclass 2009-11-16 14:40:04 +01:00
Evan Prodromou
9a1a83e8eb Move some user-related stuff to useradminpanel from siteadminpanel 2009-11-15 14:37:47 +01:00
Evan Prodromou
9f8eedd5a3 add panels.txt to remember what to add where 2009-11-15 14:37:35 +01:00
Craig Andrews
ed690615de Added a User_username table that links the external username with a StatusNet user_id
Added EmailAuthenticationPlugin
Added ReverseUsernameAuthenticationPlugin
Changed the StartChangePassword and EndChangePassword events to take a user, instead of a nickname
User::allowed_nickname was declared non-static, but used as if it was static, so I made the declaration static
2009-11-12 20:12:36 -05:00
Ciaran Gultnieks
d8296df5d7 A further change to the XRDS is required if 0.9.x is to be able to remote sub to a 0.8.x account, with the OpenID plugin enabled. 2009-11-12 20:57:09 +00:00