680 commits

Author	SHA1	Message	Date
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	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	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	cbb3506c4a	Merge branch 'citrtech-patch-1' into develop	2020-03-10 20:53:10 +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	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	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	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
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	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
Kaustubh Kulkarni	89b114f2eb	added marathi language support	2020-03-09 22:03:12 +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	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
alext	da98768cd0	Unset the provider settings property for the book success page (#664).	2019-12-04 09:48:57 +01: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
Steffan Mølbæk Andersen	4b8ea251bc	Another DK lang fix	2019-07-01 10:06:01 +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	cd33631ce1	Fixed several bad danish translations	2019-06-26 12:56:42 +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	84afca8b26	Integrated location field in the backend section.	2019-06-08 16:43:21 +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
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
oxteam	eb3bae9c1d	Merge branch 'develop' into oxteam-dev-first_week_day	2018-11-27 09:58:45 +01:00
alext	78362e4cac	Updated version information in repo for 1.4.0	2018-11-03 17:27:19 +01:00
alext	226f74ad6d	Updated to CodeIgniter v3.1.9	2018-11-02 15:26:12 +01:00
Caine85	f4a6d2bf59	Update terms_and_conditions_modal.php	2018-10-23 20:03:08 +02:00
Caine85	7959099cb1	Update privacy_policy_modal.php	2018-10-23 20:02:53 +02:00
Caine85	f9b49150e3	Update cookie_notice_modal.php	2018-10-23 20:01:11 +02:00
PetrTodorov	83f14044d9	Add Czech language translation	2018-10-19 22:14:17 +02:00
Paulo Henrique Cuchi	b3659c46d6	Update pt-br translation	2018-08-20 06:27:11 -03:00
Paulo Henrique Cuchi	5ca3ff160d	Add pt-br to the available languages list	2018-08-20 06:26:54 -03:00
oxteam	ad5f9f1266	Merge branch 'develop' into oxteam-dev-first_week_day	2018-07-31 10:17:06 +02:00
alext	0a3e31646f	Updated version information	2018-07-29 16:09: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
oxteam	76f53b8418	Translation file cleanup. ... Remove duplicate of the 'address' language key. Remove the 'phone' language key as the 'phone_number' already exists for the same purpose. Minor typo fixes in English and French translation files.	2018-07-18 15:05:29 +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
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