e1e9a60085
Moved source files to the root directory.
2020-03-11 10:24:25 +01:00
93e7a2d994
Added missing translation strings.
2020-03-11 10:00:44 +01:00
0f17a7a689
Added the new check_spam_folder translation key to all translation files.
2020-03-10 21:40:33 +01:00
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
902485e2d3
Merge branch 'oxteam-oxteam-translation-cleanup-2' into develop
2020-03-10 20:35:31 +01:00
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
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
271269d059
Added setting to require phone number for customers, closes #655
2019-10-17 20:37:02 -07:00
45db34cb52
Merge branch 'develop' into oxteam-dev-first_week_day
2019-07-30 14:38:59 +02:00
84afca8b26
Integrated location field in the backend section.
2019-06-08 16:43:21 +02:00
ad5f9f1266
Merge branch 'develop' into oxteam-dev-first_week_day
2018-07-31 10:17:06 +02:00
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
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
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
ba33755032
Added new translation strings to language files ( #480 ).
2018-06-24 19:24:17 +02:00
9c7ae5dfdc
Extra working days outside default working plan
...
Add function to add extra working days outside the default working plan.
2018-04-12 15:03:46 +02:00
d971f4f097
Added time format selection
2018-03-06 12:20:47 +01:00
de23443559
User interface enhancements (template refactoring).
2017-09-23 03:42:14 +02:00
9366089c82
Direct file access must not be permitted.
2017-09-15 13:44:40 +02:00
fcb4b9d5cf
Autoformatted php files based on CodeIgniter style guide.
2017-09-15 13:36:37 +02:00
ae462c1efb
Corrected translation key
2017-08-14 09:54:35 +02:00
bc2b3163c6
Added 'attendants_number' translation key ( #109 ).
2016-07-21 20:40:31 +02:00
c9b6153df5
Added 'flexible' and 'fixed' translation keys.
2016-07-20 21:15:58 +02:00
bc8c691493
Added new translation key.
2016-07-20 21:09:20 +02:00
c6143c7c50
Translated UI strings ( #182 ).
2016-07-18 21:38:09 +02:00
98c65aa666
Added the captcha settings translation.
2015-12-30 12:33:51 +01:00
741ffe906b
Added select box for the date format option in the settings page (refs #27 ).
2015-12-13 22:49:42 +01:00
7cbd6901b0
Added new 'customer_notifications' setting.
2015-11-24 22:48:57 +01:00
d40c336c3b
Added new translation key to language files..
2015-11-23 23:06:58 +01:00
6adf0abf8d
Added the "any_provider" translation to the translation files.
2015-10-27 22:52:51 +01:00
d1b5d66acc
Added captcha to the appointment registration, fixes #15
2015-10-21 23:29:20 +02:00
88432c2f86
Added russian translation files.
2015-09-22 00:34:22 +02:00
Alex Tselegidis
Jane Sandberg
oxteam
oxteam
Andrea