easyappointments/application/core
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
..
EA_Benchmark.php
EA_Cache.php
EA_Calendar.php
EA_Config.php
EA_Controller.php Merge branch 'master' into develop 2022-03-25 10:53:46 +01:00
EA_DB_forge.php
EA_DB_query_builder.php
EA_DB_utility.php
EA_Email.php
EA_Encrypt.php
EA_Encryption.php
EA_Exceptions.php
EA_Hooks.php
EA_Input.php
EA_Lang.php Update the project subtitle. 2022-01-18 13:05:42 +01:00
EA_Loader.php Update the project subtitle. 2022-01-18 13:05:42 +01:00
EA_Log.php Update the project subtitle. 2022-01-18 13:05:42 +01:00
EA_Migration.php
EA_Model.php
EA_Output.php
EA_Profiler.php
EA_Router.php
EA_Security.php
EA_Session.php Update the project subtitle. 2022-01-18 13:05:42 +01:00
EA_Upload.php
EA_URI.php Update the project subtitle. 2022-01-18 13:05:42 +01:00