ifl/iflrandevu
1
1
Fork 0
forked from mirrors/easyappointments
Code Issues 6 Pull requests Releases 3 Activity
1455 commits 2 branches 38 tags 38 MiB
Commit graph

1455 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
alext
84afca8b26 Integrated location field in the backend section. 2019-06-08 16:43:21 +02:00
alext
6f39a99734 Switched namespace directory back to its previous state. 2019-06-08 16:27:17 +02:00
alext
756f4762a6 Added new autoloading directories. 2019-06-08 16:20:14 +02:00
alext
cfdb5c6359 Included required composer files. 2019-06-08 16:08:29 +02:00
alext
812791d0f8 Updated gulp dependency. 2019-06-08 16:04:36 +02:00
alext
31673436fe Added location field in the database for appointments. 2019-06-08 15:56:38 +02:00
Francesco M. Taurino
e17a42087f
Updated italian translation 2019-02-06 12:33:59 +01:00
CiTR Tech
c99d00017f
Sync recurring events from GCal 
Add ability to import recurring events directly from the Google Calendar.
 2019-01-16 12:26:08 -08:00
alext
cd58d5d07d Added backtrace in debug log entries. 2019-01-16 10:03:25 +01:00
Guilherme Maciel
ee3a4c81a5
Update translations_lang.php 
Updating Brazilian Portuguese version. Still not finished
 2019-01-05 01:42:07 -02:00
Altomarketing.com
3f63833e64
Update translations_lang.php 2019-01-04 21:09:52 -03:00
Alex Tselegidis
ee24c7b8a7
Merge pull request #564 from CalvinMcGee/master 
Fixing connection issues to MySQL 8.0.4
 2018-12-06 19:54:51 +01:00
alext
0c683ad990 Added metafile to .gitignore 2018-11-30 21:08:36 +01:00
oxteam
eb3bae9c1d Merge branch 'develop' into oxteam-dev-first_week_day 2018-11-27 09:58:45 +01:00
alext
8f3fe8a0c7 Updated comment block of composer gulp task. 2018-11-10 15:13:36 +01:00