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
Alex Tselegidis
a748bf28fd
Merge pull request #558 from Caine85/patch-modal-close-buttons-lang
...
Patch for close buttons language in modal views
2020-03-09 21:44:55 +01:00
Alex Tselegidis
274b27d88f
Git ignore the .DS_Store files
2020-03-09 21:25:22 +01:00
Alex Tselegidis
1e0f61c4e4
Merge branch 'develop' of https://github.com/alextselegidis/easyappointments into develop
2020-03-09 21:19:32 +01:00
Alex Tselegidis
af296cf147
Book advance timeout must span in multiple days ( #365 , #428 ).
2020-03-09 21:15:03 +01:00
DiGitHubCap
c69714ad90
Add note check spam folder after booking an appointment
2020-02-18 20:12:12 -05:00
DiGitHubCap
c50c545d98
Fix appointment required fields validation
...
We should be using empty to check the fields instead of isset. Otherwise,
appointments may be booked with empty fields if these are not properly validated
client-side for some reason, since they will be empty strings. Also, we should
check first_name.
2020-02-18 17:59:10 -05:00
athAtp
631cc01e33
Update installation.js
...
Hello,
Thank you for your work! The installation did not display errors.
2020-02-17 03:14:53 +02:00
alext
da98768cd0
Unset the provider settings property for the book success page ( #664 ).
2019-12-04 09:48:57 +01:00
Yannis Rammos
8664002ad8
Tweak CSS to trigger click events on language-switch items.
2019-11-05 13:41:02 +02:00
Yannis Rammos
6b39b121b6
Load the booking frontend in the primary language of the client's browser unless it is overridden by manual language selection.
2019-10-28 02:43:54 +02:00
Yannis Rammos
ecfd5e830f
Hide service price in modal views if equal to zero.
2019-10-27 19:04:32 +02:00
Jane Sandberg
271269d059
Added setting to require phone number for customers, closes #655
2019-10-17 20:37:02 -07:00
oxteam
45db34cb52
Merge branch 'develop' into oxteam-dev-first_week_day
2019-07-30 14:38:59 +02:00
Jason
ecbf3e5144
Remove dead link to wiki page
...
It looks like the github wiki for this project no longer exists, so
this commit removes the link and reference to it.
2019-07-28 11:50:00 +03:00
Alex Tselegidis
0fe96a28d4
Merge pull request #555 from PetrTodorov/patch-1
...
Update README.md
2019-07-14 19:08:44 +02:00
Steffan Mølbæk Andersen
3ba5ffe705
Merge branch 'dk_lang_updates' of github.com:sduck/easyappointments into dk_lang_updates
2019-07-01 10:06:21 +02:00
Steffan Mølbæk Andersen
4b8ea251bc
Another DK lang fix
2019-07-01 10:06:01 +02:00
Steffan Mølbæk Andersen
4a8e3eadec
Merge branch 'master' into dk_lang_updates
2019-06-27 14:10:30 +02:00
Steffan Mølbæk Andersen
1826123ac2
More DK translation fixes
2019-06-27 14:06:09 +02:00
Steffan Mølbæk Andersen
0f462b407c
Fixed several bad danish translations
2019-06-26 15:15:47 +02:00
Steffan Mølbæk Andersen
cd33631ce1
Fixed several bad danish translations
2019-06-26 12:56:42 +02:00
alext
14bbd793bf
Merged pull request #282 - Added action link icons in the backend calendar page, event popover component.
2019-06-08 17:20:49 +02:00
alext
44cd035448
Merged pull request #260 - Add 'Location' option to Services [Not a required field]
2019-06-08 17:03:32 +02:00
alext
52e17063b7
Added location field for services.
2019-06-08 16:57:09 +02:00
alext
dfd55d9472
Added location field in the appointments API parser.
2019-06-08 16:55:44 +02:00
alext
cd365551b9
Added .gitattributes
2019-06-08 16:50:21 +02:00
alext
62e28d381d
Merged pull request #221 - Fixed/Improved sort breaks increasingly by hour within day
2019-06-08 16:48:24 +02:00
