We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 5ac694c7 authored by Zach Copley's avatar Zach Copley

Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

parents 5866493c fd55eef7
......@@ -2,8 +2,8 @@
README
------
StatusNet 0.9.5 "What's The Frequency, Kenneth?"
10 September 2010
StatusNet 0.9.6 "Man on the Moon"
19 October 2010
This is the README file for StatusNet, the Open Source microblogging
platform. It includes installation instructions, descriptions of
......@@ -96,8 +96,8 @@ for additional terms.
New this version
================
This is a security, bug and feature release since version 0.9.4 released on
16 August 2010.
This is a security, bug and feature release since version 0.9.5 released on
10 September 2010.
For best compatibility with client software and site federation, and a lot of
bug fixes, it is highly recommended that all public sites upgrade to the new
......@@ -105,24 +105,24 @@ version.
Notable changes this version:
- Change of license for default themes and documentation from
AGPLv3 to CC-By 3.0 Unported.
- An experimental TinyMCE plugin to do in-browser rich editing of
status updates. Does not support StatusNet syntax like @-replies or
#hashtags very well.
- An experimental plugin to add titles to notices.
- A plugin to support the Echo <http://aboutecho.com/> commenting
system.
- A plugin to support the Disqus <http://disqus.com/> commenting system.
- Changes to OStatus support to make StatusNet work for the Social Web
Acid Test Level 0 <http://federatedsocialweb.net/wiki/SWAT0>.
- Themes now support a theme.ini file for theme configuration, including
defining a "base" theme.
- Improved two-way Twitter integration, including support for
repeats and retweets, replies, and faves going both ways across the
bridge, as well as better parsing of Twitter statuses.
A full changelog is available at http://status.net/wiki/StatusNet_0.9.5.
- Site moderators can now delete groups.
- New themes: clean, shiny, mnml, victorian
- New YammerImport plugin allows site admins to import non-private profiles and
message from an authenticated Yammer site.
- New experimental plugins: AnonFavorites, SlicedFavorites, GroupFavorited,
ForceGroup, ShareNotice
- OAuth upgraded to 1.0a
- Localization updates now include plugins, thanks to translatewiki.net!
- SSL link generation should be more consistent; alternate SSL URLs can be
set in the admin UI for more parts of the system.
- Experimental backupuser.php, restoreuser.php command-line scripts to
dump/restore a user's complete activity stream. Can be used to transfer
accounts manually between sites, or to save a backup before deleting.
- Unicode fixes for OStatus notices
- Header metadata on notice pages to aid in manual reposting on Facebook
- Lots of little fixes...
A full changelog is available at http://status.net/wiki/StatusNet_0.9.6.
Prerequisites
=============
......@@ -235,9 +235,9 @@ especially if you've previously installed PHP/MySQL packages.
1. Unpack the tarball you downloaded on your Web server. Usually a
command like this will work:
tar zxf statusnet-0.9.5.tar.gz
tar zxf statusnet-0.9.6.tar.gz
...which will make a statusnet-0.9.5 subdirectory in your current
...which will make a statusnet-0.9.6 subdirectory in your current
directory. (If you don't have shell access on your Web server, you
may have to unpack the tarball on your local computer and FTP the
files to the server.)
......@@ -245,7 +245,7 @@ especially if you've previously installed PHP/MySQL packages.
2. Move the tarball to a directory of your choosing in your Web root
directory. Usually something like this will work:
mv statusnet-0.9.5 /var/www/statusnet
mv statusnet-0.9.6 /var/www/statusnet
This will make your StatusNet instance available in the statusnet path of
your server, like "http://example.net/statusnet". "microblog" or
......@@ -604,7 +604,7 @@ subdirectory to add a new language to your system. You'll need to
compile the ".po" files into ".mo" files, however.
Contributions of translation information to StatusNet are very easy:
you can use the Web interface at TranslateWiki.net to add one
you can use the Web interface at translatewiki.net to add one
or a few or lots of new translations -- or even new languages. You can
also download more up-to-date .po files there, if you so desire.
......@@ -660,7 +660,7 @@ with this situation.
If you've been using StatusNet 0.7, 0.6, 0.5 or lower, or if you've
been tracking the "git" version of the software, you will probably
want to upgrade and keep your existing data. There is no automated
upgrade procedure in StatusNet 0.9.5. Try these step-by-step
upgrade procedure in StatusNet 0.9.6. Try these step-by-step
instructions; read to the end first before trying them.
0. Download StatusNet and set up all the prerequisites as if you were
......@@ -681,7 +681,7 @@ instructions; read to the end first before trying them.
5. Once all writing processes to your site are turned off, make a
final backup of the Web directory and database.
6. Move your StatusNet directory to a backup spot, like "statusnet.bak".
7. Unpack your StatusNet 0.9.5 tarball and move it to "statusnet" or
7. Unpack your StatusNet 0.9.6 tarball and move it to "statusnet" or
wherever your code used to be.
8. Copy the config.php file and the contents of the avatar/, background/,
file/, and local/ subdirectories from your old directory to your new
......@@ -1586,7 +1586,7 @@ repository (see below), and you get a compilation error ("unexpected
T_STRING") in the browser, check to see that you don't have any
conflicts in your code.
If you upgraded to StatusNet 0.9.5 without reading the "Notice
If you upgraded to StatusNet 0.9.x without reading the "Notice
inboxes" section above, and all your users' 'Personal' tabs are empty,
read the "Notice inboxes" section above.
......@@ -1697,6 +1697,10 @@ if anyone's been overlooked in error.
* mEDI
* Brett Taylor
* Brigitte Schuster
* Siebrand Mazeland and the amazing volunteer translators at translatewiki.net
* Brion Vibber, StatusNet, Inc.
* James Walker, StatusNet, Inc.
* Samantha Doherty, designer, StatusNet, Inc.
Thanks also to the developers of our upstream library code and to the
thousands of people who have tried out Identi.ca, installed StatusNet,
......
......@@ -45,7 +45,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
* @link http://status.net/
* @fixme merge more of this code with related variants
*/
class DeletegroupAction extends RedirectingAction
{
var $group = null;
......@@ -56,12 +55,12 @@ class DeletegroupAction extends RedirectingAction
* @fixme merge common setup code with other group actions
* @fixme allow group admins to delete their own groups
*/
function prepare($args)
{
parent::prepare($args);
if (!common_logged_in()) {
// TRANS: Client error when trying to delete group while not logged in.
$this->clientError(_('You must be logged in to delete a group.'));
return false;
}
......@@ -84,23 +83,27 @@ class DeletegroupAction extends RedirectingAction
$local = Local_group::staticGet('nickname', $nickname);
if (!$local) {
// TRANS: Client error when trying to delete a non-local group.
$this->clientError(_('No such group.'), 404);
return false;
}
$this->group = User_group::staticGet('id', $local->group_id);
} else {
// TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
$this->clientError(_('No nickname or ID.'), 404);
return false;
}
if (!$this->group) {
// TRANS: Client error when trying to delete a non-existing group.
$this->clientError(_('No such group.'), 404);
return false;
}
$cur = common_current_user();
if (!$cur->hasRight(Right::DELETEGROUP)) {
// TRANS: Client error when trying to delete a group without having the rights to delete it.
$this->clientError(_('You are not allowed to delete this group.'), 403);
return false;
}
......@@ -117,7 +120,6 @@ class DeletegroupAction extends RedirectingAction
*
* @return void
*/
function handle($args)
{
parent::handle($args);
......@@ -143,14 +145,18 @@ class DeletegroupAction extends RedirectingAction
Event::handle('EndDeleteGroup', array($this->group));
}
} catch (Exception $e) {
$this->serverError(sprintf(_('Could not delete group %2$s.'),
// TRANS: Server error displayed if a group could not be deleted.
// TRANS: %s is the name of the group that could not be deleted.
$this->serverError(sprintf(_('Could not delete group %s.'),
$this->group->nickname));
}
if ($this->boolean('ajax')) {
$this->startHTML('text/xml;charset=utf-8');
$this->elementStart('head');
$this->element('title', null, sprintf(_('Deleted group %2$s'),
// TRANS: Message given after deleting a group.
// TRANS: %s is the deleted group's name.
$this->element('title', null, sprintf(_('Deleted group %s'),
$this->group->nickname));
$this->elementEnd('head');
$this->elementStart('body');
......@@ -166,6 +172,7 @@ class DeletegroupAction extends RedirectingAction
}
function title() {
// TRANS: Title.
return _('Delete group');
}
......@@ -191,8 +198,10 @@ class DeletegroupAction extends RedirectingAction
'action' => common_local_url('deletegroup', array('id' => $this->group->id))));
$this->elementStart('fieldset');
$this->hidden('token', common_session_token());
// TRANS: Form legend for deleting a group.
$this->element('legend', _('Delete group'));
if (Event::handle('StartDeleteGroupForm', array($this, $this->group))) {
// TRANS: Warning in form for deleleting a group.
$this->element('p', null,
_('Are you sure you want to delete this group? '.
'This will clear all data about the group from the '.
......@@ -223,4 +232,4 @@ class DeletegroupAction extends RedirectingAction
$this->elementEnd('fieldset');
$this->elementEnd('form');
}
}
\ No newline at end of file
}
......@@ -22,10 +22,10 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
//exit with 200 response, if this is checking fancy from the installer
if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') { exit; }
define('STATUSNET_VERSION', '0.9.5');
define('STATUSNET_VERSION', '0.9.6');
define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
define('STATUSNET_CODENAME', 'What\'s The Frequency, Kenneth?');
define('STATUSNET_CODENAME', 'Man on the Moon');
define('AVATAR_PROFILE_SIZE', 96);
define('AVATAR_STREAM_SIZE', 48);
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Adsense\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-10-04 22:30+0000\n"
"PO-Revision-Date: 2010-10-04 22:32:48+0000\n"
"POT-Creation-Date: 2010-10-18 18:35+0000\n"
"PO-Revision-Date: 2010-10-18 18:42:19+0000\n"
"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2010-10-03 20:54:23+0000\n"
"X-Generator: MediaWiki 1.17alpha (r74276); Translate extension (2010-09-17)\n"
"X-POT-Import-Date: 2010-10-09 14:33:19+0000\n"
"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: br\n"
"X-Message-Group: #out-statusnet-plugin-adsense\n"
......@@ -46,27 +46,27 @@ msgstr "Arventennoù Adsense evit al lec'hienn StatusNet-mañ."
#: adsenseadminpanel.php:164
msgid "Client ID"
msgstr ""
msgstr "ID an arval"
#: adsenseadminpanel.php:165
msgid "Google client ID"
msgstr ""
msgstr "ID an arval Google"
#: adsenseadminpanel.php:170
msgid "Ad script URL"
msgstr ""
msgstr "URL ar skript kemenn"
#: adsenseadminpanel.php:171
msgid "Script URL (advanced)"
msgstr ""
msgstr "URL ar skript (araokaet)"
#: adsenseadminpanel.php:176
msgid "Medium rectangle"
msgstr ""
msgstr "Skouergornek etre"
#: adsenseadminpanel.php:177
msgid "Medium rectangle slot code"
msgstr ""
msgstr "Kod lakaet en ur skouergornek etre"
#: adsenseadminpanel.php:182
msgid "Rectangle"
......@@ -74,23 +74,23 @@ msgstr "Skouergornek"
#: adsenseadminpanel.php:183
msgid "Rectangle slot code"
msgstr ""
msgstr "Kod lakaet er skouergornek"
#: adsenseadminpanel.php:188
msgid "Leaderboard"
msgstr ""
msgstr "Panell an urzhiadoù"
#: adsenseadminpanel.php:189
msgid "Leaderboard slot code"
msgstr ""
msgstr "Kod lakaet e panell an urzhiadoù"
#: adsenseadminpanel.php:194
msgid "Skyscraper"
msgstr ""
msgstr "Giton a-serzh"
#: adsenseadminpanel.php:195
msgid "Wide skyscraper slot code"
msgstr ""
msgstr "Kod lakaet en ur giton ledan a-serzh"
#: adsenseadminpanel.php:208
msgid "Save"
......@@ -98,4 +98,4 @@ msgstr "Enrollañ"
#: adsenseadminpanel.php:208
msgid "Save AdSense settings"
msgstr ""
msgstr "Enrollañ arventennoù AdSense"
# Translation of StatusNet - Adsense to German (Deutsch)
# Expored from translatewiki.net
#
# Author: The Evil IP address
# --
# This file is distributed under the same license as the StatusNet package.
#
msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Adsense\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-10-18 18:35+0000\n"
"PO-Revision-Date: 2010-10-18 18:42:19+0000\n"
"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2010-10-09 14:33:19+0000\n"
"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
"X-Message-Group: #out-statusnet-plugin-adsense\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANS: Menu item title/tooltip
#: AdsensePlugin.php:194
msgid "AdSense configuration"
msgstr "AdSense-Konfiguration"
#. TRANS: Menu item for site administration
#: AdsensePlugin.php:196
msgid "AdSense"
msgstr "AdSense"
#: AdsensePlugin.php:209
msgid "Plugin to add Google Adsense to StatusNet sites."
msgstr "Plugin, das Google Adsense auf StatusNet-Websites hinzufügt."
#: adsenseadminpanel.php:52
msgctxt "TITLE"
msgid "AdSense"
msgstr "AdSense"
#: adsenseadminpanel.php:62
msgid "AdSense settings for this StatusNet site"
msgstr "AdSense-Einstellungen dieser StatusNet-Website"
#: adsenseadminpanel.php:164
msgid "Client ID"
msgstr "Client-ID"
#: adsenseadminpanel.php:165
msgid "Google client ID"
msgstr "Google-Client-ID"
#: adsenseadminpanel.php:170
msgid "Ad script URL"
msgstr "Skript-URL"
#: adsenseadminpanel.php:171
msgid "Script URL (advanced)"
msgstr ""
#: adsenseadminpanel.php:176
msgid "Medium rectangle"
msgstr ""
#: adsenseadminpanel.php:177
msgid "Medium rectangle slot code"
msgstr ""
#: adsenseadminpanel.php:182
msgid "Rectangle"
msgstr ""
#: adsenseadminpanel.php:183
msgid "Rectangle slot code"
msgstr ""
#: adsenseadminpanel.php:188
msgid "Leaderboard"
msgstr ""
#: adsenseadminpanel.php:189
msgid "Leaderboard slot code"
msgstr ""
#: adsenseadminpanel.php:194
msgid "Skyscraper"
msgstr ""
#: adsenseadminpanel.php:195
msgid "Wide skyscraper slot code"
msgstr ""
#: adsenseadminpanel.php:208
msgid "Save"
msgstr "Speichern"
#: adsenseadminpanel.php:208
msgid "Save AdSense settings"
msgstr "AdSense-Einstellungen speichern"
# Translation of StatusNet - Adsense to Brazilian Portuguese (Português do Brasil)
# Expored from translatewiki.net
#
# Author: Giro720
# Author: Luckas Blade
# --
# This file is distributed under the same license as the StatusNet package.
#
msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Adsense\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-10-18 18:35+0000\n"
"PO-Revision-Date: 2010-10-18 18:42:20+0000\n"
"Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
"br>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2010-10-09 14:33:19+0000\n"
"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt-br\n"
"X-Message-Group: #out-statusnet-plugin-adsense\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. TRANS: Menu item title/tooltip
#: AdsensePlugin.php:194
msgid "AdSense configuration"
msgstr "Configuração do AdSense"
#. TRANS: Menu item for site administration
#: AdsensePlugin.php:196
msgid "AdSense"
msgstr "AdSense"
#: AdsensePlugin.php:209
msgid "Plugin to add Google Adsense to StatusNet sites."
msgstr "Plugin para adicionar Google Adsense aos sites StatusNet."
#: adsenseadminpanel.php:52
msgctxt "TITLE"
msgid "AdSense"
msgstr "AdSense"
#: adsenseadminpanel.php:62
msgid "AdSense settings for this StatusNet site"
msgstr "Configurações do AdSense para este site StatusNet"
#: adsenseadminpanel.php:164
msgid "Client ID"
msgstr "Identificação do cliente"
#: adsenseadminpanel.php:165
msgid "Google client ID"
msgstr "ID de cliente Google"
#: adsenseadminpanel.php:170
msgid "Ad script URL"
msgstr "URL do script do anúncio"
#: adsenseadminpanel.php:171
msgid "Script URL (advanced)"
msgstr "URL do script (avançado)"
#: adsenseadminpanel.php:176
msgid "Medium rectangle"
msgstr "Retângulo médio"
#: adsenseadminpanel.php:177
msgid "Medium rectangle slot code"
msgstr ""
#: adsenseadminpanel.php:182
msgid "Rectangle"
msgstr ""
#: adsenseadminpanel.php:183
msgid "Rectangle slot code"
msgstr ""
#: adsenseadminpanel.php:188
msgid "Leaderboard"
msgstr ""
#: adsenseadminpanel.php:189
msgid "Leaderboard slot code"
msgstr ""
#: adsenseadminpanel.php:194
msgid "Skyscraper"
msgstr ""
#: adsenseadminpanel.php:195
msgid "Wide skyscraper slot code"
msgstr ""
#: adsenseadminpanel.php:208
msgid "Save"
msgstr "Salvar"
#: adsenseadminpanel.php:208
msgid "Save AdSense settings"
msgstr "Salvar as configurações do AdSense"
# Translation of StatusNet - AnonymousFave to Breton (Brezhoneg)
# Expored from translatewiki.net
#