Merge branch 'develop' into 'main'
merge develop See merge request !1
Showing
- .env.example 8 additions, 0 deletions.env.example
- Dockerfile 2 additions, 1 deletionDockerfile
- README.md 14 additions, 2 deletionsREADME.md
- docker-compose.yml 11 additions, 15 deletionsdocker-compose.yml
- migrations/01_notflixapp.sql 371 additions, 0 deletionsmigrations/01_notflixapp.sql
- screenshots/edit_profile.jpg 0 additions, 0 deletionsscreenshots/edit_profile.jpg
- screenshots/premium_film.jpg 0 additions, 0 deletionsscreenshots/premium_film.jpg
- screenshots/profile_pending.jpg 0 additions, 0 deletionsscreenshots/profile_pending.jpg
- screenshots/profile_premium.jpg 0 additions, 0 deletionsscreenshots/profile_premium.jpg
- screenshots/watch.jpg 0 additions, 0 deletionsscreenshots/watch.jpg
- screenshots/watch_premium.jpg 0 additions, 0 deletionsscreenshots/watch_premium.jpg
- src/app/clients/SoapClient.php 26 additions, 0 deletionssrc/app/clients/SoapClient.php
- src/app/config/config.php 9 additions, 1 deletionsrc/app/config/config.php
- src/app/controller/conditional/NotFoundController.php 1 addition, 1 deletionsrc/app/controller/conditional/NotFoundController.php
- src/app/controller/conditional/RestrictedController.php 2 additions, 2 deletionssrc/app/controller/conditional/RestrictedController.php
- src/app/controller/film/FilmController.php 164 additions, 24 deletionssrc/app/controller/film/FilmController.php
- src/app/controller/film/GenreController.php 25 additions, 2 deletionssrc/app/controller/film/GenreController.php
- src/app/controller/search/SearchPageController.php 3 additions, 3 deletionssrc/app/controller/search/SearchPageController.php
- src/app/controller/user/HomePageController.php 6 additions, 4 deletionssrc/app/controller/user/HomePageController.php
- src/app/controller/user/LoginController.php 1 addition, 1 deletionsrc/app/controller/user/LoginController.php
Please register or sign in to comment