Commit eb6b4628 authored by Evan Prodromou's avatar Evan Prodromou

Merge from 1.0.x

parents a18d3fac a4bf33d6

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -106,9 +106,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-1.0.0rc1.tar.gz
tar zxf statusnet-1.0.1.tar.gz
...which will make a statusnet-1.0.0rc1 subdirectory in your current
...which will make a statusnet-1.0.1 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.)
......@@ -116,7 +116,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-1.0.0rc1 /var/www/statusnet
mv statusnet-1.0.1 /var/www/statusnet
This will make your StatusNet instance available in the statusnet path of
your server, like "http://example.net/statusnet". "microblog" or
......
......@@ -2,8 +2,8 @@
README
------
StatusNet 1.0.0rc1
20 September 2011
StatusNet 1.0.1
3 October 2011
This is the README file for StatusNet, the Open Source social
networking platform. It includes general information about the
......@@ -107,11 +107,13 @@ for additional terms.
New this version
================
This is a major feature release since 0.9.9, released 2 August
2011. It is the first release of the new branch of StatusNet, and the
first release in the 1.x timeline.
This is a minor bug fix release since 1.0.0, released 30 September
2011. It fixes the following bugs:
Notable changes this version:
- Change default OEmbed provider from oohembed to noembed.
- Fix problem with path matching on new installs.
Notable additions in the 1.0.x series:
- Support for private updates, including private-to-groups, private
within a site, and private to followers only.
......@@ -144,7 +146,7 @@ Notable changes this version:
- Deeper integration with Activity Streams (http://activitystrea.ms) format.
- Automated upgrade script.
A full changelog is available at http://status.net/wiki/StatusNet_1.0.0.
A full changelog is available at http://status.net/wiki/StatusNet_1.0.1.
Troubleshooting
===============
......@@ -197,6 +199,7 @@ Feedback
place to discuss the software.
* StatusNet has a bug tracker for any defects you may find, or ideas for
making things better. http://status.net/open-source/issues
* The StatusNet forum is at http://forum.status.net/.
Credits
=======
......
......@@ -24,7 +24,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 1.0.0 tarball and move it to "statusnet" or
7. Unpack your StatusNet 1.0.1 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
......@@ -37,7 +37,7 @@ instructions; read to the end first before trying them.
reversed. YOU CAN EASILY DESTROY YOUR SITE WITH THIS STEP. Don't
do it without a known-good backup!
In your new StatusNet 1.0.0 directory and AFTER YOU MAKE A
In your new StatusNet 1.0.1 directory and AFTER YOU MAKE A
BACKUP run the upgrade.php script like this:
php ./scripts/upgrade.php
......
......@@ -223,7 +223,7 @@ class AllAction extends ProfileAction
// XXX: make this a little more convenient
if (!common_config('performance', 'high')) {
$pop = new PopularNoticeSection($this);
$pop = new PopularNoticeSection($this, Profile::current());
$pop->show();
$pop = new InboxTagCloudSection($this, $this->user);
$pop->show();
......
......@@ -92,8 +92,6 @@ class ApiSearchAtomAction extends ApiPrivateAuthAction
*/
function prepare($args)
{
common_debug("in apisearchatom prepare()");
parent::prepare($args);
$this->query = $this->trimmed('q');
......
......@@ -63,8 +63,6 @@ class ApiSearchJSONAction extends ApiPrivateAuthAction
*/
function prepare($args)
{
common_debug("apisearchjson prepare()");
parent::prepare($args);
$this->query = $this->trimmed('q');
......
......@@ -162,4 +162,72 @@ class DocAction extends Action
Event::handle('EndLoadDoc', array($this->title, &$this->output));
}
}
function showLocalNav()
{
$menu = new DocNav($this);
$menu->show();
}
}
class DocNav extends Menu
{
function show()
{
$stub = new HomeStubNav($this->action);
$this->submenu(_m('MENU','Home'), $stub);
$docs = new DocListNav($this->action);
$this->submenu(_m('MENU','Docs'), $docs);
}
}
class DocListNav extends Menu
{
function getItems()
{
$items = array();
if (Event::handle('StartDocsMenu', array(&$items))) {
$items = array(array('doc',
array('title' => 'help'),
_m('MENU', 'Help'),
_('Getting started'),
'nav_doc_help'),
array('doc',
array('title' => 'about'),
_m('MENU', 'About'),
_('About this site'),
'nav_doc_about'),
array('doc',
array('title' => 'faq'),
_m('MENU', 'FAQ'),
_('Frequently asked questions'),
'nav_doc_faq'),
array('doc',
array('title' => 'contact'),
_m('MENU', 'Contact'),
_('Contact info'),
'nav_doc_contact'),
array('doc',
array('title' => 'tags'),
_m('MENU', 'Tags'),
_('Using tags'),
'nav_doc_tags'),
array('doc',
array('title' => 'groups'),
_m('MENU', 'Groups'),
_('Using groups'),
'nav_doc_groups'),
array('doc',
array('title' => 'api'),
_m('MENU', 'API'),
_('RESTful API'),
'nav_doc_api'));
Event::handle('EndDocsMenu', array(&$items));
}
return $items;
}
}
......@@ -159,7 +159,7 @@ class EditgroupAction extends GroupAction
function showScripts()
{
parent::showScripts();
$this->autofocus('nickname');
$this->autofocus('newnickname');
}
function trySave()
......@@ -173,7 +173,7 @@ class EditgroupAction extends GroupAction
if (Event::handle('StartGroupSaveForm', array($this))) {
$nickname = Nickname::normalize($this->trimmed('nickname'));
$nickname = Nickname::normalize($this->trimmed('newnickname'));
$fullname = $this->trimmed('fullname');
$homepage = $this->trimmed('homepage');
$description = $this->trimmed('description');
......
......@@ -71,7 +71,11 @@ class EditpeopletagAction extends Action
}
$id = $this->arg('id');
$tagger_arg = $this->arg('tagger');
if (common_config('singleuser', 'enabled')) {
$tagger_arg = User::singleUserNickname();
} else {
$tagger_arg = $this->arg('tagger');
}
$tag_arg = $this->arg('tag');
$tagger = common_canonical_nickname($tagger_arg);
......
......@@ -172,11 +172,8 @@ class FavoritedAction extends Action
*/
function showContent()
{
$pop = new Popularity();