easyappointments/application
Alex Tselegidis 6dce7b2f33 Merge branch 'mickemartinsson-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/controllers/Localization.php
#	application/core/EA_Controller.php
#	application/core/EA_Model.php
#	application/helpers/rate_limit_helper.php
#	application/language/swedish/translations_lang.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/frontend_book_success.js
#	assets/js/general_functions.js
#	assets/js/working_plan_exceptions_modal.js
#	composer.lock
#	gulpfile.js
#	index.php
#	package-lock.json
#	system/libraries/Email.php
2022-05-10 14:48:46 +02:00
..
config Replace double quote with single quote 2022-05-10 14:28:55 +02:00
controllers Correct permissions for the customers controller 2022-05-10 14:28:56 +02:00
core Better content type header parsing 2022-04-25 10:12:01 +02:00
helpers Add max password length constant 2022-05-09 23:26:46 +02:00
language Merge branch 'mickemartinsson-master' into develop 2022-05-10 14:48:46 +02:00
libraries Check the role slug in Api.php 2022-05-09 23:26:28 +02:00
migrations Perform various DB migration fixes and improvements 2022-03-29 10:35:50 +02:00
models Soft-Delete customer appointments when deleting a customer. 2022-05-10 14:40:19 +02:00
views Use grouped_timezones consistently across the app controllers 2022-03-29 10:16:07 +02:00
.htaccess Moved source files to the root directory. 2020-03-11 10:24:25 +01:00
index.html Moved source files to the root directory. 2020-03-11 10:24:25 +01:00