privacy pages

2018-04-25 14:17:35 +02:00 · 2018-04-25 14:17:35 +02:00 · b925069621
parent ac667d6fa1
commit b925069621
21 changed files with 4 additions and 4 deletions
--- a/app/Resources/FOSUserBundle/views/Resetting/request.html.twig
+++ b/app/Resources/FOSUserBundle/views/Resetting/request.html.twig
--- a/app/Resources/views/default/description-app.html.twig
+++ b/app/Resources/views/default/description-app.html.twig
--- a/app/Resources/views/legal/privacy.html.twig
+++ b/app/Resources/views/legal/privacy.html.twig
--- a/app/Resources/views/legal/tos.html.twig
+++ b/app/Resources/views/legal/tos.html.twig
--- a/app/Resources/views/logged/angular/validate-button.html.twig
+++ b/app/Resources/views/logged/angular/validate-button.html.twig
--- a/app/Resources/views/logged/history.html.twig
+++ b/app/Resources/views/logged/history.html.twig
--- a/app/Resources/views/logged/import.html.twig
+++ b/app/Resources/views/logged/import.html.twig
--- a/app/Resources/views/logged/mass-register.html.twig
+++ b/app/Resources/views/logged/mass-register.html.twig
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@ -11,16 +11,16 @@ hwi_oauth_login:
    prefix:   /login

 facebook_login:
-    path: /login/check-facebook
+    pattern: /login/check-facebook

 google_login:
-    path: /login/check-google
+    pattern: /login/check-google

 disqus_login:
-    path: /login/check-disqus
+    pattern: /login/check-disqus

 twitter_login:
-    path: /login/check-twitter
+    pattern: /login/check-twitter

 ## app specific stuff
 app_festival:
--- a/assets/css/pages/main_screen.scss
+++ b/assets/css/pages/main_screen.scss
--- a/assets/css/split/override_libs.scss
+++ b/assets/css/split/override_libs.scss
--- a/assets/css/split/typo.scss
+++ b/assets/css/split/typo.scss
--- a/src/AppBundle/Entity/Festival.php
+++ b/src/AppBundle/Entity/Festival.php
--- a/src/AppBundle/Entity/Product.php
+++ b/src/AppBundle/Entity/Product.php
--- a/src/AppBundle/Entity/ProductCategory.php
+++ b/src/AppBundle/Entity/ProductCategory.php
--- a/src/AppBundle/Entity/ProductSold.php
+++ b/src/AppBundle/Entity/ProductSold.php
--- a/src/AppBundle/Entity/SellRecord.php
+++ b/src/AppBundle/Entity/SellRecord.php
--- a/src/AppBundle/Entity/User.php
+++ b/src/AppBundle/Entity/User.php
--- a/src/AppBundle/Security/Core/User/MyFOSUBUserProvider.php
+++ b/src/AppBundle/Security/Core/User/MyFOSUBUserProvider.php
--- a/web/config.php
+++ b/web/config.php
--- a/web/modele_import_caisse.csv
+++ b/web/modele_import_caisse.csv