MaketRandevu/application
Alex Tselegidis a3b8228122 Merge branch 'master' into develop
# Conflicts:
#	application/config/autoload.php
#	application/config/config.php
#	application/controllers/Appointments.php
#	application/controllers/Backend.php
#	application/controllers/Backend_api.php
#	application/controllers/Captcha.php
#	application/controllers/Console.php
#	application/controllers/Google.php
#	application/controllers/Installation.php
#	application/core/EA_Controller.php
#	application/core/EA_Model.php
#	application/libraries/Google_sync.php
#	application/libraries/Ics_file.php
#	application/models/Settings_model.php
#	application/views/appointments/book_success.php
#	assets/css/layouts/backend_layout.scss
#	assets/css/no_privileges.css
#	assets/js/backend_calendar_table_view.js
#	assets/js/backend_calendar_unavailability_events_modal.js
#	assets/js/frontend_book.js
#	assets/js/general_functions.js
#	assets/js/pages/booking_confirmation.js
#	assets/js/working_plan_exceptions_modal.js
#	composer.json
#	composer.lock
#	docs/console.md
#	docs/docker.md
#	docs/faq.md
#	docs/get-involved.md
#	docs/google-calendar-sync.md
#	docs/installation-guide.md
#	docs/manage-translations.md
#	docs/readme.md
#	docs/rest-api.md
#	docs/update-guide.md
#	gulpfile.js
#	system/core/Input.php
#	system/core/Output.php
#	system/core/Security.php
#	system/libraries/Session/drivers/Session_files_driver.php
2022-03-25 10:53:46 +01:00
..
config Merge branch 'master' into develop 2022-03-25 10:53:46 +01:00
controllers Merge branch 'master' into develop 2022-03-25 10:53:46 +01:00
core Merge branch 'master' into develop 2022-03-25 10:53:46 +01:00
helpers Merge branch 'master' into develop 2022-03-25 10:53:46 +01:00
language Merge branch 'develop' into develop 2022-02-10 20:28:29 +01:00
libraries Merge branch 'master' into develop 2022-03-25 10:53:46 +01:00
migrations Add support for soft appointment, service, customer and provider removals (#1115). 2022-01-24 23:32:42 +01:00
models Security configuration enhancements in the application (#1208) 2022-02-23 14:54:41 +01:00
views Merge branch 'master' into develop 2022-03-25 10:53:46 +01:00
.htaccess
index.html