Commit graph

16 commits

Author SHA1 Message Date
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
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
alext
e013943fde Reformatted code files. 2018-01-23 10:08:37 +01: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
0998e85001 Updated comments in model classes. 2017-09-08 14:03:45 +02:00
alext
32b275b73c Replaced intval with (int) constructor. 2017-08-08 09:49:39 +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
89725e75c0 Added calendar-view setting in the UI (#182). 2016-07-18 23:46:15 +02:00
Alex Tselegidis
0caff545a9 Removed unnecessary constructor methods from model classes. 2016-07-17 13:07:59 +02:00
Alex Tselegidis
9c82805b83 Added 'calendar_view' setting in models (#182). 2016-07-17 12:49:27 +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
Renamed from src/application/models/providers_model.php (Browse further)