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
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
oxteam
45db34cb52
Merge branch 'develop' into oxteam-dev-first_week_day
2019-07-30 14:38:59 +02:00
alext
84afca8b26
Integrated location field in the backend section.
2019-06-08 16:43:21 +02:00
oxteam
ad5f9f1266
Merge branch 'develop' into oxteam-dev-first_week_day
2018-07-31 10:17:06 +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
oxteam
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
alext
ba33755032
Added new translation strings to language files ( #480 ).
2018-06-24 19:24:17 +02:00
Andrea
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
alext
917d7fa6bb
Added translations for the time format setting.
2018-03-06 22:47:57 +01:00
Andrea
d971f4f097
Added time format selection
2018-03-06 12:20:47 +01:00
alext
de23443559
User interface enhancements (template refactoring).
2017-09-23 03:42:14 +02:00
alext
9366089c82
Direct file access must not be permitted.
2017-09-15 13:44:40 +02:00
alext
fcb4b9d5cf
Autoformatted php files based on CodeIgniter style guide.
2017-09-15 13:36:37 +02:00
alext
ae462c1efb
Corrected translation key
2017-08-14 09:54:35 +02:00
alextselegidis
202c623be9
Corrections in the bulgarian translation.
2016-10-17 21:58:27 +02:00
alextselegidis
aacd760256
Added bulgarian translation.
2016-10-16 20:32:13 +02:00
