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
..
api	Update the project subtitle.	2022-01-18 13:05:42 +01:00
About.php	Remove the html_vars call when loading views as it is currently unnecessary.	2022-01-19 10:21:05 +01:00
Account.php	Remove the html_vars call when loading views as it is currently unnecessary.	2022-01-19 10:21:05 +01:00
Admins.php	Remove the html_vars call when loading views as it is currently unnecessary.	2022-01-19 10:21:05 +01:00
Appointments.php	Add missing customer data from stripped array	2022-03-04 18:04:53 +01:00
Backend.php	Update the project subtitle.	2022-01-18 13:05:42 +01:00
Backend_api.php	Update the project subtitle.	2022-01-18 13:05:42 +01:00
Booking.php	Make the captcha challenges more user friendly.	2022-01-26 22:04:33 +01:00
Booking_cancellation.php	Remove the html_vars call when loading views as it is currently unnecessary.	2022-01-19 10:21:05 +01:00
Booking_confirmation.php	Remove the html_vars call when loading views as it is currently unnecessary.	2022-01-19 10:21:05 +01:00
Booking_settings.php	Remove the html_vars call when loading views as it is currently unnecessary.	2022-01-19 10:21:05 +01:00
Business_settings.php	Remove the html_vars call when loading views as it is currently unnecessary.	2022-01-19 10:21:05 +01:00
Calendar.php	Display appointments from all providers in one view.	2022-01-24 22:07:24 +01:00
Captcha.php	Merge branch 'master' into develop	2022-03-25 10:53:46 +01:00
Categories.php	Remove the html_vars call when loading views as it is currently unnecessary.	2022-01-19 10:21:05 +01:00
Consents.php	Update the project subtitle.	2022-01-18 13:05:42 +01:00
Console.php	Update the project subtitle.	2022-01-18 13:05:42 +01:00
Customers.php	Remove the html_vars call when loading views as it is currently unnecessary.	2022-01-19 10:21:05 +01:00
General_settings.php	Remove the html_vars call when loading views as it is currently unnecessary.	2022-01-19 10:21:05 +01:00
Google.php	Merge branch 'master' into develop	2022-03-25 10:53:46 +01:00
index.html	Moved source files to the root directory.	2020-03-11 10:24:25 +01:00
Installation.php	Switch to go-to-latest database migration configuration for simplicity (#1213)	2022-02-23 11:29:45 +01:00
Legal_settings.php	Remove the html_vars call when loading views as it is currently unnecessary.	2022-01-19 10:21:05 +01:00
Localization.php	Move the change language operation into a new public controller (#1210)	2022-02-23 11:09:24 +01:00
Login.php	Remove the html_vars call when loading views as it is currently unnecessary.	2022-01-19 10:21:05 +01:00
Logout.php	Remove the html_vars call when loading views as it is currently unnecessary.	2022-01-19 10:21:05 +01:00
Privacy.php	Add an option to deactivate the remove-all-data function for customers (#808).	2022-01-24 15:31:42 +01:00
Providers.php	Remove the html_vars call when loading views as it is currently unnecessary.	2022-01-19 10:21:05 +01:00
Recovery.php	Remove the html_vars call when loading views as it is currently unnecessary.	2022-01-19 10:21:05 +01:00
Secretaries.php	Remove the html_vars call when loading views as it is currently unnecessary.	2022-01-19 10:21:05 +01:00
Services.php	Service duration values shorter than 5 minutes should be acceptable via the services page (#1110).	2022-01-24 22:09:30 +01:00
Unavailabilities.php	Update the project subtitle.	2022-01-18 13:05:42 +01:00
Update.php	Update the project subtitle.	2022-01-18 13:05:42 +01:00
User.php	Update the project subtitle.	2022-01-18 13:05:42 +01:00