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
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
21ab3428a5
Merge pull request #556 from PetrTodorov/develop
...
Add Czech language translation
2020-03-09 21:52:37 +01:00
alext
31673436fe
Added location field in the database for appointments.
2019-06-08 15:56:38 +02: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
PetrTodorov
83f14044d9
Add Czech language translation
2018-10-19 22:14:17 +02: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
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
6bbdee1fa4
Added beta label to current release.
2018-06-24 19:47:33 +02:00
alext
71e758749a
Updated migration index ( #480 ).
2018-06-24 15:47:10 +02:00
alext
91f20dbb05
Updated app version info for 1.3.2
2018-06-24 13:00:37 +02:00
alext
d23ec0483c
Removed "ea" prefix from db constraints ( #438 )
2018-04-25 13:40:13 +02:00
alext
9805fe7c80
Updated cache busting parameter.
2018-04-23 09:58:35 +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
bbffd75a51
Updated version number and cache busting parameter.
2018-03-28 14:37:26 +02:00
alext
7bcca1b5db
Added timezone setting in back-end.
2018-03-06 22:50:31 +01:00
alext
7c620c6734
Added time format setting in the database and created migration file.
2018-03-06 22:46:33 +01:00
alext
4973d156f5
Updated migration number in configuration file.
2018-02-26 14:16:20 +01:00
alext
a2588dbe21
Do not display expected captcha phrase on failures.
2018-02-23 15:33:41 +01:00
alext
c25f7828bd
Updated app version info.
2018-01-23 10:10:56 +01:00
alext
e013943fde
Reformatted code files.
2018-01-23 10:08:37 +01:00
alext
ab0eec56ec
Updated app's config file for 1.3.0-beta.1
2018-01-15 09:17:07 +01:00
alext
dbcabd26fd
Updated app's config file for 1.3.0-beta.1
2018-01-15 09:16:09 +01:00
alext
fb8aea0c3e
Added config_helper.php class for fetching the configuration values in templates.
2018-01-15 08:57:17 +01:00
alext
d6d746853f
Sorted languages alphabetically.
2018-01-11 14:21:29 +01:00
alext
9fdee15b80
Updated release label
2018-01-02 12:37:34 +01:00
alext
558daf1ecc
Added arabic translation ( #362 ).
2017-11-15 23:11:59 +01:00
alext
fdd309c9d5
Added ea_migrations table.
2017-11-15 23:02:46 +01:00
alext
e8f0f57380
Integrated asset_helper method for cache busting.
2017-11-14 14:01:49 +01:00
alext
3bc482adf4
Added asset_helper file and cache busting token config.
2017-11-08 15:22:30 +01:00
alext
c56650d1b8
Updated project version.
2017-09-08 14:22:47 +02:00
alext
5119e757f6
Integrated "lang" helper in view files.
2017-09-08 14:06:37 +02:00
alext
557c282433
PHP sessions will be stored in the "storage" directory ( fixes #241 )
2016-11-13 12:25:02 +01:00
alext
1d2ffadbd9
Updated version
2016-11-13 12:18:23 +01:00
alext
e8a0631bb9
Updated version information.
2016-11-06 11:49:21 +01:00
alextselegidis
aacd760256
Added bulgarian translation.
2016-10-16 20:32:13 +02:00
alextselegidis
1df998114f
Updated app version title for upcoming release.
2016-10-06 19:48:16 +02:00
alextselegidis
9223140a7d
Updated the version in config.php file for v1.2.0 Alpha.1
2016-09-07 23:34:36 +02:00
Alex Tselegidis
b873fc92ee
Added attendants number field in services page ( #109 ).
2016-07-21 20:30:02 +02:00
Alex Tselegidis
29a694e5de
Integrated availabilities type in backend section ( #185 ).
2016-07-20 21:20:00 +02:00
Alex Tselegidis
9d91b99dbc
Added migration file for the availabilities type.
2016-07-20 20:47:47 +02:00
Alex Tselegidis
6e40c50fd4
Added availabilities controller to API.
2016-07-19 09:52:32 +02:00
Alex Tselegidis
6cda484e1d
The calendar view setting will be available to javascript through GlobalVariables.calendarView ( #182 ).
2016-07-17 13:04:44 +02:00
Alex Tselegidis
1c6ba6308b
Created migration class for new setting ( #182 ).
2016-07-17 12:37:00 +02:00