Commit Graph

1204 Commits

Author SHA1 Message Date
alext 49cbd2da16 Merge branch 'oxteam-oxteam-patch-fr_trans-1' 2018-07-11 09:45:52 +02:00
alext e1f30b85dd Merge branch 'oxteam-patch-fr_trans-1' of https://github.com/oxteam/easyappointments into oxteam-oxteam-patch-fr_trans-1 2018-07-11 09:45:33 +02:00
alext f8ac3fb9ea Chagned the footer column width in order to allow more space for the app info. 2018-07-11 09:42:37 +02:00
oxteam e9de0e5581 Add missing French translation (company_link_hint) 2018-07-11 09:42:37 +02:00
alext 35be64270a Use moment objects when rendering appointments in fullcalendar. 2018-07-11 09:42:36 +02:00
Alex Tselegidis 3d7897ba57
Merge pull request #521 from robertobarlocci/patch-1
Corrected typo in german translations.
2018-07-11 09:39:36 +02:00
Roberto Barlocci 6ae4c2b04f
typo 2018-07-10 14:49:09 +02:00
alext a1647966db Chagned the footer column width in order to allow more space for the app info. 2018-07-07 19:10:46 +02:00
alext 874c94e2ae Merge branch 'master' into develop 2018-06-28 07:22:57 +02:00
alext 66aacd7e6b Use moment objects when rendering appointments in fullcalendar. 2018-06-26 09:54:43 +02:00
alext 6bbdee1fa4 Added beta label to current release. 2018-06-24 19:47:33 +02:00
alext d07825160f Merge branch 'hotfix_gdpr' 2018-06-24 19:46:21 +02:00
alext 3bb6dcdbf1 Make REST API search check with "q" parameter case insensitive. #485 2018-06-24 19:44:49 +02:00
alext caa45a65f1 Performance optimization in backend calendar page, after the user clicks the insert appointment button. (#500) 2018-06-24 19:42:42 +02:00
alext 58ab2b0c8e REST API response headers must use the Content-Type application/json value (#489). 2018-06-24 19:38:50 +02:00
alext ba33755032 Added new translation strings to language files (#480). 2018-06-24 19:24:17 +02:00
alext 0d91792d36 Customers will now be able to remove all their data from the system (#480). 2018-06-24 19:08:45 +02:00
alext d171a5b2ee Save consent every time the customer updates his data (#480). 2018-06-24 17:27:16 +02:00
alext 2ddf7b118a Added type field into the consent table (#480). 2018-06-24 17:12:13 +02:00
alext 60f48e24ee Integrated new legal content settings in the booking page (#480). 2018-06-24 16:58:03 +02:00
alext 00f1017e35 Added cookieconsent lib in the frontend (#480). 2018-06-24 16:57:45 +02:00
alext 03b7a74084 Created modals for the cookie notice, terms and conditions and privacy policy (#480). 2018-06-24 16:57:22 +02:00
alext 71e758749a Updated migration index (#480). 2018-06-24 15:47:10 +02:00
alext 54076bd244 Integrated legal contents in backend settings page (#480). 2018-06-24 15:46:58 +02:00
alext 37cb57ac94 Added trumbowyg into the backend section (#480). 2018-06-24 15:07:22 +02:00
alext 53b754c52d Added new database structure for storing use consents and toggling legal information (#480). 2018-06-24 13:17:04 +02:00
alext 0943be630a Update CHANGELOG.md for #480 2018-06-24 13:16:39 +02:00
alext 91f20dbb05 Updated app version info for 1.3.2 2018-06-24 13:00:37 +02:00
oxteam c0a33d1116 French translation improved. 2018-06-03 18:56:12 +02:00
alext 4659f90fc2 Merge branch 'master' into hotfix_gdpr 2018-06-03 16:53:06 +02:00
alext b301dafd9d Merge branch 'master' into develop 2018-06-03 16:52:39 +02:00
alext 9ef42e7343 Disable search buttons when editing admin record in backend 2018-06-03 16:25:37 +02:00
alext 212f4e0d4e Typo corrections in the structure.sql 2018-06-03 16:23:45 +02:00
alext 0e3ff2493e Backend settings are not being displayed on page load when the user is not an admin (#497). 2018-06-03 15:58:44 +02:00
alext 55d8c1e1fe Updated CHANGELOG.md 2018-06-03 15:47:57 +02:00
alext 7508790f31 Database migration fixes (from 1.2.1 to 1.3.x) (#495).
(cherry picked from commit 40e13cb7d8)
2018-06-03 15:42:29 +02:00
alext 955b2bdc55 Merge remote-tracking branch 'origin/master' 2018-06-03 15:32:56 +02:00
alext a8fa3cc959 Updated CHANGELOG.md for 1.3.1 2018-06-03 15:32:03 +02:00
Alex Tselegidis 3b0d9d6fa0
Merge pull request #488 from oxteam/oxteam-patch-fr_trans-1
Update French translation
2018-06-03 15:23:13 +02:00
oxteam 3428c6552a Fix for unselectable calendar when switching from service to provider view (#483).
(cherry picked from commit 9c2de28)
2018-06-03 15:21:16 +02:00
oxteam 8fa38aa139 Fix computation of unavailable dates for ANY_PROVIDER option (#475).
(cherry picked from commit 523e260)
2018-06-03 15:20:30 +02:00
oxteam b99d8c49f5 Use $selected_date instead of its equivalent coming from the POST (#469).
(cherry picked from commit 36dbde8)
2018-06-03 15:15:01 +02:00
oxteam 39677ffe91 Fix date format when calling _search_any_provider (#469)
(cherry picked from commit b8e1fc3)
2018-06-03 15:13:41 +02:00
alext 3d1ec7c22e Replaced hardcoded string with translated value on appointment removal email notification (#491). 2018-06-03 15:05:18 +02:00
alext 4311a6205d Updated CHANGELOG.md for 1.3.1 2018-06-03 14:59:40 +02:00
oxteam 3d27d05b58
Update French translation 2018-05-27 17:38:34 +02:00
alext a2d72c068c Corrected migration classes for v1.3.1. 2018-04-30 14:10:25 +02:00
alext 68c67af57b Removed class from non working event. 2018-04-30 13:49:16 +02:00
alext 299c840d28 Merge branch 'master' into develop 2018-04-26 14:16:13 +02:00
alext afbb3cc62e Updated CHANGELOG.md for 1.3.1 2018-04-25 14:02:21 +02:00