Commit graph

2824 commits

Author SHA1 Message Date
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
Alex Tselegidis
980fc3b6f7 Reduce the default rate limit duration to 2 minutes 2022-05-10 14:46:14 +02:00
Alex Tselegidis
cb19a192a9 Do not display empty messages 2022-05-10 14:46:14 +02:00
Alex Tselegidis
300ff3c2a7 Only show the any-provider option if there are more than one providers 2022-05-10 14:46:14 +02:00
Alex Tselegidis
611c0ea07d Prepend the any-provider option in the booking page 2022-05-10 14:46:14 +02:00
Alex Tselegidis
b500b9fe1b Corrected working plan exception removal issue on table view 2022-05-10 14:46:14 +02:00
Alex Tselegidis
848e41c5fc Reset add-break button disabled state 2022-05-10 14:46:14 +02:00
Alex Tselegidis
24f6f99cf2 Update CHANGELOG.md 2022-05-10 14:46:14 +02:00
Alex Tselegidis
93c9c1dae4 Correct css file name 2022-05-10 14:46:14 +02:00
Alex Tselegidis
9efb46ba4b Add missing customer data from stripped array 2022-05-10 14:46:14 +02:00
Alex Tselegidis
64cc3dfc21 Update patch.php 2022-05-10 14:46:14 +02:00
Alex Tselegidis
bd9e9ff2e5 Add the patch.php file to the repository. 2022-05-10 14:46:14 +02:00
Alex Tselegidis
3c36724aae Release v1.4.3-beta.1 2022-05-10 14:46:14 +02:00
Alex Tselegidis
49e2808b98 Fix timezone issue with add-to-google link of the booking page (#1216) 2022-05-10 14:46:14 +02:00
Alex Tselegidis
18f15ea7d1 Update docs 2022-05-10 14:46:14 +02:00
Alex Tselegidis
0eff82c2b9 Update CHANGELOG.md 2022-05-10 14:46:14 +02:00
Alex Tselegidis
a759cb89f7 Replace Google Client JS with the Google Calendar Template link in the book success page (#1216) 2022-05-10 14:46:14 +02:00
Alex Tselegidis
df0b461fef Gulp build will also copy the system folder (#1207) 2022-05-10 14:46:14 +02:00
Alex Tselegidis
384d442409 Security configuration enhancements in the application (#1208) 2022-05-10 14:46:14 +02:00
Alex Tselegidis
886343f80c PHP 8.1 support (#1209) 2022-05-10 14:46:14 +02:00
Alex Tselegidis
2228ae3d04 Minor style fix in backend.css 2022-05-10 14:46:14 +02:00
Alex Tselegidis
6c42576f68 PHP 8.1 support (#1209) 2022-05-10 14:46:14 +02:00
Alex Tselegidis
617222ae2a Provider and secretary users can only add unavailabilities for their authorized users (#1214) 2022-05-10 14:46:14 +02:00