diff --git a/app/Resources/FOSUserBundle/views/Resetting/request.html.twig b/app/Resources/FOSUserBundle/views/Resetting/request.html.twig old mode 100644 new mode 100755 diff --git a/app/Resources/views/default/description-app.html.twig b/app/Resources/views/default/description-app.html.twig old mode 100644 new mode 100755 diff --git a/app/Resources/views/legal/privacy.html.twig b/app/Resources/views/legal/privacy.html.twig old mode 100644 new mode 100755 diff --git a/app/Resources/views/legal/tos.html.twig b/app/Resources/views/legal/tos.html.twig old mode 100644 new mode 100755 diff --git a/app/Resources/views/logged/angular/validate-button.html.twig b/app/Resources/views/logged/angular/validate-button.html.twig old mode 100644 new mode 100755 diff --git a/app/Resources/views/logged/history.html.twig b/app/Resources/views/logged/history.html.twig old mode 100644 new mode 100755 diff --git a/app/Resources/views/logged/import.html.twig b/app/Resources/views/logged/import.html.twig old mode 100644 new mode 100755 diff --git a/app/Resources/views/logged/mass-register.html.twig b/app/Resources/views/logged/mass-register.html.twig old mode 100644 new mode 100755 diff --git a/app/config/routing.yml b/app/config/routing.yml index 77ddbb36..bc87ae68 100755 --- 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: diff --git a/assets/css/pages/main_screen.scss b/assets/css/pages/main_screen.scss old mode 100644 new mode 100755 diff --git a/assets/css/split/override_libs.scss b/assets/css/split/override_libs.scss old mode 100644 new mode 100755 diff --git a/assets/css/split/typo.scss b/assets/css/split/typo.scss old mode 100644 new mode 100755 diff --git a/src/AppBundle/Entity/Festival.php b/src/AppBundle/Entity/Festival.php old mode 100644 new mode 100755 diff --git a/src/AppBundle/Entity/Product.php b/src/AppBundle/Entity/Product.php old mode 100644 new mode 100755 diff --git a/src/AppBundle/Entity/ProductCategory.php b/src/AppBundle/Entity/ProductCategory.php old mode 100644 new mode 100755 diff --git a/src/AppBundle/Entity/ProductSold.php b/src/AppBundle/Entity/ProductSold.php old mode 100644 new mode 100755 diff --git a/src/AppBundle/Entity/SellRecord.php b/src/AppBundle/Entity/SellRecord.php old mode 100644 new mode 100755 diff --git a/src/AppBundle/Entity/User.php b/src/AppBundle/Entity/User.php old mode 100644 new mode 100755 diff --git a/src/AppBundle/Security/Core/User/MyFOSUBUserProvider.php b/src/AppBundle/Security/Core/User/MyFOSUBUserProvider.php old mode 100644 new mode 100755 diff --git a/web/config.php b/web/config.php old mode 100644 new mode 100755 diff --git a/web/modele_import_caisse.csv b/web/modele_import_caisse.csv old mode 100644 new mode 100755