Commit Graph

1673 Commits

Author SHA1 Message Date
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
Janina Phillips 1e855182bd hidden is now d-none 2020-06-18 14:37:11 -04:00
Janina Phillips a341334734 fix the language list 2020-06-18 14:32:37 -04:00
Janina Phillips 1bd2647b77 fix some icons and styles 2020-06-18 14:23:16 -04:00
Alex Tselegidis 6382bc422a Fixed typo 2020-06-18 19:30:47 +02:00
Alex Tselegidis 6585c38eb9 Toggle the visibility of the alert element by toggling the "hidden" class (#705) 2020-06-18 14:02:02 +02:00
Sébastien 0b3d97ff1f Fix loading item always displayed on the installationn page. 2020-06-17 16:42:29 +02:00
Sébastien 234b5bf5a6 Fix package.json and package-lock.json 2020-06-17 15:53:04 +02:00
Sébastien 095edf7f67 Fix bootstrap library path. 2020-06-16 23:59:56 +02:00
Sébastien 1e6a13d146 Save customer language. 2020-06-16 17:01:27 +02:00
Sébastien 24a1eeee2f Fix a js typo. 2020-06-16 15:10:56 +02:00
Alex Tselegidis e857d3a37e Corrected issue with attendants number query 2020-06-14 10:56:35 +02:00
Janina Phillips 2dc94f30c7
Merge branch 'develop' into bootstrap-4-and-fontawesome 2020-06-09 10:36:54 -04:00
Sébastien 18d0541114 Improve the "help block" for the book advance timeout field in french. 2020-06-05 20:36:40 +02:00
Sébastien 5a03ecd736 Improve some french translations about book advance timeout. 2020-06-05 20:34:20 +02:00
Sébastien 950738f2fe Redirect clients which are tying to update an appointment during the book advance timeout to a warning page. 2020-06-05 18:24:05 +02:00
Sébastien 8704413c0f Do not add bookAdvanceTimeout delay to new appointment modal on the backend. 2020-06-05 17:29:35 +02:00
Alex Tselegidis 1821e50116 Added catalan translations to the app (thanks to Marc Folch) 2020-06-04 12:57:14 +02:00
Alex Tselegidis 60d5cf81a2 Updated the node engine requirement to 12 (latest LTS release) 2020-06-04 12:55:13 +02:00
Johan Idstam 8236b39e84 Swedish for translations_lang.php 2020-05-18 21:44:03 +02:00
Johan Idstam 9996b38e1e Swedish for migration_lang.php 2020-05-18 20:10:40 +02:00
Johan Idstam 2b561122a7 Add Swedish to config 2020-05-18 20:07:45 +02:00
Johan Idstam c82df14ba0 Swedish for email_lang.php 2020-05-18 20:07:08 +02:00
Johan Idstam d5605a00f1 Swedish for db_lang.php 2020-05-18 19:58:17 +02:00
Sébastien 3c85c420c5 Fix sercice details display on booking page. 2020-05-15 15:06:08 +02:00
Sébastien 14540bfb44 Merge branch 'develop' into fix-service-details-display-in-booking-page
# Conflicts:
#	assets/js/frontend_book.js
2020-05-15 14:58:30 +02:00
Alex Tselegidis d2745feb4d Added missing index.html files in the application/views directory. 2020-05-12 21:01:06 +02:00
Alex Tselegidis 46d1f745ee Added boilerplate code for the new notifications library. 2020-05-12 20:59:29 +02:00
Alex Tselegidis 03b4adc6ad Removed the use of jQuery methods for array and data processing wherever possible, along with other improvements in the javascript code. 2020-05-12 20:59:29 +02:00
Alex Tselegidis 25e8bbed31 Styling for popover links. 2020-05-12 20:59:29 +02:00
Alex Tselegidis de4054dd56 Removed unnecessary scripts from backend templates. 2020-05-12 20:59:29 +02:00