maket/MaketRandevu
1
1
Fork 0
Code Issues 15 Pull requests Projects Releases 4 Packages Wiki Activity
1223 commits 2 branches 42 tags 38 MiB
Commit graph

1223 commits

This branch
This branch
All branches
Author SHA1 Message Date
oxteam
ad5f9f1266
Merge branch 'develop' into oxteam-dev-first_week_day 2018-07-31 10:17:06 +02:00
alext
159b455ccf Merge branch 'master' into develop 2018-07-29 16:58:53 +02:00
alext
11303acb55 Corrected CHANGELOG.md 2018-07-29 16:58:24 +02:00
alext
c68fe9fb0c Updated doc files for v1.3.2 2018-07-29 16:10:54 +02:00
alext
0a3e31646f Updated version information 2018-07-29 16:09:41 +02:00
alext
b3b1815c8d Providers should not be able to create appointments for other providers in the backend calendar page. #510 2018-07-29 16:08:41 +02:00
alext
ba3227e11c Providers and secretaries shall not be able to see appointments of other providers (#512). 2018-07-29 15:59:18 +02:00
Alex Tselegidis
3fd0c2834b
Merge pull request #523 from oxteam/oxteam-feat_gpdr_translate 
Updated GDPR related french translations (oxteam).
 2018-07-13 08:10:49 +02:00
Alex Tselegidis
62ee6cfd84
Merge pull request #524 from oxteam/oxteam-cleanup_translation_files 
Update of the translation files.
 2018-07-13 08:09:00 +02:00
oxteam
3c605c139c Import system translations from official CI depot https://github.com/bcit-ci/codeigniter3-translations 
Only files already existing in EA! were imported.

CI's portuguese-brazilian folder was used for EA!'s portuguese-br.
CI's simplified-chinese folder was used for EA!'s chinese folder.

No supported translations exists for Finish and Luxembourgish. The migration_lang files for these languages are still in English but one translation key is missing compared to the EA! English original file.
For consistency purpose, the Finish and Luxembourgish migration_lang files have been overwritten by the EA! English original file.
 2018-07-13 01:13:25 +02:00
oxteam
041a1c2078 Clean-up of translations_lang.php files using the English one as a reference. 
All files have their tags now ordered like in the English one, duplicate tags are removed and the Arabic file has the "about_ea*" tags changed to "about_app*" like in other languages.
In additon for the French language, improved some translations (mainly consistency in usage of infinitive verb forms).
 2018-07-12 22:11:09 +02:00
oxteam
064b0580fb Use translation for the personal information 'delete' button. 2018-07-12 14:49:14 +02:00
oxteam
7b20616559 French translation for GPDR labels. 2018-07-12 14:48:58 +02:00
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
oxteam
813a9049d8 Remove unnecessary call to the timepickers function. 2018-07-06 02:07:34 +02:00
oxteam
beaa309054 Days sorted also in the Users and Setting pages in the backend. 2018-07-06 01:21:24 +02:00
oxteam
06630e0d2d Cosmetic changes (removing blanks) 2018-06-29 14:31:09 +02:00
oxteam
734be96126 Add new system-wide setting that enable users to choose the first day of the week. (#471) 
The setting change the display of weeks shown in backend and booking page calendars.
Work plans and break lists in the 'settings' page are still displayed starting on Sunday.
 2018-06-29 00:42:52 +02:00
oxteam
502027e894 Minor change in a comment to be more relevant. 2018-06-28 17:56:24 +02:00
oxteam
78bd5e67fd Fix display of breaks in the backend for working plans stored in database with Monday as the first weekday (EA! Issue #506). 
Prior commit 00372f2f1a, the first weekday was Monday.
After this commit, it is set to Sunday and the display of breaks in the backend calendar is broken for former working plans.

The fix consists in reordering the working plan elements with Sunday as the first day prior displaying the backend calendar.
In addition, the working plan elements are also reordered when displaying 'Settings/Business Logic' and 'Users/Providers' tabs.
This is to ensure that breaks are always displayed with Sunday first, like done for the Working Plan in those tabs, for consistency purpose..
 2018-06-28 17:56:24 +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