Alex Tselegidis
707e97ce8a
Updated the composer.json file.
2020-03-11 10:24:49 +01:00
Alex Tselegidis
e1e9a60085
Moved source files to the root directory.
2020-03-11 10:24:25 +01:00
Alex Tselegidis
2eeb07e753
Removed system and vendor directory form src.
2020-03-11 10:23:15 +01:00
Alex Tselegidis
95b303cd6d
Updated copyright year in source files.
2020-03-11 10:10:59 +01:00
Alex Tselegidis
5ea1d3e8b9
Fixes in translation files.
2020-03-11 10:08:53 +01:00
Alex Tselegidis
93e7a2d994
Added missing translation strings.
2020-03-11 10:00:44 +01:00
Alex Tselegidis
0f17a7a689
Added the new check_spam_folder translation key to all translation files.
2020-03-10 21:40:33 +01:00
Alex Tselegidis
bf0f5ec2e7
Merge pull request #708 from DiGitHubCap/check-spam-folder
...
Add note to check spam folder after booking an appointment
2020-03-10 21:38:31 +01:00
Alex Tselegidis
8910793d2e
Merge branch 'DiGitHubCap-fix-validation' into develop
2020-03-10 21:31:19 +01:00
Alex Tselegidis
57209cf157
Merge branch 'fix-validation' of https://github.com/DiGitHubCap/easyappointments into DiGitHubCap-fix-validation
...
# Conflicts:
# src/application/models/Customers_model.php
2020-03-10 21:31:10 +01:00
wolfygit
eb3ab4800d
Spanish Translation
...
Translate the las sentences
2020-03-10 21:26:43 +01:00
wolfygit
9297681f18
Fix mail title
...
Fix the provider's modification mail title .
As the modification is made by the provider from the backend, his mail title has to be 'appointment_changes_saved' and the customer mail title 'appointment_details_changed'
2020-03-10 21:26:22 +01:00
wolfygit
3458744933
Fix link appointment form
...
Fix form filling when open an appointment from a link
2020-03-10 21:26:22 +01:00
Alex Tselegidis
383b664664
Merge pull request #666 from yrammos/fix_language_switch_on_legacy_browsers
...
Fix language-switch control on legacy browsers.
2020-03-10 21:22:15 +01:00
Alex Tselegidis
259ef17a55
Merge pull request #662 from yrammos/auto-select-browser-lang
...
Automatically detect the client's language
2020-03-10 21:16:24 +01:00
Alex Tselegidis
2e9d8c963e
Merge pull request #660 from yrammos/hide-zero-price
...
Hide service price in modal views if equal to zero.
2020-03-10 21:13:17 +01:00
Alex Tselegidis
3b88d1d0c4
Merge branch 'sandbergja-make_phone_number_optional' into develop
2020-03-10 21:12:21 +01:00
Alex Tselegidis
058089134b
Merge branch 'make_phone_number_optional' of https://github.com/sandbergja/easyappointments into sandbergja-make_phone_number_optional
...
# Conflicts:
# src/application/controllers/Appointments.php
# src/application/controllers/Backend.php
# src/application/language/arabic/translations_lang.php
# src/application/language/bulgarian/translations_lang.php
# src/application/language/chinese/translations_lang.php
# src/application/language/danish/translations_lang.php
# src/application/language/dutch/translations_lang.php
# src/application/language/english/translations_lang.php
# src/application/language/finnish/translations_lang.php
# src/application/language/french/translations_lang.php
# src/application/language/german/translations_lang.php
# src/application/language/greek/translations_lang.php
# src/application/language/hindi/translations_lang.php
# src/application/language/hungarian/translations_lang.php
# src/application/language/italian/translations_lang.php
# src/application/language/japanese/translations_lang.php
# src/application/language/luxembourgish/translations_lang.php
# src/application/language/polish/translations_lang.php
# src/application/language/portuguese-br/translations_lang.php
# src/application/language/portuguese/translations_lang.php
# src/application/language/romanian/translations_lang.php
# src/application/language/russian/translations_lang.php
# src/application/language/slovak/translations_lang.php
# src/application/language/spanish/translations_lang.php
# src/application/language/turkish/translations_lang.php
# src/assets/sql/data.sql
2020-03-10 21:11:33 +01:00
Alex Tselegidis
12a9f4cc59
Merge branch 'JasonMFry-patch-1' into develop
2020-03-10 21:02:48 +01:00
Alex Tselegidis
2eeead90a3
Merge branch 'sduck-dk_lang_updates' into develop
...
# Conflicts:
# src/application/language/danish/translations_lang.php
2020-03-10 21:00:44 +01:00
Alex Tselegidis
22e9b1bbf0
Merge branch 'dk_lang_updates' of https://github.com/sduck/easyappointments into sduck-dk_lang_updates
2020-03-10 20:59:55 +01:00
Alex Tselegidis
8a217df0a3
Fixed captcha issues in the docker environment ( #623 ).
2020-03-10 20:58:31 +01:00
Alex Tselegidis
923d7bd4c4
Merge branch 'ftaurino-patch-1' into develop
...
# Conflicts:
# src/application/language/italian/translations_lang.php
2020-03-10 20:57:00 +01:00
Alex Tselegidis
1134d13cce
Merge branch 'patch-1' of https://github.com/ftaurino/easyappointments into ftaurino-patch-1
2020-03-10 20:55:42 +01:00
Alex Tselegidis
cbb3506c4a
Merge branch 'citrtech-patch-1' into develop
2020-03-10 20:53:10 +01:00
Alex Tselegidis
940ff73365
Merge branch 'patch-1' of https://github.com/citrtech/easyappointments into citrtech-patch-1
2020-03-10 20:53:01 +01:00
Alex Tselegidis
209f9dff4e
Merge branch 'guifelix-patch-1' into develop
...
# Conflicts:
# src/application/language/portuguese-br/translations_lang.php
2020-03-10 20:50:44 +01:00
Alex Tselegidis
56bfd11394
Merge branch 'patch-1' of https://github.com/guifelix/easyappointments into guifelix-patch-1
2020-03-10 20:49:37 +01:00
Alex Tselegidis
6ae4835015
Merge branch 'altomarketing-patch-1' into develop
...
# Conflicts:
# src/application/language/spanish/translations_lang.php
2020-03-10 20:48:40 +01:00
Alex Tselegidis
ea6e237e38
Merge branch 'patch-1' of https://github.com/altomarketing/easyappointments into altomarketing-patch-1
2020-03-10 20:47:54 +01:00
Alex Tselegidis
07e354d332
Merge branch 'Caine85-enddatetime-according-to-start-and-service' into develop
2020-03-10 20:45:01 +01:00
Alex Tselegidis
6b86d357ef
Merge branch 'enddatetime-according-to-start-and-service' of https://github.com/Caine85/easyappointments into Caine85-enddatetime-according-to-start-and-service
...
# Conflicts:
# src/assets/js/backend_calendar_appointments_modal.js
2020-03-10 20:44:51 +01:00
Alex Tselegidis
bb4e11c38e
Use version for the MySQL image to avoid issues with caching_sha2_password ( #533 )
2020-03-10 20:42:08 +01:00
Alex Tselegidis
673ec82aa3
Check for empty events before proceeding with the syncing ( #531 ).
2020-03-10 20:39:53 +01:00
Alex Tselegidis
902485e2d3
Merge branch 'oxteam-oxteam-translation-cleanup-2' into develop
2020-03-10 20:35:31 +01:00
Alex Tselegidis
858855fbf1
Merge branch 'oxteam-translation-cleanup-2' of https://github.com/oxteam/easyappointments into oxteam-oxteam-translation-cleanup-2
2020-03-10 20:35:17 +01:00
Alex Tselegidis
fd0d2cacf9
Merge branch 'oxteam-oxteam-dev-first_week_day' into develop
2020-03-10 20:33:06 +01:00
Alex Tselegidis
dd44f8e132
Merge branch 'oxteam-dev-first_week_day' of https://github.com/oxteam/easyappointments into oxteam-oxteam-dev-first_week_day
...
# Conflicts:
# src/application/language/portuguese-br/translations_lang.php
# src/assets/js/backend_calendar_default_view.js
# src/assets/js/backend_users_providers.js
# src/assets/js/general_functions.js
# src/assets/js/working_plan.js
2020-03-10 20:32:53 +01:00
oxteam
1f70bc7dc2
Minor change in a comment to be more relevant.
2020-03-10 20:28:11 +01:00
oxteam
8ca935c412
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
2020-03-10 20:28:11 +01:00
Alex Tselegidis
683b7a4d2d
Merge pull request #503 from oxteam/patch-1
...
Fix down procedure for Secretary Provider
2020-03-10 20:15:18 +01:00
Alex Tselegidis
3ed85d542c
Merge branch 'Caine85-extra-working-days' into develop
2020-03-10 20:09:50 +01:00
Alex Tselegidis
7d04052697
Merge branch 'extra-working-days' of https://github.com/Caine85/easyappointments into Caine85-extra-working-days
...
# Conflicts:
# src/application/config/migration.php
# src/application/language/arabic/translations_lang.php
# src/application/language/bulgarian/translations_lang.php
# src/application/language/chinese/translations_lang.php
# src/application/language/danish/translations_lang.php
# src/application/language/dutch/translations_lang.php
# src/application/language/english/translations_lang.php
# src/application/language/finnish/translations_lang.php
# src/application/language/french/translations_lang.php
# src/application/language/german/translations_lang.php
# src/application/language/greek/translations_lang.php
# src/application/language/hindi/translations_lang.php
# src/application/language/hungarian/translations_lang.php
# src/application/language/italian/translations_lang.php
# src/application/language/japanese/translations_lang.php
# src/application/language/luxembourgish/translations_lang.php
# src/application/language/polish/translations_lang.php
# src/application/language/portuguese-br/translations_lang.php
# src/application/language/portuguese/translations_lang.php
# src/application/language/romanian/translations_lang.php
# src/application/language/russian/translations_lang.php
# src/application/language/slovak/translations_lang.php
# src/application/language/spanish/translations_lang.php
# src/application/language/turkish/translations_lang.php
# src/assets/js/general_functions.js
# src/assets/js/working_plan.js
# src/assets/sql/data.sql
2020-03-10 20:09:31 +01:00
Alex Tselegidis
4ed023618d
Merge branch 'cuchi-update-pt-br' into develop
...
# Conflicts:
# src/application/language/portuguese-br/translations_lang.php
2020-03-09 22:05:49 +01:00
Alex Tselegidis
756d7f33aa
Merge branch 'update-pt-br' of https://github.com/cuchi/easyappointments into cuchi-update-pt-br
2020-03-09 22:04:39 +01:00
Kaustubh Kulkarni
89b114f2eb
added marathi language support
2020-03-09 22:03:12 +01:00
Alex Tselegidis
66cf2b8882
Merge branch 'athAtp-patch-2' into develop
...
# Conflicts:
# docker-compose.prod.yml
# docker-compose.yml
2020-03-09 21:59:10 +01:00
Alex Tselegidis
9f0114c08b
Set values for consent "created" and "modified" columns.
2020-03-09 21:53:03 +01:00
Alex Tselegidis
21ab3428a5
Merge pull request #556 from PetrTodorov/develop
...
Add Czech language translation
2020-03-09 21:52:37 +01:00
Alex Tselegidis
bd45947a42
Merge pull request #522 from oxteam/oxteam-fix_gpdr_sql_backward_comp
...
Fix MySQL/MariaDB 5.5.x backward compatibility issue with 'ea_consents' table (#518 )
2020-03-09 21:49:46 +01:00
