easyappointments/application/config
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
..
app.php Release v1.5.0-dev.1 2022-01-25 00:11:51 +01:00
autoload.php Security configuration enhancements in the application (#1208) 2022-02-23 14:54:41 +01:00
config.php Merge branch 'master' into develop 2022-03-25 10:53:46 +01:00
constants.php Reformatted code files 2020-12-09 14:17:45 +02:00
database.php Reformatted code files 2020-12-09 14:17:45 +02:00
doctypes.php Reformatted code files 2020-12-09 14:17:45 +02:00
email.php Removed duplicate row from the configuration file. 2021-07-19 13:42:29 +03:00
foreign_chars.php Reformatted code files 2020-12-09 14:17:45 +02:00
google.php Minor formatting 2021-11-06 16:52:52 +01:00
hooks.php Reformatted code files 2020-12-09 14:17:45 +02:00
index.html Moved source files to the root directory. 2020-03-11 10:24:25 +01:00
migration.php Switch to go-to-latest database migration configuration for simplicity (#1213) 2022-02-23 11:29:45 +01:00
mimes.php Reformatted code files 2020-12-09 14:17:45 +02:00
profiler.php Reformatted code files 2020-12-09 14:17:45 +02:00
routes.php Corrected validation check in routes.php file 2021-12-15 07:31:05 +01:00
smileys.php Reformatted code files 2020-12-09 14:17:45 +02:00
user_agents.php Reformatted code files 2020-12-09 14:17:45 +02:00