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
|
66cf2b8882
|
Merge branch 'athAtp-patch-2' into develop
# Conflicts:
# docker-compose.prod.yml
# docker-compose.yml
|
2020-03-09 21:59:10 +01:00 |
|
athAtp
|
631cc01e33
|
Update installation.js
Hello,
Thank you for your work! The installation did not display errors.
|
2020-02-17 03:14:53 +02:00 |
|
alext
|
14bbd793bf
|
Merged pull request #282 - Added action link icons in the backend calendar page, event popover component.
|
2019-06-08 17:20:49 +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
|
62e28d381d
|
Merged pull request #221 - Fixed/Improved sort breaks increasingly by hour within day
|
2019-06-08 16:48:24 +02:00 |
|
alext
|
84afca8b26
|
Integrated location field in the backend section.
|
2019-06-08 16:43:21 +02:00 |
|
alext
|
b3b1815c8d
|
Providers should not be able to create appointments for other providers in the backend calendar page. #510
|
2018-07-29 16:08:41 +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
|
064b0580fb
|
Use translation for the personal information 'delete' button.
|
2018-07-12 14:49:14 +02:00 |
|
alext
|
66aacd7e6b
|
Use moment objects when rendering appointments in fullcalendar.
|
2018-06-26 09:54:43 +02:00 |
|
alext
|
caa45a65f1
|
Performance optimization in backend calendar page, after the user clicks the insert appointment button. (#500)
|
2018-06-24 19:42:42 +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 |
|
alext
|
54076bd244
|
Integrated legal contents in backend settings page (#480).
|
2018-06-24 15:46:58 +02:00 |
|
alext
|
9ef42e7343
|
Disable search buttons when editing admin record in backend
|
2018-06-03 16:25:37 +02:00 |
|
alext
|
0e3ff2493e
|
Backend settings are not being displayed on page load when the user is not an admin (#497).
|
2018-06-03 15:58:44 +02:00 |
|
oxteam
|
3428c6552a
|
Fix for unselectable calendar when switching from service to provider view (#483).
(cherry picked from commit 9c2de28)
|
2018-06-03 15:21:16 +02:00 |
|
alext
|
68c67af57b
|
Removed class from non working event.
|
2018-04-30 13:49:16 +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
|
5f56eb4c2d
|
Removed unnecessary call for calendar events.
|
2018-04-23 09:52:47 +02:00 |
|
alext
|
cfaafc2674
|
Corrected start and end datetime parsing when editing unavailabilities.
|
2018-04-19 16:50:28 +02:00 |
|
alext
|
2d7fa2bd8f
|
Corrected class name for break event.
|
2018-04-15 10:29:36 +02:00 |
|
alext
|
c26b111ab2
|
Pre-select the modified appointment date when editing an existing appointment in the booking form.
|
2018-04-15 08:34:01 +02:00 |
|
Andrea
|
684bb22a38
|
BugFix agendaDay View
|
2018-04-12 16:46:45 +02:00 |
|
Andrea
|
721df5833d
|
Update for new time format
|
2018-04-12 16:15:18 +02:00 |
|
Andrea
|
7d8746f40a
|
Update for new time format
|
2018-04-12 16:05: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
|
7ee9f24f5a
|
Corrected working plan parsing for foreign languages (#461).
|
2018-04-09 13:50:00 +02:00 |
|
alext
|
ead4ae5985
|
Corrections in the datetimepicker and timepicker formatting.
|
2018-03-28 14:41:27 +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 |
|
alext
|
4ed30b6822
|
Corrected translation key for server communication error.
|
2018-03-27 09:19:27 +02:00 |
|
alext
|
610f184aad
|
Further formatting corrections.
|
2018-03-17 18:00:55 +01:00 |
|
alext
|
43b9cf678b
|
Corrected time format use in booking page.
|
2018-03-08 14:59:13 +01:00 |
|
alext
|
1caccb731a
|
Changed the time formatting in javascript files.
|
2018-03-08 14:55:51 +01: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
|
99bfc1e3ab
|
Disable calendar modifications when viewing services in back-end.
|
2018-02-23 15:29:53 +01:00 |
|
alext
|
7d6f87f7bf
|
Corrected creation of provider columns in back-end table view (#381).
|
2018-02-08 22:00:22 +01:00 |
|
alext
|
edbe78c6f4
|
The details string of the error message box becomes a button.
|
2018-02-02 08:19:28 +01:00 |
|
alext
|
e013943fde
|
Reformatted code files.
|
2018-01-23 10:08:37 +01:00 |
|
alext
|
3e58a98765
|
Added message in installation page when base url contains a trailing slash.
|
2018-01-23 09:51:56 +01:00 |
|
alext
|
7aae2f359b
|
Appointment management modal is not updated after appointment duration resize (#155).
|
2018-01-17 22:06:42 +01:00 |
|
alext
|
ab00577ac2
|
Provider services and secretary providers boxes use the .well class.
|
2018-01-02 13:14:13 +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
|
3a9ae7f4a3
|
Corrected initial values of working plan script.
|
2017-12-20 15:16:09 +01:00 |
|
alext
|
5058e380ae
|
Replaced jquery ui spinner component with native number input field.
|
2017-11-28 15:42:12 +01:00 |
|
alext
|
afc0349fcf
|
Changed backend users tab order.
|
2017-11-20 14:04:05 +01:00 |
|