Commit graph

1631 commits

Author SHA1 Message Date
oxteam
c0a33d1116 French translation improved. 2018-06-03 18:56:12 +02:00
alext
4659f90fc2 Merge branch 'master' into hotfix_gdpr 2018-06-03 16:53:06 +02:00
alext
b301dafd9d Merge branch 'master' into develop 2018-06-03 16:52:39 +02:00
alext
9ef42e7343 Disable search buttons when editing admin record in backend 2018-06-03 16:25:37 +02:00
alext
212f4e0d4e Typo corrections in the structure.sql 2018-06-03 16:23:45 +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
alext
55d8c1e1fe Updated CHANGELOG.md 2018-06-03 15:47:57 +02:00
alext
7508790f31 Database migration fixes (from 1.2.1 to 1.3.x) (#495).
(cherry picked from commit 40e13cb7d8)
2018-06-03 15:42:29 +02:00
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
Andrea
e7c1415526 Update italian translation file 2018-04-12 16:55:45 +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
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