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
|
13e81c80b1
|
Make sure the window.cookieconsent object is loaded before using it, as some browsers or extensions might block it
|
2022-03-08 17:31:33 +01:00 |
|
Alex Tselegidis
|
53993b2994
|
Do not display empty messages
|
2022-03-08 17:21:11 +01:00 |
|
Alex Tselegidis
|
09444c1b5e
|
Only show the any-provider option if there are more than one providers
|
2022-03-08 17:01:25 +01:00 |
|
Alex Tselegidis
|
95fbbeec27
|
Prepend the any-provider option in the booking page
|
2022-03-08 17:00:33 +01:00 |
|
Alex Tselegidis
|
1bc02e11c0
|
Corrected working plan exception removal issue on table view
|
2022-03-08 16:45:01 +01:00 |
|
Alex Tselegidis
|
803f4e4e7e
|
Reset add-break button disabled state
|
2022-03-08 16:32:45 +01:00 |
|
Alex Tselegidis
|
89acfafcce
|
Improve popover handling while reloading appointments
|
2022-03-02 13:28:20 +01:00 |
|
Alex Tselegidis
|
f7ffb25f05
|
Replace Google Client JS with the Google Calendar Template link in the book success page (#1216)
|
2022-02-24 15:38:51 +01:00 |
|
Alex Tselegidis
|
cc5d219311
|
Provider and secretary users can only add unavailabilities for their authorized users (#1214)
|
2022-02-23 12:00:39 +01:00 |
|
Alex Tselegidis
|
1cf4f5246f
|
Move the change language operation into a new public controller (#1210)
|
2022-02-23 11:09:24 +01:00 |
|
Alex Tselegidis
|
ab7ba646a8
|
Add global JS error handling for HTTP requests.
|
2022-02-10 20:54:05 +01:00 |
|
Alex Tselegidis
|
0a4ea1c336
|
Only pre-select the service if its found
|
2022-02-10 20:34:59 +01:00 |
|
Alex Tselegidis
|
05e6704e67
|
Secondary info wrapped in small tag and using text-muted class.
|
2022-01-26 21:27:57 +01:00 |
|
Alex Tselegidis
|
72baa18b86
|
Prefill the form field though url parameters (#1021).
|
2022-01-24 23:57:59 +01:00 |
|
Alex Tselegidis
|
9097a968ca
|
Skip the first booking step when only one service and one provider are available (#349).
|
2022-01-24 23:53:06 +01:00 |
|
Alex Tselegidis
|
4c0793129d
|
The calendar will ask for the kind of event to be added after selecting time slots with the mouse.
|
2022-01-24 22:55:35 +01:00 |
|
Alex Tselegidis
|
b968970fa6
|
Correct slot label format for default view.
|
2022-01-24 22:43:18 +01:00 |
|
Alex Tselegidis
|
b6e9a7209f
|
Select appointment time from within the calendar when "all" select filter item is selected.
|
2022-01-24 22:40:35 +01:00 |
|
Alex Tselegidis
|
5df3e63055
|
Correct deserialize general settings method.
|
2022-01-24 22:38:45 +01:00 |
|
Alex Tselegidis
|
03010184f6
|
Improve the display of the booking link for services, providers and service-provider combinations.
|
2022-01-24 22:37:05 +01:00 |
|
Alex Tselegidis
|
42534ffcb3
|
Service duration values shorter than 5 minutes should be acceptable via the services page (#1110).
|
2022-01-24 22:09:30 +01:00 |
|
Alex Tselegidis
|
4f5fbb8262
|
Display appointments from all providers in one view.
|
2022-01-24 22:07:24 +01:00 |
|
Alex Tselegidis
|
0bbbff47c8
|
Correct reload call (not in select filter item callback).
|
2022-01-24 22:00:47 +01:00 |
|
Alex Tselegidis
|
97f98c5118
|
All the user roles with access to the backend calendar page can filter by service (#956).
|
2022-01-24 21:57:17 +01:00 |
|
Alex Tselegidis
|
9271c21fba
|
Optimize column display in the booking page.
|
2022-01-24 21:15:33 +01:00 |
|
Alex Tselegidis
|
8a02d5bf0a
|
Remove the dashes from the any-provider option.
|
2022-01-24 21:06:06 +01:00 |
|
Alex Tselegidis
|
ab4e404fac
|
The display-selected-service and display-selected-provider elements will be invisible by default.
|
2022-01-24 21:05:43 +01:00 |
|
Alex Tselegidis
|
442c644c01
|
Move the terms and privacy checkbox to the last step.
|
2022-01-24 21:04:03 +01:00 |
|
Alex Tselegidis
|
d580463977
|
Add reset company color button so that the color can be easily switched back to the original state.
|
2022-01-24 20:58:15 +01:00 |
|
Alex Tselegidis
|
2f41c28786
|
Add a new "is_private" flag to services and providers so that they do not appear in the booking page (#378).
|
2022-01-24 20:50:14 +01:00 |
|
Alex Tselegidis
|
86d3ce8dc9
|
Change the phone number validation regex.
|
2022-01-24 20:44:59 +01:00 |
|
Alex Tselegidis
|
e9a9314909
|
Enable the change of the brand logo and colors from the backend (#789).
|
2022-01-24 18:36:12 +01:00 |
|
Alex Tselegidis
|
598fda9dfc
|
Add file utility module.
|
2022-01-24 17:07:46 +01:00 |
|
Alex Tselegidis
|
617ee37ec7
|
Comment fix
|
2022-01-24 17:05:38 +01:00 |
|
Alex Tselegidis
|
083a3e07f6
|
Add the ability to temporarily block new appointments / set away message (#940).
|
2022-01-24 16:38:03 +01:00 |
|
Alex Tselegidis
|
e659bd6e08
|
Add soft phone number validation (#820).
|
2022-01-24 15:48:20 +01:00 |
|
Alex Tselegidis
|
5982a79852
|
Skip the first booking step if both service and provider were preselected (#1117).
|
2022-01-24 15:22:34 +01:00 |
|
Alex Tselegidis
|
93aab06187
|
Correct argument value.
|
2022-01-24 15:08:30 +01:00 |
|
Alex Tselegidis
|
652f96f53b
|
Use translation key instead of hard coded title.
|
2022-01-24 14:23:29 +01:00 |
|
Alex Tselegidis
|
aa71d8afad
|
Change the call-to-action message button to "delete" instead of "ok".
|
2022-01-24 14:11:15 +01:00 |
|
Alex Tselegidis
|
be985b3912
|
Message box button styling.
|
2022-01-24 14:10:49 +01:00 |
|
Alex Tselegidis
|
fbb9baec50
|
Change display of read only field (remove border).
|
2022-01-19 09:39:13 +01:00 |
|
Alex Tselegidis
|
3594bb8294
|
Use the appointment color value when rendering the appointments on the calendar.
|
2022-01-18 19:03:06 +01:00 |
|
Alex Tselegidis
|
0f0b3c114e
|
Apply the new color selection component to the appointments modal.
|
2022-01-18 19:01:26 +01:00 |
|
Alex Tselegidis
|
73a6c791ec
|
Apply the new color selection component to services.
|
2022-01-18 18:54:44 +01:00 |
|
Alex Tselegidis
|
a72dd9edb5
|
Create new color selection component.
|
2022-01-18 18:54:36 +01:00 |
|
Alex Tselegidis
|
76f5324901
|
Correct delta prop name and rename calendar-event related callback methods.
|
2022-01-18 17:40:43 +01:00 |
|
Alex Tselegidis
|
e636ec2986
|
Update the table view so that it works with FullCalendar 5
|
2022-01-18 17:38:57 +01:00 |
|
Alex Tselegidis
|
ba175fab7f
|
Trigger the "click" event on the reload appointments button.
|
2022-01-18 17:38:25 +01:00 |
|