Commit graph

3253 commits

Author SHA1 Message Date
Alex Tselegidis
f69db8fd93
Merge pull request #755 from popod/fix-typo
Fix some minor errors
2020-08-15 16:56:32 +03:00
Alex Tselegidis
ac44edf43f
Merge pull request #756 from popod/remove-modal-timeout
Remove timeout before closing the extra periods modal on success.
2020-08-15 16:50:04 +03:00
Alex Tselegidis
143624b7d8 Close popover when inserting new appointment (#773). 2020-08-15 16:33:26 +03:00
Alex Tselegidis
ad509e8f22 Corrected the jsdoc 2020-08-15 16:27:20 +03:00
Alex Tselegidis
fc392e3ccf
Merge pull request #777 from popod/fix-dropdown-disable
Fix disabled bug with insert dropdown in backend.
2020-08-15 16:08:45 +03:00
Alex Tselegidis
6348b1af56
Merge pull request #778 from popod/fix-service-details-display-in-booking-page
Fix display of service details when the service change in the booking process
2020-08-15 16:07:02 +03:00
Alex Tselegidis
6287c94232 Upgraded PHPMailer to ^6.1 2020-08-15 15:58:45 +03:00
Alex Tselegidis
65d3243986 Add the appointment has in the stored "dest_url" value when trying to access the calendar page without being logged in first (#804). 2020-08-15 15:58:17 +03:00
Alex Tselegidis
f122d1ea20 Display error message (if any) when saving appointments or unavailable time periods. 2020-08-15 15:58:17 +03:00
Alex Tselegidis
dbc45f6b27 Do not allow appointments being created with duration less than the predefined minimum (#805). 2020-08-15 15:58:17 +03:00
Alex Tselegidis
8f1e82019f The generic error handler callback can now display non-JSON responses (#836). 2020-08-15 15:58:17 +03:00
Alex Tselegidis
4f1c39b564 Consider the book advance timeout when generating unavailable dates (#855). 2020-08-15 15:58:17 +03:00
Alex Tselegidis
88ce8d506a Hide the service price and provider address if they are empty (#863) 2020-08-15 15:58:17 +03:00
Alex Tselegidis
177375e814
Merge pull request #784 from idstam/swedish-translation
Swedish translations
2020-08-15 15:58:06 +03:00
Alex Tselegidis
e055223f8f
Merge pull request #824 from popod/customers-appointment-details-fix
Fix appointment details display in customers page
2020-08-15 15:30:40 +03:00
Alex Tselegidis
e4d16a66dc
Merge pull request #825 from popod/customers-disable-select-fix
Fix select which aren't disabled in customers backend page
2020-08-15 15:29:22 +03:00
Alex Tselegidis
afac484f51
Merge pull request #841 from popod/fix-safari-dates
Fix datepicker initialization dates with safari and IE.
2020-08-15 15:08:52 +03:00
Alex Tselegidis
1bb31dbc81
Merge pull request #846 from popod/fix-reset-of-has-error-class-in-resetform-fct
Fix: reset has-error class on resetForm() function.
2020-08-15 14:47:15 +03:00
Alex Tselegidis
c651e294ce
Merge pull request #848 from iekor/develop
Remove timezone_model fix email notifications
2020-08-15 14:46:28 +03:00
Alex Tselegidis
15ae98b506
Merge pull request #853 from popod/fix-settings-current-user-validation
Fix current user validation
2020-08-15 14:45:08 +03:00
Alex Tselegidis
59a9d42fc2 Merge branch 'rulosant-spanish-translation-mejora' into develop 2020-08-15 14:22:53 +03:00
Alex Tselegidis
39a12a593f Merge branch 'spanish-translation-mejora' of https://github.com/rulosant/easyappointments into rulosant-spanish-translation-mejora 2020-08-15 14:22:30 +03:00
Alex Tselegidis
597feec400 Replaced the logo image file 2020-08-15 14:22:03 +03:00
San
8ba58f0757 replaced wrong help text 2020-08-11 12:27:25 -03:00
Sébastien
23b55c75ec Fix the undo translation. 2020-07-23 14:29:39 +02:00
Sébastien
7d1d1f986c Fix current user validation in settings page. 2020-07-20 20:48:17 +02:00
Janina Phillips
33e11291bc
Merge branch 'develop' into bootstrap-4-and-fontawesome 2020-07-19 18:56:51 -04:00
iekor
f2c38bd38d
Remove timezone_model fix email notifications 2020-07-17 00:10:29 -07:00
Sébastien
e5fc1d427f Fix: reset has-error class on resetForm() function. 2020-07-13 18:13:52 +02:00
Sébastien
0eb5c939d9 Fix datepicker initialization dates with safari and IE. 2020-07-06 18:10:04 +02:00
Janina Phillips
b6391ab668 fix calendar height to just adjust depending on the content and other fixes 2020-07-01 09:02:11 -04:00
Sébastien
dc704aa1d4 Restore some code after merge. 2020-07-01 11:18:50 +02:00
Sébastien
516830b5fe Remove unneeded code. 2020-07-01 11:15:40 +02:00
Sébastien
d169628dc0 Merge branch 'develop' into fix-typo
# Conflicts:
#	assets/js/backend_calendar_unavailabilities_modal.js
2020-07-01 11:12:53 +02:00
Alex Tselegidis
16c18f9b99 Display event notes in the popup widget (#745). 2020-07-01 10:16:09 +02:00
Alex Tselegidis
d8a7318c95 Added missing response variable 2020-07-01 10:16:09 +02:00
Alex Tselegidis
6290b85b82 Replaced the AJAX failure callback function 2020-07-01 10:16:09 +02:00
Alex Tselegidis
531732c9a1
Merge pull request #774 from popod/fix-modal-date-pickers
Fix display of date-pickers used on appointments create/update modals
2020-07-01 09:16:55 +02:00
Sébastien
a4056eb50b Fix some modal title and "close" button display 2020-06-29 15:31:59 +02:00
Sébastien
e87ef4a4c1 Remove old "glyphicon" icons. 2020-06-29 15:23:51 +02:00
Sébastien
58ad2e43a1 Fix "for" property for "accept to provacy policy" checkbox label in appointment process. 2020-06-29 15:04:41 +02:00
Janina Phillips
8f3f4a3d28 fix calendar pop up actions 2020-06-22 09:55:46 -04:00
Sébastien
4f1cf415af Fix select not disabled in customers backend page. 2020-06-19 18:58:43 +02:00
Janina Phillips
63072ead77 fix some bugs 2020-06-19 11:17:31 -04:00
Sébastien
1e1764436b Fix appointment details display. 2020-06-19 13:56:02 +02:00
Sébastien
101316a72f Fix: replace invisible class by d-none. 2020-06-19 13:13:08 +02:00
Sébastien
655cafbfc5 Unify btn styling on users page 2020-06-19 13:11:25 +02:00
Sébastien
81934f2d90 Fix: replace all btn-default class by btn-light. 2020-06-19 13:09:22 +02:00
Sébastien
1fa749d16b Fix: replace all label class by badge. 2020-06-19 12:48:18 +02:00
Janina Phillips
32b5742bd0 fix calendar popover buttons 2020-06-18 14:46:13 -04:00