maket
/
MaketRandevu
1
1
Fork 0
Code Issues 15 Pull Requests Packages Projects Releases 4 Wiki Activity
1,592 Commits 2 Branches 42 Tags 40 MiB
Commit Graph

1592 Commits

Author SHA1 Message Date
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 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
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
Alex Tselegidis df44f72964 The timezones model got converted into a library (as there is no direct database table to manage). 2020-05-12 20:59:29 +02:00
Alex Tselegidis 8795deef6b Engine classes are marked as deprecated and will be removed in the next release (v1.5). 2020-05-12 20:59:29 +02:00
Alex Tselegidis 2df9ae5010 Removed "engine/core" files (will not be used eventually). 2020-05-12 20:59:29 +02:00
Alex Tselegidis e59bcf5ef8 Updated frontend dependencies. 2020-05-12 20:59:29 +02:00
Alex Tselegidis c48a74e037 Imported the Google API Client with composer (old files are no longer needed). 2020-05-12 20:59:28 +02:00
Alex Tselegidis 7af93aba76 Use the array find method directly. 2020-05-12 20:59:28 +02:00
Alex Tselegidis 70948615df Added polyfill script for backwards compatibility. 2020-05-12 20:59:28 +02:00
Alex Tselegidis b2464deb78 Explicitly define the view in the view toggler href attribute. 2020-05-12 20:59:28 +02:00
Alex Tselegidis 74c10d3b7b Converted hard coded HTML to jQuery generated markup. 2020-05-12 20:59:28 +02:00
Alex Tselegidis f8164a8287
Merge pull request #780 from popod/readme-improvement 
Add composer requirement to README
 2020-05-12 20:04:26 +02:00
Sébastien 068bdea7f9 Add Composer to required tools list. 2020-05-11 14:16:15 +02:00
Sébastien d8a03a50ab Fix display of service details when the service change on the booking process page. 2020-05-10 00:01:17 +02:00
Sébastien 779b291281 Fix disabled bug with insert dropdown in backend. 2020-05-09 23:29:16 +02:00
Sébastien 5e5dc79908 Fix display of date-pickers used on appointments create/update modals 2020-05-09 20:21:47 +02:00
Sébastien 356b4242a7 Fix close button not displayed on login error modal when username and password are empty. 2020-05-09 18:17:25 +02:00
Sébastien c997a48c62 Remove an unexpected character from the settings backend page. 2020-05-09 17:58:54 +02:00
Mastej, Matt f2b97402fd bootstrap 4 and font awesome 2020-05-07 10:34:23 -04:00
Alex Tselegidis 80b53b2dd0 removed leading underscore from javascript function names. 2020-05-06 19:23:49 +02:00
Alex Tselegidis c670c023a7 Performed major javascript refactoring for more consistncy and efficiency in the code base (work in progress) 2020-05-06 19:15:11 +02:00
Alex Tselegidis 466a3a3c20 Removed typo 2020-05-06 19:14:29 +02:00
Sébastien 9905c942ac Remove timeout before closing the extra periods modal on success. 2020-05-04 21:19:02 +02:00
Sébastien 6f1604d452 Fix typo. 2020-05-04 21:13:13 +02:00
Alex Tselegidis 07276d46a6 Code changes on automatically end_datetime assignment via the REST API 2020-05-04 20:59:37 +02:00
Alex Tselegidis 5269f73bab
Merge pull request #751 from popod/api-appointments-populate-end-datetime 
Automatically populate the appointment end datetime based on service duration in API
 2020-05-04 20:57:15 +02:00
Alex Tselegidis a8394f3adf
Merge pull request #752 from popod/backend-appointments-modal-improvements 
Remove delay before closing the appointments modal.
 2020-05-04 20:53:37 +02:00
Alex Tselegidis d6f176f320
Merge pull request #750 from popod/fix-notifications-auto-dismiss 
Notifications are no longer automatically hidden
 2020-05-04 20:51:19 +02:00
Alex Tselegidis 9b924cd3c1 Corrected the selector for notification actions (#753). 2020-05-04 20:45:59 +02:00
Alex Tselegidis 08144ceae8 Updated the event resizing and dropping of the table view. 2020-05-04 20:41:46 +02:00
Alex Tselegidis b56073c071 Group insert buttons in the backend calendar to a button dropdown so that more space is available in the toolbar. 2020-05-04 13:56:23 +02:00
Alex Tselegidis 10ed734139 Removed text from calendar reload button (icon is clear enough). 2020-05-04 13:39:12 +02:00
Alex Tselegidis 4635af5094 Added quick toggle view button in backend calendar page. 2020-05-04 13:38:28 +02:00