diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/translations/messages.da.yml | 1 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | 1 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | 1 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml | 1 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/translations/messages.it.yml | 1 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml | 1 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | 1 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml | 1 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | 1 | ||||
-rw-r--r-- | src/Wallabag/GroupBundle/Entity/Group.php (renamed from src/Wallabag/UserBundle/Entity/Group.php) | 2 | ||||
-rw-r--r-- | src/Wallabag/GroupBundle/WallabagGroupBundle.php | 9 | ||||
-rw-r--r-- | src/Wallabag/UserBundle/Entity/User.php | 2 | ||||
-rw-r--r-- | src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig | 1 |
13 files changed, 21 insertions, 2 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 5229ac73..ea7fb086 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml | |||
@@ -514,6 +514,7 @@ user: | |||
514 | repeat_new_password_label: 'Gentag adgangskode' | 514 | repeat_new_password_label: 'Gentag adgangskode' |
515 | plain_password_label: '????' | 515 | plain_password_label: '????' |
516 | email_label: 'Emailadresse' | 516 | email_label: 'Emailadresse' |
517 | # group: 'Group' | ||
517 | # enabled_label: 'Enabled' | 518 | # enabled_label: 'Enabled' |
518 | # last_login_label: 'Last login' | 519 | # last_login_label: 'Last login' |
519 | # twofactor_label: Two factor authentication | 520 | # twofactor_label: Two factor authentication |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index 996f173a..fcda6ae6 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | |||
@@ -514,6 +514,7 @@ user: | |||
514 | repeat_new_password_label: 'Neues Kennwort wiederholen' | 514 | repeat_new_password_label: 'Neues Kennwort wiederholen' |
515 | plain_password_label: '????' | 515 | plain_password_label: '????' |
516 | email_label: 'E-Mail-Adresse' | 516 | email_label: 'E-Mail-Adresse' |
517 | # group: 'Group' | ||
517 | enabled_label: 'Aktiviert' | 518 | enabled_label: 'Aktiviert' |
518 | last_login_label: 'Letzter Login' | 519 | last_login_label: 'Letzter Login' |
519 | twofactor_label: Zwei-Faktor-Authentifizierung | 520 | twofactor_label: Zwei-Faktor-Authentifizierung |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index aa1cd1a9..54427e23 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
@@ -514,6 +514,7 @@ user: | |||
514 | repeat_new_password_label: 'Repeat new password' | 514 | repeat_new_password_label: 'Repeat new password' |
515 | plain_password_label: '????' | 515 | plain_password_label: '????' |
516 | email_label: 'Email' | 516 | email_label: 'Email' |
517 | group: 'Group' | ||
517 | enabled_label: 'Enabled' | 518 | enabled_label: 'Enabled' |
518 | last_login_label: 'Last login' | 519 | last_login_label: 'Last login' |
519 | twofactor_label: Two factor authentication | 520 | twofactor_label: Two factor authentication |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index 57e6c029..16c4f3a0 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml | |||
@@ -514,6 +514,7 @@ user: | |||
514 | repeat_new_password_label: 'رمز تازه را دوباره بنویسید' | 514 | repeat_new_password_label: 'رمز تازه را دوباره بنویسید' |
515 | plain_password_label: '????' | 515 | plain_password_label: '????' |
516 | email_label: 'نشانی ایمیل' | 516 | email_label: 'نشانی ایمیل' |
517 | # group: 'Group' | ||
517 | # enabled_label: 'Enabled' | 518 | # enabled_label: 'Enabled' |
518 | # last_login_label: 'Last login' | 519 | # last_login_label: 'Last login' |
519 | # twofactor_label: Two factor authentication | 520 | # twofactor_label: Two factor authentication |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index 4e26f38c..8dff4c6d 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml | |||
@@ -514,6 +514,7 @@ user: | |||
514 | repeat_new_password_label: 'Ripeti password' | 514 | repeat_new_password_label: 'Ripeti password' |
515 | plain_password_label: '????' | 515 | plain_password_label: '????' |
516 | email_label: 'E-mail' | 516 | email_label: 'E-mail' |
517 | # group: 'Group' | ||
517 | # enabled_label: 'Enabled' | 518 | # enabled_label: 'Enabled' |
518 | # last_login_label: 'Last login' | 519 | # last_login_label: 'Last login' |
519 | # twofactor_label: Two factor authentication | 520 | # twofactor_label: Two factor authentication |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index be57e903..1cf70233 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml | |||
@@ -514,6 +514,7 @@ user: | |||
514 | repeat_new_password_label: 'Confirmatz vòstre novèl senhal' | 514 | repeat_new_password_label: 'Confirmatz vòstre novèl senhal' |
515 | plain_password_label: 'Senhal en clar' | 515 | plain_password_label: 'Senhal en clar' |
516 | email_label: 'Adreça de corrièl' | 516 | email_label: 'Adreça de corrièl' |
517 | # group: 'Group' | ||
517 | enabled_label: 'Actiu' | 518 | enabled_label: 'Actiu' |
518 | last_login_label: 'Darrièra connexion' | 519 | last_login_label: 'Darrièra connexion' |
519 | twofactor_label: 'Autentificacion doble-factor' | 520 | twofactor_label: 'Autentificacion doble-factor' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index 00c559ed..d3af4fd5 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | |||
@@ -514,6 +514,7 @@ user: | |||
514 | repeat_new_password_label: 'Powtórz nowe hasło' | 514 | repeat_new_password_label: 'Powtórz nowe hasło' |
515 | plain_password_label: 'Jawne hasło' | 515 | plain_password_label: 'Jawne hasło' |
516 | email_label: 'Adres email' | 516 | email_label: 'Adres email' |
517 | # group: 'Group' | ||
517 | enabled_label: 'Włączony' | 518 | enabled_label: 'Włączony' |
518 | last_login_label: 'Ostatnie logowanie' | 519 | last_login_label: 'Ostatnie logowanie' |
519 | twofactor_label: Autoryzacja dwuetapowa | 520 | twofactor_label: Autoryzacja dwuetapowa |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index f16504ed..3952eae8 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml | |||
@@ -514,6 +514,7 @@ user: | |||
514 | repeat_new_password_label: 'Repeat new password' | 514 | repeat_new_password_label: 'Repeat new password' |
515 | plain_password_label: '????' | 515 | plain_password_label: '????' |
516 | email_label: 'E-mail' | 516 | email_label: 'E-mail' |
517 | # group: 'Group' | ||
517 | # enabled_label: 'Enabled' | 518 | # enabled_label: 'Enabled' |
518 | # last_login_label: 'Last login' | 519 | # last_login_label: 'Last login' |
519 | # twofactor_label: Two factor authentication | 520 | # twofactor_label: Two factor authentication |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index 90a140cd..74f76c72 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | |||
@@ -512,6 +512,7 @@ user: | |||
512 | repeat_new_password_label: 'Yeni şifrenin tekrarı' | 512 | repeat_new_password_label: 'Yeni şifrenin tekrarı' |
513 | plain_password_label: '????' | 513 | plain_password_label: '????' |
514 | email_label: 'E-posta' | 514 | email_label: 'E-posta' |
515 | # group: 'Group' | ||
515 | # enabled_label: 'Enabled' | 516 | # enabled_label: 'Enabled' |
516 | # last_login_label: 'Last login' | 517 | # last_login_label: 'Last login' |
517 | # twofactor_label: Two factor authentication | 518 | # twofactor_label: Two factor authentication |
diff --git a/src/Wallabag/UserBundle/Entity/Group.php b/src/Wallabag/GroupBundle/Entity/Group.php index 9145959d..57dc16d1 100644 --- a/src/Wallabag/UserBundle/Entity/Group.php +++ b/src/Wallabag/GroupBundle/Entity/Group.php | |||
@@ -1,6 +1,6 @@ | |||
1 | <?php | 1 | <?php |
2 | 2 | ||
3 | namespace Wallabag\UserBundle\Entity; | 3 | namespace Wallabag\GroupBundle\Entity; |
4 | 4 | ||
5 | use FOS\UserBundle\Model\Group as BaseGroup; | 5 | use FOS\UserBundle\Model\Group as BaseGroup; |
6 | use Doctrine\ORM\Mapping as ORM; | 6 | use Doctrine\ORM\Mapping as ORM; |
diff --git a/src/Wallabag/GroupBundle/WallabagGroupBundle.php b/src/Wallabag/GroupBundle/WallabagGroupBundle.php new file mode 100644 index 00000000..93b66508 --- /dev/null +++ b/src/Wallabag/GroupBundle/WallabagGroupBundle.php | |||
@@ -0,0 +1,9 @@ | |||
1 | <?php | ||
2 | |||
3 | namespace Wallabag\GroupBundle; | ||
4 | |||
5 | use Symfony\Component\HttpKernel\Bundle\Bundle; | ||
6 | |||
7 | class WallabagGroupBundle extends Bundle | ||
8 | { | ||
9 | } | ||
diff --git a/src/Wallabag/UserBundle/Entity/User.php b/src/Wallabag/UserBundle/Entity/User.php index 781f7b03..7da0d1d5 100644 --- a/src/Wallabag/UserBundle/Entity/User.php +++ b/src/Wallabag/UserBundle/Entity/User.php | |||
@@ -98,7 +98,7 @@ class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterf | |||
98 | private $authCode; | 98 | private $authCode; |
99 | 99 | ||
100 | /** | 100 | /** |
101 | * @ORM\ManyToMany(targetEntity="Wallabag\UserBundle\Entity\Group") | 101 | * @ORM\ManyToMany(targetEntity="Wallabag\GroupBundle\Entity\Group") |
102 | * @ORM\JoinTable(name="user_group", | 102 | * @ORM\JoinTable(name="user_group", |
103 | * joinColumns={@ORM\JoinColumn(name="user_id", referencedColumnName="id")}, | 103 | * joinColumns={@ORM\JoinColumn(name="user_id", referencedColumnName="id")}, |
104 | * inverseJoinColumns={@ORM\JoinColumn(name="group_id", referencedColumnName="id")} | 104 | * inverseJoinColumns={@ORM\JoinColumn(name="group_id", referencedColumnName="id")} |
diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig index 15002632..9d5abcaf 100644 --- a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig +++ b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig | |||
@@ -30,6 +30,7 @@ | |||
30 | {{ form_rest(searchForm) }} | 30 | {{ form_rest(searchForm) }} |
31 | </form> | 31 | </form> |
32 | </div> | 32 | </div> |
33 | |||
33 | </div> | 34 | </div> |
34 | 35 | ||
35 | <table class="bordered"> | 36 | <table class="bordered"> |