Commit graph

1218 commits

Author SHA1 Message Date
alext
955b2bdc55 Merge remote-tracking branch 'origin/master' 2018-06-03 15:32:56 +02:00
alext
a8fa3cc959 Updated CHANGELOG.md for 1.3.1 2018-06-03 15:32:03 +02:00
Alex Tselegidis
3b0d9d6fa0
Merge pull request #488 from oxteam/oxteam-patch-fr_trans-1
Update French translation
2018-06-03 15:23:13 +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
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
3d1ec7c22e Replaced hardcoded string with translated value on appointment removal email notification (#491). 2018-06-03 15:05:18 +02:00
alext
4311a6205d Updated CHANGELOG.md for 1.3.1 2018-06-03 14:59:40 +02:00
oxteam
3d27d05b58
Update French translation 2018-05-27 17:38:34 +02:00
alext
a2d72c068c Corrected migration classes for v1.3.1. 2018-04-30 14:10:25 +02:00
alext
68c67af57b Removed class from non working event. 2018-04-30 13:49:16 +02:00
alext
299c840d28 Merge branch 'master' into develop 2018-04-26 14:16:13 +02:00
alext
afbb3cc62e Updated CHANGELOG.md for 1.3.1 2018-04-25 14:02:21 +02:00
alext
ae77d72458 Merge branch 'hotfix' 2018-04-25 13:57:08 +02:00
alext
433b9862c7 Updated initial migration value (#438). 2018-04-25 13:47:40 +02:00
alext
96a1f85cc4 Updated version in documentation files. 2018-04-25 13:43:35 +02:00
alext
2592ae4fb8 Renamed gfx directory 2018-04-25 13:41:12 +02:00
alext
27fa6a80c2 Removed rsc/db directory (database structure must only located into assets/sql). 2018-04-25 13:40:53 +02:00
alext
d23ec0483c Removed "ea" prefix from db constraints (#438) 2018-04-25 13:40:13 +02:00
alext
1b0afa292c Remove prefix from foreign key constraint names. 2018-04-24 15:26:24 +02:00
alext
6df2389287 Corrections in the migration classes (update secure, defensive checks, #438). 2018-04-24 15:26:07 +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
9805fe7c80 Updated cache busting parameter. 2018-04-23 09:58:35 +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
alext
3432d4e9ea Merge branch 'patch-1' of https://github.com/AurelienC/easyappointments into hotfix 2018-04-13 14:58:20 +02:00
alext
cc7399c23f Merge branch 'Caine85-patch-2' into hotfix 2018-04-13 14:56:23 +02:00
alext
baa2e58951 The Appointments API endpoint must only return appointment records and no unavailabilities. 2018-04-13 14:54:50 +02:00
alext
7ee9f24f5a Corrected working plan parsing for foreign languages (#461). 2018-04-09 13:50:00 +02:00
Caine85
8c16a52d2c
Update Appointments.php
Bug fix: Appointments Parser crashes when a provider break is added to the schedule
2018-04-09 12:06:48 +02:00
Aurélien
31639bb1db
Update translations_lang.php
About issue #455
2018-04-04 18:03:23 +02:00
alext
271652c2b7 Path corrections in the phpunit.xml file. 2018-03-29 14:55:14 +02:00
alext
76daf6db01 Corrected vendor path in tests bootstrap.php file. 2018-03-29 14:52:53 +02:00
alext
40ec49673d Moved phpunit.xml file into the root of the project for better use with terminal commands. 2018-03-29 14:52:26 +02:00
alext
ead4ae5985 Corrections in the datetimepicker and timepicker formatting. 2018-03-28 14:41:27 +02:00
alext
bbffd75a51 Updated version number and cache busting parameter. 2018-03-28 14:37:26 +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
52be9ff9d7 Merge branch 'develop' into hotfix 2018-03-09 07:57:31 +01:00
alext
43b9cf678b Corrected time format use in booking page. 2018-03-08 14:59:13 +01:00
alext
632f7539eb Updated the time format values in the email notification files. 2018-03-08 14:56:31 +01:00
alext
1caccb731a Changed the time formatting in javascript files. 2018-03-08 14:55:51 +01:00
alext
7bcca1b5db Added timezone setting in back-end. 2018-03-06 22:50:31 +01:00
alext
917d7fa6bb Added translations for the time format setting. 2018-03-06 22:47:57 +01:00
alext
7c620c6734 Added time format setting in the database and created migration file. 2018-03-06 22:46:33 +01:00