easyappointments/application/controllers
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
About.php
Account.php
Admins.php
Appointments.php
Backend.php Provider and secretary users can only add unavailabilities for their authorized users (#1214) 2022-02-23 12:00:39 +01:00
Backend_api.php
Booking.php
Booking_cancellation.php
Booking_confirmation.php
Booking_settings.php
Business_settings.php
Calendar.php
Captcha.php Merge branch 'master' into develop 2022-03-25 10:53:46 +01:00
Categories.php
Consents.php
Console.php
Customers.php
General_settings.php
Google.php Merge branch 'master' into develop 2022-03-25 10:53:46 +01:00
Installation.php
Legal_settings.php
Localization.php
Login.php
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
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
Secretaries.php
Services.php
Unavailabilities.php
Update.php
User.php
index.html