Commit Graph

2946 Commits

Author SHA1 Message Date
Alex Tselegidis 2e97777cad Add fallback value to permissions check. 2022-06-20 12:12:36 +03:00
Alex Tselegidis bf78545752 Apply rate-limiting only to HTTP requests 2022-06-20 12:12:36 +03:00
Alex Tselegidis 6b821792fa Non-API routes will accept string argument values instead of integer 2022-06-20 12:12:36 +03:00
Alex Tselegidis c0e7a082f3 Check both appointments and unavailabilities when generating available hours 2022-06-20 12:12:36 +03:00
Alex Tselegidis 9907b0af12 Update the composer.lock for PHP7 support 2022-06-20 11:59:02 +03:00
Alex Tselegidis c3b643376b Change the display of the appointment timezone information 2022-06-02 15:50:08 +02:00
Alex Tselegidis 2effec6c23 More color style fixes 2022-06-02 15:16:24 +02:00
Alex Tselegidis b15a051ee3 Show an error when using a translation key that does not exist 2022-06-02 09:48:02 +02:00
Alex Tselegidis 264328032b Change cancellation title 2022-06-02 09:44:02 +02:00
Alex Tselegidis 89d22ed7e1 Apply company color to message layout pages too 2022-06-02 09:42:14 +02:00
Alex Tselegidis 7cbce26160 Correct calendar rendering in table view 2022-06-02 09:37:43 +02:00
Alex Tselegidis 9cab342719 Apply missing styles when overriding the default colors with the company colors 2022-06-02 09:19:23 +02:00
Alex Tselegidis ca7727dfaa Correct event name for toggling BS tabs 2022-06-02 09:14:38 +02:00
Alex Tselegidis 8df576fef4 Correct the path to the theme css file in installation and update page 2022-06-01 12:56:41 +02:00
Alex Tselegidis 12df8420cb The theme variable can be changed by the "theme" query parameter for the booking page (#1205) 2022-05-27 10:04:40 +02:00
Alex Tselegidis d82f95f0e3 Update guzzlehttp/guzzle 2022-05-27 09:47:33 +02:00
Alex Tselegidis 8a5e4a67b0 Use no-value placeholders in the appointments modal 2022-05-27 09:29:19 +02:00
Alex Tselegidis d7e5817484 Hide the customer add button if the limit customer access setting is enabled 2022-05-27 09:27:25 +02:00
Alex Tselegidis e390ab6b42 The filter HTML will use no-value placeholders for empty fields 2022-05-27 09:25:21 +02:00
Alex Tselegidis 9108de8865 Apply the permissions library to the customers controller 2022-05-27 09:24:34 +02:00
Alex Tselegidis df0105c65a Create the Permissions library with the "has_customer_access" method 2022-05-27 09:24:01 +02:00
Alex Tselegidis 2e21b05545 Rename the "limit_customer_visibility" setting to "limit_customer_access" 2022-05-27 09:23:38 +02:00
Alex Tselegidis 9b9888df47 Add new limit_customer_visibility setting (#1199) 2022-05-26 15:55:26 +02:00
Alex Tselegidis e09647d01f Fix the booking cancellation flow and make sure analytics are loaded in both confirmation and cancellation (#1200) 2022-05-26 15:35:17 +02:00
Alex Tselegidis 72e84bd4f3 Group commonly used UI components to a single utility module 2022-05-26 15:17:33 +02:00
Alex Tselegidis d30e83fb56 Add missing button icon margin 2022-05-26 14:54:22 +02:00
Alex Tselegidis 10e885225e Do not load the matomo script if the is no URL specified 2022-05-26 14:51:46 +02:00
Alex Tselegidis 906c91331f Rename unavailability dates to unavailable dates 2022-05-26 14:50:12 +02:00
Alex Tselegidis 15cf1cf2bf Correct exclude appointment condition 2022-05-26 14:47:12 +02:00
Alex Tselegidis d6e913edd8 Change the table view slot time format (consistent with default view) 2022-05-26 14:47:12 +02:00
Alex Tselegidis 995b995aba
Merge pull request #1267 from jeroenvds/patch-1
Fix unavailability in calendar while booking
2022-05-26 14:47:06 +02:00
Alex Tselegidis a9a72e503d Use the default service duration if the user just clicks on a calendar slot for creating a new appointment (#1237) 2022-05-26 14:26:36 +02:00
Alex Tselegidis ae71c4c89d Make sure the right provider timezone information is displayed in the appointment and unavailability modals 2022-05-24 10:47:56 +02:00
Alex Tselegidis 46e6661bde Add missing layout slot for styles 2022-05-24 10:47:33 +02:00
jeroenvds 148b5df302
Fix unavailability in calendar while booking
Use moment set date for setting the day of the month. Day is used for day of the week.
2022-05-23 17:56:11 +02:00
Alex Tselegidis c84fb2d3db Change the way theme files are loaded, keep only 10 themes 2022-05-22 17:18:44 +02:00
Alex Tselegidis f13006e763 Add cached and debug plugins 2022-05-22 17:17:21 +02:00
Alex Tselegidis 6666e5862c Support multiple Bootswatch themes for the app (#1205). 2022-05-22 14:39:19 +02:00
Alex Tselegidis 48122c4cd3 Update the session language and remove password from the $account array 2022-05-22 13:50:25 +02:00
Alex Tselegidis c85d47befc Change the default charset and collation 2022-05-20 18:28:13 +02:00
Alex Tselegidis 66106fcd18 Perform setting related migration improvements 2022-05-20 18:27:57 +02:00
Alex Tselegidis 14305d08cc Exclude booking pages from CSRF protection 2022-05-20 18:21:44 +02:00
Alex Tselegidis b253a002a8 Do no to overwrite the password when updating the account info 2022-05-20 18:15:14 +02:00
Alex Tselegidis 905dd59425 Allow the user to select their own preferred language (#1263) 2022-05-20 18:15:14 +02:00
Alex Tselegidis ffb19f113a Do not display the working plan exception option if no direct provider is selected 2022-05-20 18:03:03 +02:00
Alex Tselegidis bea53207d9 Legend display issue in Firefox 2022-05-20 17:54:14 +02:00
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
Alex Tselegidis edfba8bf7d Update package-lock.json 2022-05-10 14:46:14 +02:00
Alex Tselegidis d2e18c8287 Release v1.4.3 2022-05-10 14:46:14 +02:00
Alex Tselegidis ccca6202fc Make sure the window.cookieconsent object is loaded before using it, as some browsers or extensions might block it 2022-05-10 14:46:14 +02:00