ifl/iflrandevu
1
1
Fork 0
forked from mirrors/easyappointments
Code Issues 6 Pull requests Releases 3 Activity
1295 commits 2 branches 38 tags 38 MiB
Commit graph

228 commits

Author SHA1 Message Date
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
1e0f61c4e4 Merge branch 'develop' of https://github.com/alextselegidis/easyappointments into develop 2020-03-09 21:19:32 +01:00
Alex Tselegidis
af296cf147 Book advance timeout must span in multiple days (#365, #428). 2020-03-09 21:15:03 +01:00
alext
da98768cd0 Unset the provider settings property for the book success page (#664). 2019-12-04 09:48:57 +01:00
oxteam
45db34cb52 Merge branch 'develop' into oxteam-dev-first_week_day 2019-07-30 14:38:59 +02:00
alext
44cd035448 Merged pull request #260 - Add 'Location' option to Services [Not a required field] 2019-06-08 17:03:32 +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
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
alext
0d91792d36 Customers will now be able to remove all their data from the system (#480). 2018-06-24 19:08:45 +02:00
alext
d171a5b2ee Save consent every time the customer updates his data (#480). 2018-06-24 17:27:16 +02:00
alext
60f48e24ee Integrated new legal content settings in the booking page (#480). 2018-06-24 16:58:03 +02:00
oxteam
8fa38aa139 Fix computation of unavailable dates for ANY_PROVIDER option (#475). 
(cherry picked from commit 523e260)
 2018-06-03 15:20:30 +02:00
oxteam
b99d8c49f5 Use $selected_date instead of its equivalent coming from the POST (#469). 
(cherry picked from commit 36dbde8)
 2018-06-03 15:15:01 +02:00
oxteam
39677ffe91 Fix date format when calling _search_any_provider (#469) 
(cherry picked from commit b8e1fc3)
 2018-06-03 15:13:41 +02:00
alext
6fe70d0723 Unavailable dates generation must take into concern the appointment edit mode of the booking page (#433). 2018-04-23 15:58:04 +02:00
alext
baa2e58951 The Appointments API endpoint must only return appointment records and no unavailabilities. 2018-04-13 14:54:50 +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
5147d0ad68 Added error messages with more information for the installation page (#452) 2018-03-28 14:36:28 +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
a2588dbe21 Do not display expected captcha phrase on failures. 2018-02-23 15:33:41 +01:00
alext
d60193c926 Corrected availabilities generation in booking page. 2018-02-06 15:35:10 +01:00
alext
950866d90f Corrections for the any-provider option. 2018-02-05 15:48:43 +01:00
alext
ea53955f71 Corrected conditions when fetching events that start or end outside the displayed period of time for back-end calendar page. 2018-02-02 14:49:06 +01:00
alext
71b847135a The availabilities generation must take into concern events that belong in the past but end at some time in the future. 2018-02-02 14:48:22 +01:00
alext
75b7fe69f6 Added fix for endless loop issue during availabilities generation. 2018-02-02 14:40:01 +01:00
alext
e013943fde Reformatted code files. 2018-01-23 10:08:37 +01:00
alext
d4c3a68368 Updated the availabilities generation of REST API (fixes #315 and #337). 2018-01-02 12:55:52 +01:00
alext
6923520f7c Marked methods as deprecated. 2018-01-02 12:17:45 +01:00
alext
85dec33466 Full day appointment with multiple attendants are now being taken into 
concern while generating availabilities. (fixes #337 and #315).
 2018-01-02 11:23:06 +01:00
alext
716378f074 Only load the required events and not all the database records (for better performance). 2017-12-05 22:34:56 +01:00
alext
c3642a10e3 Added support for aggregations in appointments REST API. 2017-12-01 09:12:09 +01:00
alext
8df2e51a73 Added view file for the update page. 2017-11-15 22:51:46 +01:00
alext
35d812a550 Added ICS invitation files in notifications as attachments. 2017-11-02 14:09:15 +01:00
alext
4c6547de09 Passed date_format setting to the email notifications class. 2017-10-31 11:42:53 +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
579b59b1ec Integrated input class in controllers. 2017-09-19 15:44:32 +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
c8991a5858 Date format must be included in the company settings. 2017-09-14 15:18:51 +02:00
alext
539e753b80 Adjusted phpdoc blocks in controller classes. 2017-09-06 15:22:11 +02:00
alext
cdde2fb501 Customers weren't able to change the application language in frontend. 2017-08-01 08:39:03 +02:00
alext
f67d4768bb Do not use start_session directly as the required options from app config are not being used (#334). 2017-06-11 21:12:21 +02:00
alext
2dad4dfc34 Updated copyright year. 2017-01-31 07:35:34 +01:00