mirror of
https://github.com/wallabag/wallabag.git
synced 2024-12-22 23:56:29 +00:00
Some fixes about upgrade from 2.0.x -> 2.1.0
This commit is contained in:
parent
92fa168344
commit
084fb0d303
11 changed files with 22 additions and 11 deletions
|
@ -29,8 +29,12 @@ class Version20160812120952 extends AbstractMigration implements ContainerAwareI
|
||||||
*/
|
*/
|
||||||
public function up(Schema $schema)
|
public function up(Schema $schema)
|
||||||
{
|
{
|
||||||
|
if ($this->connection->getDatabasePlatform()->getName() == 'sqlite') {
|
||||||
|
$this->addSql('ALTER TABLE '.$this->getTable('oauth2_clients').' ADD name longtext DEFAULT NULL');
|
||||||
|
} else {
|
||||||
$this->addSql('ALTER TABLE '.$this->getTable('oauth2_clients').' ADD name longtext COLLATE \'utf8_unicode_ci\' DEFAULT NULL');
|
$this->addSql('ALTER TABLE '.$this->getTable('oauth2_clients').' ADD name longtext COLLATE \'utf8_unicode_ci\' DEFAULT NULL');
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param Schema $schema
|
* @param Schema $schema
|
||||||
|
|
|
@ -12,7 +12,7 @@ source_suffix = '.rst'
|
||||||
master_doc = 'index'
|
master_doc = 'index'
|
||||||
project = u'wallabag-fr'
|
project = u'wallabag-fr'
|
||||||
copyright = u'2013-2016, Nicolas Lœuillet - MIT Licence'
|
copyright = u'2013-2016, Nicolas Lœuillet - MIT Licence'
|
||||||
version = '2.0.0'
|
version = '2.1.0'
|
||||||
release = version
|
release = version
|
||||||
exclude_patterns = ['_build']
|
exclude_patterns = ['_build']
|
||||||
pygments_style = 'sphinx'
|
pygments_style = 'sphinx'
|
||||||
|
|
|
@ -11,7 +11,9 @@ Das neueste Release ist auf https://www.wallabag.org/pages/download-wallabag.htm
|
||||||
git fetch origin
|
git fetch origin
|
||||||
git fetch --tags
|
git fetch --tags
|
||||||
git checkout 2.1.0
|
git checkout 2.1.0
|
||||||
./install.sh
|
ASSETS=build ./install.sh
|
||||||
|
php bin/console doctrine:migrations:migrate --env=prod
|
||||||
|
php bin/console cache:clear --env=prod
|
||||||
|
|
||||||
Update auf einem Shared Webhosting
|
Update auf einem Shared Webhosting
|
||||||
----------------------------------
|
----------------------------------
|
||||||
|
|
|
@ -12,7 +12,7 @@ source_suffix = '.rst'
|
||||||
master_doc = 'index'
|
master_doc = 'index'
|
||||||
project = u'wallabag'
|
project = u'wallabag'
|
||||||
copyright = u'2013-2016, Nicolas Lœuillet - MIT Licence'
|
copyright = u'2013-2016, Nicolas Lœuillet - MIT Licence'
|
||||||
version = '2.0.0'
|
version = '2.1.0'
|
||||||
release = version
|
release = version
|
||||||
exclude_patterns = ['_build']
|
exclude_patterns = ['_build']
|
||||||
pygments_style = 'sphinx'
|
pygments_style = 'sphinx'
|
||||||
|
|
|
@ -11,7 +11,9 @@ The last release is published on https://www.wallabag.org/pages/download-wallaba
|
||||||
git fetch origin
|
git fetch origin
|
||||||
git fetch --tags
|
git fetch --tags
|
||||||
git checkout 2.1.0
|
git checkout 2.1.0
|
||||||
./install.sh
|
ASSETS=build ./install.sh
|
||||||
|
php bin/console doctrine:migrations:migrate --env=prod
|
||||||
|
php bin/console cache:clear --env=prod
|
||||||
|
|
||||||
Upgrade on a shared hosting
|
Upgrade on a shared hosting
|
||||||
---------------------------
|
---------------------------
|
||||||
|
|
|
@ -12,7 +12,7 @@ source_suffix = '.rst'
|
||||||
master_doc = 'index'
|
master_doc = 'index'
|
||||||
project = u'wallabag-fr'
|
project = u'wallabag-fr'
|
||||||
copyright = u'2013-2016, Nicolas Lœuillet - MIT Licence'
|
copyright = u'2013-2016, Nicolas Lœuillet - MIT Licence'
|
||||||
version = '2.0.0'
|
version = '2.1.0'
|
||||||
release = version
|
release = version
|
||||||
exclude_patterns = ['_build']
|
exclude_patterns = ['_build']
|
||||||
pygments_style = 'sphinx'
|
pygments_style = 'sphinx'
|
||||||
|
|
|
@ -11,7 +11,9 @@ La dernière version de wallabag est publiée à cette adresse : https://www.wal
|
||||||
git fetch origin
|
git fetch origin
|
||||||
git fetch --tags
|
git fetch --tags
|
||||||
git checkout 2.1.0
|
git checkout 2.1.0
|
||||||
./install.sh
|
ASSETS=build ./install.sh
|
||||||
|
php bin/console doctrine:migrations:migrate --env=prod
|
||||||
|
php bin/console cache:clear --env=prod
|
||||||
|
|
||||||
Mise à jour sur un hébergement mutualisé
|
Mise à jour sur un hébergement mutualisé
|
||||||
----------------------------------------
|
----------------------------------------
|
||||||
|
|
|
@ -48,6 +48,7 @@ footer:
|
||||||
page_title: 'Configuration'
|
page_title: 'Configuration'
|
||||||
|
|
||||||
config:
|
config:
|
||||||
|
page_title: 'Configuration'
|
||||||
tab_menu:
|
tab_menu:
|
||||||
settings: 'Paramètres'
|
settings: 'Paramètres'
|
||||||
rss: 'RSS'
|
rss: 'RSS'
|
||||||
|
|
|
@ -47,7 +47,7 @@ class TagControllerTest extends WallabagCoreTestCase
|
||||||
|
|
||||||
$this->assertEquals(1, count($entry->getTags()));
|
$this->assertEquals(1, count($entry->getTags()));
|
||||||
|
|
||||||
# tag already exists and already assigned
|
// tag already exists and already assigned
|
||||||
$client->submit($form, $data);
|
$client->submit($form, $data);
|
||||||
$this->assertEquals(302, $client->getResponse()->getStatusCode());
|
$this->assertEquals(302, $client->getResponse()->getStatusCode());
|
||||||
|
|
||||||
|
@ -58,7 +58,7 @@ class TagControllerTest extends WallabagCoreTestCase
|
||||||
|
|
||||||
$this->assertEquals(1, count($newEntry->getTags()));
|
$this->assertEquals(1, count($newEntry->getTags()));
|
||||||
|
|
||||||
# tag already exists but still not assigned to this entry
|
// tag already exists but still not assigned to this entry
|
||||||
$data = [
|
$data = [
|
||||||
'tag[label]' => 'foo',
|
'tag[label]' => 'foo',
|
||||||
];
|
];
|
||||||
|
|
|
@ -83,7 +83,7 @@ abstract class WallabagCoreTestCase extends WebTestCase
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if Redis is installed.
|
* Check if Redis is installed.
|
||||||
* If not, mark test as skip
|
* If not, mark test as skip.
|
||||||
*/
|
*/
|
||||||
protected function checkRedis()
|
protected function checkRedis()
|
||||||
{
|
{
|
||||||
|
|
|
@ -37,7 +37,7 @@ class AuthCodeMailerTest extends \PHPUnit_Framework_TestCase
|
||||||
);
|
);
|
||||||
$this->mailer = new \Swift_Mailer($transport);
|
$this->mailer = new \Swift_Mailer($transport);
|
||||||
|
|
||||||
$twigTemplate = <<<TWIG
|
$twigTemplate = <<<'TWIG'
|
||||||
{% block subject %}subject{% endblock %}
|
{% block subject %}subject{% endblock %}
|
||||||
{% block body_html %}html body {{ code }}{% endblock %}
|
{% block body_html %}html body {{ code }}{% endblock %}
|
||||||
{% block body_text %}text body {{ support_url }}{% endblock %}
|
{% block body_text %}text body {{ support_url }}{% endblock %}
|
||||||
|
|
Loading…
Reference in a new issue