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
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
Jane Sandberg
271269d059
Added setting to require phone number for customers, closes #655
2019-10-17 20:37:02 -07:00
oxteam
ad5f9f1266
Merge branch 'develop' into oxteam-dev-first_week_day
2018-07-31 10:17:06 +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
beaa309054
Days sorted also in the Users and Setting pages in the backend.
2018-07-06 01:21:24 +02:00
oxteam
06630e0d2d
Cosmetic changes (removing blanks)
2018-06-29 14:31: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
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
4d6b452dd6
Updated copyright year in file headers.
2018-03-27 09:23:09 +02:00
Andrea
d971f4f097
Added time format selection
2018-03-06 12:20:47 +01:00
alext
e013943fde
Reformatted code files.
2018-01-23 10:08:37 +01:00
alext
8df2e51a73
Added view file for the update page.
2017-11-15 22:51:46 +01:00
alext
c424c0bc6d
Reformatted PHP files
2017-09-23 01:30:22 +02:00
alext
36e507adc0
Integrated output class in controllers.
2017-09-20 16:09:01 +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
539e753b80
Adjusted phpdoc blocks in controller classes.
2017-09-06 15:22:11 +02:00
alext
2dad4dfc34
Updated copyright year.
2017-01-31 07:35:34 +01:00
alext
6f886d60a5
Removed comments from the end of the files.
2016-12-07 19:45:39 +01:00
alextselegidis
ecce8fb1c3
Spelling corrections
2016-10-10 18:29:48 +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
8461c0dca4
Refactor PHP controllers and models (use of protected members and corrections in docblock comments).
2016-04-27 08:21:40 +02:00
Alex Tselegidis
840fe915eb
Renamed the class filenames to Ucfirst.
2016-04-24 17:50:35 +02:00
