aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2015-08-04 23:13:15 +0200
committerJeremy Benoist <j0k3r@users.noreply.github.com>2015-08-04 23:13:15 +0200
commit8d9b8912aff9ccfa85241a1d64eb4b1366ed1b43 (patch)
treee93da7bccfac43381be652d29e2e7f9dc43f1267 /src/Wallabag
parent9e07dc982c92eb35ab82dffaab9c4a0b54ad7364 (diff)
parent4ab58dcf6c833170c307de120698740fe0685efb (diff)
downloadwallabag-8d9b8912aff9ccfa85241a1d64eb4b1366ed1b43.tar.gz
wallabag-8d9b8912aff9ccfa85241a1d64eb4b1366ed1b43.tar.zst
wallabag-8d9b8912aff9ccfa85241a1d64eb4b1366ed1b43.zip
Merge pull request #1279 from wallabag/material-default
set material to default theme \o/
Diffstat (limited to 'src/Wallabag')
-rw-r--r--src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php2
-rw-r--r--src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php2
-rw-r--r--src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php
index 900e151d..3bb5c5f2 100644
--- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php
+++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php
@@ -15,7 +15,7 @@ class LoadConfigData extends AbstractFixture implements OrderedFixtureInterface
15 public function load(ObjectManager $manager) 15 public function load(ObjectManager $manager)
16 { 16 {
17 $adminConfig = new Config($this->getReference('admin-user')); 17 $adminConfig = new Config($this->getReference('admin-user'));
18 $adminConfig->setTheme('baggy'); 18 $adminConfig->setTheme('material');
19 $adminConfig->setItemsPerPage(30); 19 $adminConfig->setItemsPerPage(30);
20 $adminConfig->setLanguage('en_US'); 20 $adminConfig->setLanguage('en_US');
21 21
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
index f72cba65..5ab9c329 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
@@ -102,7 +102,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
102 return array( 102 return array(
103 array( 103 array(
104 array( 104 array(
105 'change_passwd[old_password]' => 'baggy', 105 'change_passwd[old_password]' => 'material',
106 'change_passwd[new_password][first]' => '', 106 'change_passwd[new_password][first]' => '',
107 'change_passwd[new_password][second]' => '', 107 'change_passwd[new_password][second]' => '',
108 ), 108 ),
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php
index e560ffdd..a51e836d 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php
@@ -69,7 +69,7 @@ class SecurityControllerTest extends WallabagCoreTestCase
69 $client = $parameters['client']; 69 $client = $parameters['client'];
70 70
71 $data = array( 71 $data = array(
72 'forgot_password[email]' => 'baggy', 72 'forgot_password[email]' => 'material',
73 ); 73 );
74 74
75 $client->submit($form, $data); 75 $client->submit($form, $data);