diff --git a/.env.test b/.env.test old mode 100644 new mode 100755 diff --git a/.gitignore b/.gitignore index 27e043a..e82b3dc 100755 --- a/.gitignore +++ b/.gitignore @@ -40,4 +40,5 @@ public/* ###< symfony/phpunit-bridge ### node_modules -funky-framadate-front +funky-framadate-front/* +funky-framadate-front \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/assets/styles/app.scss b/assets/styles/app.scss old mode 100644 new mode 100755 diff --git a/assets/styles/pages/_global.scss b/assets/styles/pages/_global.scss old mode 100644 new mode 100755 diff --git a/assets/styles/pages/_home.scss b/assets/styles/pages/_home.scss old mode 100644 new mode 100755 diff --git a/assets/styles/pages/libs.scss b/assets/styles/pages/libs.scss old mode 100644 new mode 100755 diff --git a/composer-setup.php b/composer-setup.php old mode 100644 new mode 100755 diff --git a/composer.json b/composer.json old mode 100644 new mode 100755 diff --git a/composer.lock b/composer.lock old mode 100644 new mode 100755 diff --git a/config/bundles.php b/config/bundles.php old mode 100644 new mode 100755 diff --git a/config/graphql/types/Apartment.types.yaml b/config/graphql/types/Apartment.types.yaml old mode 100644 new mode 100755 diff --git a/config/graphql/types/Query.types.yaml b/config/graphql/types/Query.types.yaml old mode 100644 new mode 100755 diff --git a/config/packages/cache.yaml b/config/packages/cache.yaml old mode 100644 new mode 100755 diff --git a/config/packages/dev/debug.yaml b/config/packages/dev/debug.yaml old mode 100644 new mode 100755 diff --git a/config/packages/dev/jms_serializer.yaml b/config/packages/dev/jms_serializer.yaml old mode 100644 new mode 100755 diff --git a/config/packages/dev/mailer.yaml b/config/packages/dev/mailer.yaml old mode 100644 new mode 100755 diff --git a/config/packages/dev/swiftmailer.yaml b/config/packages/dev/swiftmailer.yaml old mode 100644 new mode 100755 diff --git a/config/packages/dev/web_profiler.yaml b/config/packages/dev/web_profiler.yaml old mode 100644 new mode 100755 diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml old mode 100644 new mode 100755 diff --git a/config/packages/doctrine_migrations.yaml b/config/packages/doctrine_migrations.yaml old mode 100644 new mode 100755 diff --git a/config/packages/fos_rest.yaml b/config/packages/fos_rest.yaml old mode 100644 new mode 100755 diff --git a/config/packages/framework.yaml b/config/packages/framework.yaml old mode 100644 new mode 100755 diff --git a/config/packages/jms_serializer.yaml b/config/packages/jms_serializer.yaml old mode 100644 new mode 100755 diff --git a/config/packages/mailer.yaml b/config/packages/mailer.yaml old mode 100644 new mode 100755 diff --git a/config/packages/nelmio_api_doc.yaml b/config/packages/nelmio_api_doc.yaml old mode 100644 new mode 100755 diff --git a/config/packages/nelmio_cors.yaml b/config/packages/nelmio_cors.yaml old mode 100644 new mode 100755 diff --git a/config/packages/prod/doctrine.yaml b/config/packages/prod/doctrine.yaml old mode 100644 new mode 100755 diff --git a/config/packages/prod/jms_serializer.yaml b/config/packages/prod/jms_serializer.yaml old mode 100644 new mode 100755 diff --git a/config/packages/prod/mailer.yml b/config/packages/prod/mailer.yml old mode 100644 new mode 100755 diff --git a/config/packages/prod/monolog.yaml b/config/packages/prod/monolog.yaml old mode 100644 new mode 100755 diff --git a/config/packages/prod/routing.yaml b/config/packages/prod/routing.yaml old mode 100644 new mode 100755 diff --git a/config/packages/routing.yaml b/config/packages/routing.yaml old mode 100644 new mode 100755 diff --git a/config/packages/sensio_framework_extra.yaml b/config/packages/sensio_framework_extra.yaml old mode 100644 new mode 100755 diff --git a/config/packages/swiftmailer.yaml b/config/packages/swiftmailer.yaml old mode 100644 new mode 100755 diff --git a/config/packages/test/doctrine.yaml b/config/packages/test/doctrine.yaml old mode 100644 new mode 100755 diff --git a/config/packages/test/framework.yaml b/config/packages/test/framework.yaml old mode 100644 new mode 100755 diff --git a/config/packages/test/swiftmailer.yaml b/config/packages/test/swiftmailer.yaml old mode 100644 new mode 100755 diff --git a/config/packages/test/twig.yaml b/config/packages/test/twig.yaml old mode 100644 new mode 100755 diff --git a/config/packages/test/web_profiler.yaml b/config/packages/test/web_profiler.yaml old mode 100644 new mode 100755 diff --git a/config/packages/twig.yaml b/config/packages/twig.yaml old mode 100644 new mode 100755 diff --git a/config/preload.php b/config/preload.php old mode 100644 new mode 100755 diff --git a/config/routes.yaml b/config/routes.yaml old mode 100644 new mode 100755 diff --git a/config/routes/annotations.yaml b/config/routes/annotations.yaml old mode 100644 new mode 100755 diff --git a/config/routes/dev/framework.yaml b/config/routes/dev/framework.yaml old mode 100644 new mode 100755 diff --git a/config/routes/dev/web_profiler.yaml b/config/routes/dev/web_profiler.yaml old mode 100644 new mode 100755 diff --git a/config/routes/nelmio_api_doc.yaml b/config/routes/nelmio_api_doc.yaml old mode 100644 new mode 100755 diff --git a/config/services.yaml b/config/services.yaml old mode 100644 new mode 100755 diff --git a/doc/SCHEMA:framadate_api.uml b/doc/SCHEMA:framadate_api.uml old mode 100644 new mode 100755 diff --git a/doc/apache2/dev.conf b/doc/apache2/dev.conf old mode 100644 new mode 100755 diff --git a/doc/apache2/dev_php_fpm.conf b/doc/apache2/dev_php_fpm.conf old mode 100644 new mode 100755 diff --git a/doc/database_creation.md b/doc/database_creation.md old mode 100644 new mode 100755 diff --git a/doc/framadate_api.png b/doc/framadate_api.png old mode 100644 new mode 100755 diff --git a/doc/framadate_api.svg b/doc/framadate_api.svg old mode 100644 new mode 100755 diff --git a/doc/migration.md b/doc/migration.md old mode 100644 new mode 100755 diff --git a/doc/php-8-install.md b/doc/php-8-install.md old mode 100644 new mode 100755 diff --git a/front_update.sh b/front_update.sh old mode 100644 new mode 100755 diff --git a/migrations/.gitignore b/migrations/.gitignore old mode 100644 new mode 100755 diff --git a/migrations/Version20210419202522.php b/migrations/Version20210419202522.php old mode 100644 new mode 100755 diff --git a/migrations/Version20210518212646.php b/migrations/Version20210518212646.php old mode 100644 new mode 100755 diff --git a/phpunit.xml.dist b/phpunit.xml.dist old mode 100644 new mode 100755 diff --git a/public/index.php b/public/index.php old mode 100644 new mode 100755 diff --git a/src/Controller/.gitignore b/src/Controller/.gitignore old mode 100644 new mode 100755 diff --git a/src/Controller/EmailsController.php b/src/Controller/EmailsController.php old mode 100644 new mode 100755 diff --git a/src/Controller/PollController.php b/src/Controller/PollController.php old mode 100644 new mode 100755 diff --git a/src/Controller/api/v1/CommentController.php b/src/Controller/api/v1/CommentController.php old mode 100644 new mode 100755 diff --git a/src/Controller/api/v1/PollController.php b/src/Controller/api/v1/PollController.php old mode 100644 new mode 100755 diff --git a/src/Controller/api/v1/VoteController.php b/src/Controller/api/v1/VoteController.php old mode 100644 new mode 100755 diff --git a/src/DataFixtures/CommentFixtures.php b/src/DataFixtures/CommentFixtures.php old mode 100644 new mode 100755 diff --git a/src/DataFixtures/VotesStacksFixtures.php b/src/DataFixtures/VotesStacksFixtures.php old mode 100644 new mode 100755 diff --git a/src/Entity/.gitignore b/src/Entity/.gitignore old mode 100644 new mode 100755 diff --git a/src/Form/PollType.php b/src/Form/PollType.php old mode 100644 new mode 100755 diff --git a/src/GraphQL/Resolver/ApartmentResolver.php b/src/GraphQL/Resolver/ApartmentResolver.php old mode 100644 new mode 100755 diff --git a/src/Kernel.php b/src/Kernel.php old mode 100644 new mode 100755 diff --git a/src/Repository/.gitignore b/src/Repository/.gitignore old mode 100644 new mode 100755 diff --git a/src/Service/MailService.php b/src/Service/MailService.php old mode 100644 new mode 100755 diff --git a/symfony.lock b/symfony.lock old mode 100644 new mode 100755 diff --git a/templates/admin/index.html.twig b/templates/admin/index.html.twig old mode 100644 new mode 100755 diff --git a/templates/default/index.html.twig b/templates/default/index.html.twig old mode 100644 new mode 100755 diff --git a/templates/email-base-plaintext.html.twig b/templates/email-base-plaintext.html.twig old mode 100644 new mode 100755 diff --git a/templates/email-base.html.twig b/templates/email-base.html.twig old mode 100644 new mode 100755 diff --git a/templates/emails/comment-notification.html.twig b/templates/emails/comment-notification.html.twig old mode 100644 new mode 100755 diff --git a/templates/emails/partial/admin_link.html.twig b/templates/emails/partial/admin_link.html.twig old mode 100644 new mode 100755 diff --git a/templates/emails/partial/poll.html.twig b/templates/emails/partial/poll.html.twig old mode 100644 new mode 100755 diff --git a/templates/emails/partial/public_link.html.twig b/templates/emails/partial/public_link.html.twig old mode 100644 new mode 100755 diff --git a/templates/emails/vote-notification.html.twig b/templates/emails/vote-notification.html.twig old mode 100644 new mode 100755 diff --git a/templates/migration/index.html.twig b/templates/migration/index.html.twig old mode 100644 new mode 100755 diff --git a/templates/owner/index.html.twig b/templates/owner/index.html.twig old mode 100644 new mode 100755 diff --git a/templates/pages/funky.html.twig b/templates/pages/funky.html.twig old mode 100644 new mode 100755 diff --git a/templates/pages/home.html.twig b/templates/pages/home.html.twig old mode 100644 new mode 100755 diff --git a/templates/pages/migration.html.twig b/templates/pages/migration.html.twig old mode 100644 new mode 100755 diff --git a/templates/poll/_delete_form.html.twig b/templates/poll/_delete_form.html.twig old mode 100644 new mode 100755 diff --git a/templates/poll/_form.html.twig b/templates/poll/_form.html.twig old mode 100644 new mode 100755 diff --git a/templates/poll/edit.html.twig b/templates/poll/edit.html.twig old mode 100644 new mode 100755 diff --git a/templates/poll/index.html.twig b/templates/poll/index.html.twig old mode 100644 new mode 100755 diff --git a/templates/poll/new.html.twig b/templates/poll/new.html.twig old mode 100644 new mode 100755 diff --git a/templates/poll/show.html.twig b/templates/poll/show.html.twig old mode 100644 new mode 100755 diff --git a/templates/split/footer.html.twig b/templates/split/footer.html.twig old mode 100644 new mode 100755 diff --git a/templates/split/header.html.twig b/templates/split/header.html.twig old mode 100644 new mode 100755 diff --git a/templates/vote/index.html.twig b/templates/vote/index.html.twig old mode 100644 new mode 100755 diff --git a/tests/Functional/AdminControllerTest.php b/tests/Functional/AdminControllerTest.php old mode 100644 new mode 100755 diff --git a/tests/Functional/CommentControllerTest.php b/tests/Functional/CommentControllerTest.php old mode 100644 new mode 100755 diff --git a/tests/Functional/PollControllerTest.php b/tests/Functional/PollControllerTest.php old mode 100644 new mode 100755 diff --git a/tests/bootstrap.php b/tests/bootstrap.php old mode 100644 new mode 100755 diff --git a/update.sh b/update.sh index 233f5af..5b86426 100755 --- a/update.sh +++ b/update.sh @@ -86,6 +86,7 @@ fi git config --global diff.submodule log git submodule update cd funky-framadate-front +git clean -fd git reset --hard && git checkout master && git pull cd .. @@ -118,6 +119,7 @@ cecho y " npm run $COMMAND_BUILD " cecho g " " cecho y " start: $(date) " cecho g "######################" +nvm use 16 npm run $COMMAND_BUILD cecho g "######################" diff --git a/yarn.lock b/yarn.lock old mode 100644 new mode 100755