Commit Graph

2244 Commits

Author SHA1 Message Date
Evan Prodromou
e009f613d3 let users set location prefs from profile form 2009-12-28 14:44:05 -08:00
Evan Prodromou
bb93d6b1c7 remove namespace setting from location; it's unused 2009-12-28 14:21:07 -08:00
Evan Prodromou
2ae04bb6d5 add events for unblocking a profile 2009-12-28 10:50:12 -08:00
Evan Prodromou
c5de326231 events for blocking a user 2009-12-28 10:42:55 -08:00
Zach Copley
1a462b04d7 Paths admin panel should not insist on an ssl server being specified,
ever.
2009-12-24 15:15:37 -08:00
Zach Copley
7f9b07d8c9 Move ssl settings from site admin panel to paths admin panel 2009-12-24 15:15:19 -08:00
Zach Copley
5f6df8c0c4 Paths admin panel should not insist on an ssl server being specified,
ever.
2009-12-24 16:50:28 -06:00
Zach Copley
4ed969a8ac Move ssl settings from site admin panel to paths admin panel 2009-12-24 15:25:59 -06:00
Evan Prodromou
71b7bdbcbe whitespace fixup 2009-12-23 07:38:09 -08:00
Evan Prodromou
185e229f79 Merge branch 'master' into 0.9.x 2009-12-22 22:12:15 -08:00
Evan Prodromou
725b2d0475 save location at notice post time 2009-12-22 21:58:23 -08:00
Siebrand Mazeland
0957c9fa4b Remove pleonasm in UI text 2009-12-20 20:20:35 +01:00
Evan Prodromou
90c378a81f broadcast for repeats 2009-12-15 12:29:37 -05:00
Evan Prodromou
797a0d79fb create a method for notification for new messages, and use it 2009-12-15 10:31:25 -05:00
Sarven Capadisli
f8b187d5a4 Initial representation for repeated notice 2009-12-14 18:09:08 -05:00
Evan Prodromou
2a8eee0e0b add friends_timeline with no repeats in it 2009-12-14 16:41:25 -05:00
Evan Prodromou
6ff13d6828 move full-featured timeline to apitimelinehome.php 2009-12-14 16:10:16 -05:00
Evan Prodromou
1ace5c400e parse error in retweet method 2009-12-14 15:49:19 -05:00
Siebrand Mazeland
745e35ac1f (Puctuation) consistency in clientError() calls. 2009-12-13 18:55:17 +01:00
Evan Prodromou
a5a89f50b8 Merge branch 'forward' into 0.9.x 2009-12-12 16:18:55 -05:00
Evan Prodromou
1ec54d3433 add statuses/retweeted_to_me to API 2009-12-12 16:15:23 -05:00
Evan Prodromou
cfe67a9c01 add statuses/retweets_of_me to API 2009-12-12 16:00:27 -05:00
Evan Prodromou
138ce0cd05 add statuses/retweeted_by_me api action 2009-12-12 15:35:05 -05:00
Evan Prodromou
c622d14440 add statuses/retweets to API 2009-12-12 14:46:24 -05:00
Hue Bastard
c24afa986e (fix clumsy double paste in b45be2b actions/apitimelinefavorites.php 2009-12-11 16:21:30 -08:00
Hue Bastard
59e5958d3a ticket 2055: added logos to Atom and RSS feeds 2009-12-11 16:15:22 -08:00
Evan Prodromou
683edfd199 show repeated notices correctly in API output 2009-12-11 12:40:05 -05:00
Evan Prodromou
0cb1feed51 show repeated notice's author on profile page 2009-12-11 12:16:11 -05:00
Evan Prodromou
afc86a86d3 save repeats from the form 2009-12-11 11:51:09 -05:00
Evan Prodromou
60754fc6de Merge branch '0.9.x' into forward 2009-12-11 11:38:08 -05:00
Evan Prodromou
89256fa754 fix typo in API arg creation 2009-12-11 11:33:26 -05:00
Evan Prodromou
79f81ad76d change Notice::saveNew() to use named arguments for little-used options 2009-12-11 11:29:51 -05:00
Evan Prodromou
a5724cca49 do some moving around of forwarding stuff 2009-12-11 10:10:25 -05:00
Evan Prodromou
79443d1ee2 had wrong number of arguments to NoticeList in notice inbox 2009-12-10 14:36:14 -05:00
Evan Prodromou
198e413a58 move inbox notice list to repeat plugin 2009-12-10 13:34:11 -05:00
Evan Prodromou
144faade3b move forwarding stuff to Repeat plugin 2009-12-10 13:31:16 -05:00
Craig Andrews
b36ec6da87 Fixed incorrect disabling of login_token. 2009-12-10 13:22:46 -05:00
Eric Helgeson
4db184e5b4 New Events for avatar settings 2009-12-09 22:31:07 -05:00
Evan Prodromou
21757186e9 don't allow forwarding your own notice 2009-12-08 17:52:20 -05:00
Evan Prodromou
41cbb90fae add (ugly) form to forward notices 2009-12-08 17:31:23 -05:00
Evan Prodromou
48a93810ab action to forward a notice 2009-12-08 17:20:45 -05:00
Evan Prodromou
c899e4a84e show forwards in the inbox 2009-12-08 17:02:48 -05:00
Craig Andrews
3b14b61fa7 Add a configuration option to disable the login command.
$config['logincommand']['disabled'] = true;

This commit should be reverted once the command has been sufficiently tested and trusted.
2009-12-05 21:05:33 -05:00
Craig Andrews
75cac0fd6b Added 'login' command that gives you a link that can be used to login to the website 2009-12-05 21:05:33 -05:00
Craig Andrews
51f0dd5e37 Add configuration option to toggle the indenting of the output HTML. Defaults to indent enabled. 2009-12-05 01:03:04 -05:00
Zach Copley
aef4cc0a59 Make it impossible to block (and thus unsubscribe from your
self-subscription) via the API.  Additionally, make it impossible
to block yourself or unsubscribe from yourself, period.

I also made User use the subs.php helper function for unsubscribing
during a block.

Hopefully, these changes will get rid of the problem of people
accidentally deleting their self-subscriptions once and for all
(knock on wood).
2009-12-03 17:06:58 -08:00
Brion Vibber
c89b10ffe4 Code style cleanup: dropped some unnecessary =& reference assignments where they're used only out of habit for PHP 4-style object semantics 2009-12-03 12:58:48 -08:00
Zach Copley
56b3e13d4a Reload the admin design panel page to show the new CSS when the
design gets reset.
2009-12-02 18:05:19 -08:00
Zach Copley
bb2311ea18 Only pick up new default site colors if the theme has NOT changed. 2009-12-02 17:50:51 -08:00
Zach Copley
4f359d2a8b Delete design when user chooses to restore default design, instead
of saving a design with site defaults.
2009-12-02 16:44:23 -08:00
Brion Vibber
a3a2168292 Fix regression in password settings: users have been unable to change their passwords since introduction of ChangePassword event (later StartChangePassword) November 5 in commit d6ddb84132
Logic was inversed; new password was only being saved if a plugin claimed the event; so when no auth plugin was present to take it, passwords never got saved.
2009-12-01 15:44:07 -08:00
Brion Vibber
e28e8cc1d7 typo fix: '$this' now spelled correctly. Looks like this'll fix acceptance of 'source' param for direct messages posted to API
@fixme: there's duplication of reserved sources list between at least this and apistatusesupdate module
2009-12-01 12:31:21 -08:00
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
Ciaran Gultnieks
707efadbd4 Some more XRDS fixes. With this and the previous commit, remote subs seem to work. Otherwise they don't. 2009-11-12 14:46:16 +00:00
Ciaran Gultnieks
6e601c1171 Wrong XRDS service type for OMB was being supplied. Wrong since commit 54696f7c I think 2009-11-12 14:21:47 +00:00
Craig Andrews
8a6590a7e8 initialize these variables before use to prevent warnings 2009-11-11 17:09:00 -05:00
Craig Andrews
23290f746f Do not show the URL shortener selection drop down if no shorteners are available 2009-11-11 17:05:24 -05:00
Craig Andrews
014d6b1d19 Redid how URL shorteners work. This way is much more like how Evan wants events to work (and more like how the rest of SN works). 2009-11-11 14:04:44 -05:00
Siebrand Mazeland
086759f32a Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x 2009-11-11 19:58:43 +01:00
Siebrand Mazeland
37c62c6356 Remove double space in message 2009-11-11 13:24:02 +01:00
Evan Prodromou
220f8771c6 store boolean values correctly in siteadminpanel 2009-11-11 01:43:34 -05:00
Evan Prodromou
4258f99d2f Add design admin panel 2009-11-11 01:09:40 -05:00
Evan Prodromou
b2145a6e4c use <li>s in form data for site admin panel 2009-11-11 01:00:41 -05:00
Evan Prodromou
935410e8dc Merge branch '0.9.x' into adminpanel 2009-11-11 00:22:42 -05:00
Zach Copley
db64b61296 Merge branch '0.9.x' into finish-account-api
* 0.9.x:
  Added a events for the settings menu items
  Bringing Sphinx search support up to code: broken out to a plugin, now supports multiple sites on a single server.
  Changed to Evan's event style and added an AuthPlugin superclass
  add geo output to statuses in json, xml, atom, rss in API
  Localisation updates from translatewiki.net (2009-11-10)
  Localisation updates from translatewiki.net
  Update pot
  add lat and long parameters to api/statuses/update
  change credential check to work more like other events
  fixup output of object attributes in db error code
  Performance fix for subscription/subscriber lists based on feedback from ops.
  Adjusting indexes to make favorites query more efficient, based on feedback from ops.
  Revert untested code; spews PHP notice warnings on every page view: "just sent a http 200 for the check-fancy from install.php"
  Added hook for the Group navigation items
  Updated block @title text (shouldn't say from group)
  Updated group block markup
  Revert "Remove more contractions"
2009-11-10 15:25:43 -08:00
Zach Copley
ee3fc8ba03 Added some notes in the comments 2009-11-10 15:23:33 -08:00
Zach Copley
4e4ba24c00 Implement /api/account/update_delivery_device.format 2009-11-10 14:36:41 -08:00
Brion Vibber
53c86c43c4 Bringing Sphinx search support up to code: broken out to a plugin, now supports multiple sites on a single server.
Upgrade notes:
* Index names have changed from hardcoded 'Identica_people' and 'Identica_notices' to use the database name and actual table names. Must reindex.

New events:
* GetSearchEngine to override default search engine class selection from plugins

New scripts:
* gen_config.php generates a sphinx.conf from database configuration (with theoretical support for status_network table, but it doesn't seem to be cleanly queriable right now without knowing the db setup info for that. Needs generalized support.)
* Replaced old sphinx-indexer.sh and sphinx-cron.sh with index_update.php

Other fixes:
* sphinx.conf.sample better matches our live config, skipping unused stopword list and using a more realistic indexer memory limit

Further notes:
* Probably doesn't work right with PostgreSQL yet; Sphinx can pull from PG but the extraction queries currently look like they use some MySQL-specific functions.
2009-11-10 13:44:40 -08:00
Craig Andrews
1cd6650ae4 Changed to Evan's event style and added an AuthPlugin superclass 2009-11-10 16:28:37 -05:00
Evan Prodromou
1f5f5474f1 Merge branch '0.9.x' into adminpanel 2009-11-10 16:27:23 -05:00
Evan Prodromou
27e6a3f36f add lat and long parameters to api/statuses/update 2009-11-10 15:36:55 -05:00
Brion Vibber
333c376c95 Merge remote branch 'statusnet/0.9.x' into 0.9.x 2009-11-10 06:44:53 -08:00
Sarven Capadisli
91da72ede0 Updated block @title text (shouldn't say from group) 2009-11-10 13:09:15 +00:00
Sarven Capadisli
2f3e414cd1 Updated group block markup 2009-11-10 13:08:58 +00:00
Zach Copley
cae06a49ea Merge branch '0.9.x' into finish-account-api
* 0.9.x: (26 commits)
  just sent a http 200 for the check-fancy from install.php
  Add a new event: CanUserChangeField
  shorten flag notification and include a class
  Added flag icon for UserFlag plugin
  Fixed notice option alignment in IE
  add a method to Theme class to list available themes
  Updated Realtime plugin to use the util's NoticeReply object
  Localisation updates from translatewiki.net (2009-11-08)
  Update pot again
  Rebuild pot file *without* --join-existing to get rid of the cruft. Not sure why "--join-existing" must be in. Only thing I can think of is manual additions, which I could not find.
  Revert "More precise field label"
  Remove more contractions
  Revert "* [Cc]an't -> [Cc]annot"
  Revert "More specifics on 'address'"
  * [Cc]an't -> [Cc]annot
  Revert "* check usage of 'people' in UI and change it to 'users' or something else in most places"
  add utilities for calculating local and installation theme root dirs
  Harmonise UI message "No such user."
  Restructure theme.php to define a class Theme
  entity_action responses look more inactive now
  ...
2009-11-10 00:43:58 -08:00
Zach Copley
c8bd6d9f7a Make /api/account/update_profile_background_image.format work even
when there isn't an existing Design for the user. Plus a few other
fixups.
2009-11-09 23:56:02 -08:00
Zach Copley
312c745884 Implement /api/account/update_profile.format 2009-11-09 23:13:59 -08:00
Zach Copley
322a4c3ed1 Implement /api/account/update_profile_colors.format 2009-11-09 22:24:32 -08:00
Craig Andrews
3be1205714 Add a new event: CanUserChangeField 2009-11-09 17:43:37 -05:00
Brion Vibber
088081675f Revert "Remove more contractions"
This reverts commit 5ab709b739.

Missed this one yesterday...
2009-11-09 20:01:46 +01:00
Evan Prodromou
badd8cccca add registration restrictions and privacy to site admin panel 2009-11-08 22:21:28 -05:00
Evan Prodromou
33f931d527 add default language to site admin panel 2009-11-08 22:12:12 -05:00
Evan Prodromou
977d5d6f85 add default timezone to site admin panel 2009-11-08 22:03:34 -05:00
Evan Prodromou
691beefd0f Merge branch '0.9.x' into adminpanel 2009-11-08 21:41:43 -05:00
Evan Prodromou
76b0e6e6f4 Merge branch '0.9.x' into adminpanel 2009-11-08 21:23:09 -05:00
Zach Copley
5c091dab9b Implement /api/account/update_profile_background_image.format 2009-11-08 15:29:04 -08:00
Siebrand Mazeland
2b16baa76a Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x 2009-11-08 23:36:53 +01:00
Brion Vibber
2917fad209 Revert "More precise field label"
This reverts commit 6483fbd8fa.

"SMS address" header here makes no sense; it would be inconsistent with the other tabs and headings on the same and related pages, and would look very awkward with another giant "SMS" right above it
2009-11-08 23:35:12 +01:00
Siebrand Mazeland
b10f362ede Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x 2009-11-08 23:33:58 +01:00
Siebrand Mazeland
5ab709b739 Remove more contractions
* doesn't
* won't
* isn't
* don't
2009-11-08 23:32:15 +01:00
Brion Vibber
fc5002015b Revert "* [Cc]an't -> [Cc]annot"
This reverts commit 0ab17f382b.
2009-11-08 23:28:51 +01:00
Brion Vibber
ec6a38a627 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x 2009-11-08 23:27:24 +01:00
Brion Vibber
c7961fe6dc Revert "More specifics on 'address'"
This reverts commit 1872d07602.

"instant messages address" is very awkward phrasing; prefer not to be changing UI in such ways while updating localisations.
2009-11-08 23:26:16 +01:00
Siebrand Mazeland
104a47e4a2 Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x 2009-11-08 23:22:50 +01:00
Siebrand Mazeland
0ab17f382b * [Cc]an't -> [Cc]annot
* [Cc]ould't -> [Cc]ould not
2009-11-08 23:22:38 +01:00
Brion Vibber
a034fb0b82 Revert "* check usage of 'people' in UI and change it to 'users' or something else in most places"
This reverts commit 81b4a381d9.
IMO "user" is a bit impersonal and we shouldn't go changing the tone of the UI willy-nilly when we're updating localisations.
2009-11-08 23:22:13 +01:00
Siebrand Mazeland
221b779e88 Harmonise UI message "No such user." 2009-11-08 23:10:44 +01:00
Evan Prodromou
111f6a775d Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-11-08 17:06:41 -05:00
Evan Prodromou
b7e2e3fd2b Restructure theme.php to define a class Theme
For various reasons, it's nicer to have a class for theme-file paths
and such. So, I've rewritten the code for determining the locations of
theme files to be more OOPy.

I changed all the uses of the two functions in the module (theme_file
and theme_path) to use Theme::file and Theme::path respectively.

I've also removed the code in common.php that require's the module;
using a class means we can autoload it instead.
2009-11-08 17:04:46 -05:00
Siebrand Mazeland
43132eb55e Several updates to UI messages 2009-11-08 22:45:18 +01:00
Siebrand Mazeland
1872d07602 More specifics on 'address' 2009-11-08 22:37:09 +01:00