Commit graph

75 commits

Author SHA1 Message Date
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
44af526a6f Release v1.4.3 2022-03-08 18:27:15 +01:00
Alex Tselegidis
16613905ba Release v1.4.3-beta.1 2022-02-25 11:19:40 +01:00
Alex Tselegidis
bb71c97736 Security configuration enhancements in the application (#1208) 2022-02-23 14:54:41 +01:00
Alex Tselegidis
cd1842fc40 Switch to go-to-latest database migration configuration for simplicity (#1213) 2022-02-23 11:29:45 +01:00
Alex Tselegidis
c133b24874 Remove unused "render" helper file from the project as it is no longer used (use the components instead). 2022-02-10 20:57:38 +01:00
Alex Tselegidis
4410c5fb8c Release v1.5.0-dev.1 2022-01-25 00:11:51 +01:00
Alex Tselegidis
24f6b5b4e9 Move cache busting parameter out of config.php 2022-01-25 00:11:43 +01:00
Alex Tselegidis
59c44994f7 Add custom Matomo analytics integration (#974). 2022-01-19 10:18:00 +01:00
Alex Tselegidis
8ea5b1c4eb Removed the release label config form the app 2021-12-18 19:20:46 +01:00
Alex Tselegidis
ba38392c46 Corrected validation check in routes.php file 2021-12-15 07:31:05 +01:00
Alex Tselegidis
9c44b8644f Renamed csrfToken var to csrf_token for consistency 2021-12-14 07:29:51 +01:00
Alex Tselegidis
81044eb9c6 Corrected issue with routing and CORS while running from the terminal 2021-11-18 17:17:08 +01:00
Alex Tselegidis
255d1b5d95 Corrected the CORS headers hanlding 2021-11-18 15:01:17 +01:00
alextselegidis
fa52b14bb7 The default route should point to the booking controller 2021-11-18 07:12:30 +01:00
alextselegidis
b7c39e94a2 Renamed the component_helper.php file to html_helper.php 2021-11-15 08:53:24 +01:00
alextselegidis
0b9f7ecea2 Updated the routes.php config file comments and added the missing "translate_uri_dashes" config entry 2021-11-12 16:54:21 +01:00
alextselegidis
cf579dddc2 Removed the error override configuration and files 2021-11-12 16:53:42 +01:00
alextselegidis
2d681a774a Autoload the new component helper 2021-11-11 09:01:57 +01:00
Alex Tselegidis
331aa8c174 Moved the old BASE URL to the app configuration for use in mails etc where a public facing URL is required 2021-11-06 17:11:09 +01:00
Alex Tselegidis
1c88a2f987 The app will now automatically detect the BASE URL based on the current request. 2021-11-06 17:07:03 +01:00
Alex Tselegidis
4a696fc992 Changed the develop state version 2021-11-06 16:54:34 +01:00
Alex Tselegidis
5f211f3cf1 Updated comment 2021-11-06 16:53:57 +01:00
Alex Tselegidis
356629fab6 Minor formatting 2021-11-06 16:52:52 +01:00
Alex Tselegidis
3e1381c302 Moved the app related config in a new app.php config file 2021-11-06 16:52:46 +01:00
Alex Tselegidis
0a88442aa2 Corrected the settings routing config 2021-11-06 15:04:26 +01:00
Alex Tselegidis
4020e40a25 Corrected settings and availabilities routes 2021-11-06 11:15:15 +01:00
Alex Tselegidis
169b9818a6 Use the new routes helper in the routes.php config file 2021-11-06 10:23:25 +01:00
Alex Tselegidis
308e41bbe1 Autoload the new routes_helper.php file 2021-11-06 10:22:09 +01:00
Alex Tselegidis
76afdef30b Moved the instance handling logic to a re-usable library 2021-10-29 10:44:01 +02:00
Alex Tselegidis
af58f924b1 Autoload the string helper as well 2021-10-28 13:26:48 +02:00
Alex Tselegidis
2e9bf9d29d Automatically load all the core helper files 2021-10-27 12:03:51 +02:00
Alex Tselegidis
a241e8b2a4 Removed teh custom_exceptions_helper.php file 2021-10-27 12:02:24 +02:00
Thomas Saedt
9671def4ea Merge branch 'develop' into 1081_hide_data_fields 2021-10-20 22:12:47 +02:00
Alex Tselegidis
7393c36462 Release v1.4.2 2021-07-27 11:31:43 +03:00
Alex Tselegidis
215c4f501e Release v1.4.2-beta.1 2021-07-19 18:25:36 +03:00
Alex Tselegidis
3c4e7923ce Removed duplicate row from the configuration file. 2021-07-19 13:42:29 +03:00
Alex Tselegidis
dfdbea6214 HTTP_ACCEPT_LANGUAGE is not set when executing the app from the console. 2021-06-14 10:21:43 +02:00
Thomas S
094b780fd8 [1081] Add new settings in db 2021-05-28 13:37:58 +02:00
Alex Tselegidis
65bc7a2092 Merge branch 'develop' of https://github.com/mhsenpc/easyappointments into develop
# Conflicts:
#	application/config/config.php
2021-04-07 10:35:00 +02:00
Alex Tselegidis
60254558a3 Merge branch 'master' of https://github.com/cbka/easyappointments into develop 2021-04-07 10:11:30 +02:00
cbka
015a01b58a
Update email.php 2021-03-27 19:56:40 +01:00
cbka
bf57e028e6
Update email.php 2021-03-27 19:40:36 +01:00
Alex Tselegidis
b6a17d4e11 Missing language mappings would cause issues with the auto-detection of the user's language. 2021-03-22 19:18:38 +01:00
Mohsen Shamohamadi
d6f96a6c17 Add support for Persian language 2021-02-07 17:33:58 +03:30
Alex Tselegidis
5d73fafc31 Release v1.4.1 2020-12-17 16:54:58 +02:00
Alex Tselegidis
29a0fadf32 Release v1.4.0 2020-12-09 16:16:03 +02:00
Alex Tselegidis
8a68e97f94 Reformatted code files 2020-12-09 14:17:45 +02:00
Alex Tselegidis
6fe10a919b Updated the cache bust token 2020-12-08 15:25:14 +02:00
Alex Tselegidis
6e2b649955 Changed the default encryption key value 2020-12-08 15:25:02 +02:00