Commit graph

36 commits

Author SHA1 Message Date
9c58c12c79
Merge branch 'local-original-dev' into develop 2023-12-23 00:15:29 +03:00
abfac25d81
merge changes from master branch 2023-12-22 23:44:48 +03:00
Alex Tselegidis
2878d1299a Reformat entire codebase for trailing comma that will make line duplication easier 2023-12-22 11:35:41 +01:00
Alex Tselegidis
c8a9e2c24b Enable prettier for php and reformat the entire application directory 2023-11-29 10:24:09 +01:00
Alex Tselegidis
fbcd35f197 Add blocked period CRUD operations to the app (#432) 2023-11-03 18:25:23 +01:00
Alex Tselegidis
e9842a40bc Revert renaming the service-categories to categories (for clarity) 2023-10-26 08:11:31 +02:00
Alex Tselegidis
0bb02ae2bf Set the right locale to the fullcalendar instances 2023-07-17 07:50:55 +02:00
Alex Tselegidis
a9798bf27e Set the correct HTML language code 2023-07-03 10:27:23 +02:00
Alex Tselegidis
e1a8de1652 Do not allow a user to access the app if their account was removed. 2023-03-13 07:42:06 +01:00
Alex Tselegidis
abcc46db94 Add PHP8.2 support to the application 2023-01-26 09:17:45 +01:00
Alex Tselegidis
0d5e60cdb7 Add support for dynamic webhook definition in the settings page (#581) 2022-06-20 12:12:36 +03:00
Alex Tselegidis
df0105c65a Create the Permissions library with the "has_customer_access" method 2022-05-27 09:24:01 +02:00
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
Alex Tselegidis
bb71c97736 Security configuration enhancements in the application (#1208) 2022-02-23 14:54:41 +01:00
Alex Tselegidis
54e4c208a3 Update the project subtitle. 2022-01-18 13:05:42 +01:00
Alex Tselegidis
ca4e58313a Pull the available languages from the App.Vars.* object. 2022-01-18 07:20:04 +01:00
Alex Tselegidis
a090b2eba9 Updated the file banner info 2021-12-18 17:44:07 +01:00
Alex Tselegidis
a40bd3f6c6 Updated EA_Controller to use the script_vars helper function 2021-12-17 10:53:08 +01:00
Alex Tselegidis
e071ec46dc Common CSRF token generation correctly 2021-12-16 08:45:55 +01:00
Alex Tselegidis
568ff9be2e Renamed the service category resource to just category 2021-12-15 08:00:48 +01:00
Alex Tselegidis
58e38fd488 Load common JS config for all requests 2021-12-14 07:59:11 +01:00
Alex Tselegidis
130adf88c3 Created new email messages library (ported the deprecated engine email class) 2021-11-06 16:11:44 +01:00
Alex Tselegidis
00f54dcfec Added the new Unavailabilities_model @property to EA_Controller.php 2021-11-06 14:56:12 +01:00
Alex Tselegidis
4c6c5b5913 Remove the old and deprecated API_V1_Controller.php 2021-11-02 10:45:05 +01:00
Alex Tselegidis
3233c19571 Added overrides for all the framework classes as templates and for consistency 2021-10-29 13:04:26 +02:00
Alex Tselegidis
12ec5c1ac3 The request helper can now also fetch JSON-payload attributes 2021-10-29 12:54:49 +02:00
Alex Tselegidis
76afdef30b Moved the instance handling logic to a re-usable library 2021-10-29 10:44:01 +02:00
Alex Tselegidis
9a528e6734 Updated the class comments 2021-10-29 10:18:44 +02:00
Alex Tselegidis
b2d2a5a1ce Updated the new accounts library. 2021-10-28 13:29:15 +02:00
Alex Tselegidis
e0ad767ec7 Updated @property tags in EA_Controller.php 2021-10-27 10:06:58 +02:00
Alex Tselegidis
fa6e48b344 Corrected property tag order 2021-10-24 14:13:20 +02:00
Alex Tselegidis
bee96c172a Corrected typo in class comment 2021-10-23 19:32:55 +02:00
Alex Tselegidis
0aa41d0927 Corrected config set for language in parent controller 2020-12-08 13:22:46 +02:00
Alex Tselegidis
8c8160897a Added more CI classes in the core props block 2020-12-04 12:58:31 +02:00
Alex Tselegidis
e7b4aeedab Automatically load the translations 2020-12-02 20:04:06 +02:00
Alex Tselegidis
75a5addbc2 Grouped the property tag into parent core classes so that it does not need to be repeated. 2020-11-16 10:29:36 +02:00