Alex Tselegidis
|
6dce7b2f33
|
Merge branch 'mickemartinsson-master' into develop
# Conflicts:
# application/config/autoload.php
# application/config/config.php
# application/controllers/Appointments.php
# application/controllers/Backend.php
# application/controllers/Backend_api.php
# application/controllers/Captcha.php
# application/controllers/Console.php
# application/controllers/Google.php
# application/controllers/Installation.php
# application/controllers/Localization.php
# application/core/EA_Controller.php
# application/core/EA_Model.php
# application/helpers/rate_limit_helper.php
# application/language/swedish/translations_lang.php
# application/libraries/Google_sync.php
# application/libraries/Ics_file.php
# application/models/Settings_model.php
# application/views/appointments/book_success.php
# assets/css/layouts/backend_layout.scss
# assets/css/no_privileges.css
# assets/js/backend_calendar_table_view.js
# assets/js/backend_calendar_unavailability_events_modal.js
# assets/js/frontend_book.js
# assets/js/frontend_book_success.js
# assets/js/general_functions.js
# assets/js/working_plan_exceptions_modal.js
# composer.lock
# gulpfile.js
# index.php
# package-lock.json
# system/libraries/Email.php
|
2022-05-10 14:48:46 +02:00 |
|
Alex Tselegidis
|
edfba8bf7d
|
Update package-lock.json
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
d2e18c8287
|
Release v1.4.3
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
ccca6202fc
|
Make sure the window.cookieconsent object is loaded before using it, as some browsers or extensions might block it
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
980fc3b6f7
|
Reduce the default rate limit duration to 2 minutes
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
cb19a192a9
|
Do not display empty messages
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
300ff3c2a7
|
Only show the any-provider option if there are more than one providers
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
611c0ea07d
|
Prepend the any-provider option in the booking page
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
b500b9fe1b
|
Corrected working plan exception removal issue on table view
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
848e41c5fc
|
Reset add-break button disabled state
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
24f6f99cf2
|
Update CHANGELOG.md
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
93c9c1dae4
|
Correct css file name
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
9efb46ba4b
|
Add missing customer data from stripped array
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
64cc3dfc21
|
Update patch.php
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
bd9e9ff2e5
|
Add the patch.php file to the repository.
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
3c36724aae
|
Release v1.4.3-beta.1
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
49e2808b98
|
Fix timezone issue with add-to-google link of the booking page (#1216)
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
18f15ea7d1
|
Update docs
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
0eff82c2b9
|
Update CHANGELOG.md
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
a759cb89f7
|
Replace Google Client JS with the Google Calendar Template link in the book success page (#1216)
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
df0b461fef
|
Gulp build will also copy the system folder (#1207)
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
384d442409
|
Security configuration enhancements in the application (#1208)
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
886343f80c
|
PHP 8.1 support (#1209)
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
2228ae3d04
|
Minor style fix in backend.css
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
6c42576f68
|
PHP 8.1 support (#1209)
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
617222ae2a
|
Provider and secretary users can only add unavailabilities for their authorized users (#1214)
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
cc697fc09e
|
The table calendar view breaks for secretaries and providers due to appointment and unavailability removals (#1211)
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
9b70a9bd5c
|
Remove the Google Calendar read-only scope use as it is not needed (#1212)
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
17e68c9726
|
Switch to go-to-latest database migration configuration for simplicity (#1213)
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
3dd57021e2
|
Move the change language operation into a new public controller (#1210)
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
068dd5f6af
|
PHP 8.1 support (#1209)
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
10a5eb46f9
|
Remove the Google Calendar read-only scope use as it is not needed (#1212)
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
6d828f91a8
|
Gulp build will also copy the system folder (#1207)
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
0bb7a0e537
|
PHP 8.1 support (#1209)
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
c14a88ed93
|
Update the system path (#1207)
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
2a422aae48
|
Add the new system directory (#1207)
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
7e8ca4fb23
|
Remove CodeIgniter from the vendor dependencies (#1207)
|
2022-05-10 14:46:14 +02:00 |
|
Alex Tselegidis
|
d4b69cd553
|
Update italian translation
|
2022-05-10 14:45:09 +02:00 |
|
Alex Tselegidis
|
353a13fa38
|
Soft-Delete customer appointments when deleting a customer.
|
2022-05-10 14:40:19 +02:00 |
|
Alex Tselegidis
|
0e316e7dea
|
Merge pull request #1206 from albertsalles4/develop
Fix Datepicker in Backend's Calendar Header does not change accordinly to language and first day #1201
|
2022-05-10 14:34:25 +02:00 |
|
Alex Tselegidis
|
739d26d914
|
Merge pull request #1248 from JanC/content-type-fix
Better content type header parsing
|
2022-05-10 14:33:09 +02:00 |
|
Alex Tselegidis
|
6b738a1ea5
|
Check only in the non-deleted customers, when validating the email address (#1246)
|
2022-05-10 14:28:56 +02:00 |
|
Alex Tselegidis
|
98bf660aa2
|
Correct permissions for the customers controller
|
2022-05-10 14:28:56 +02:00 |
|
Alex Tselegidis
|
75542d48c0
|
Replace double quote with single quote
|
2022-05-10 14:28:55 +02:00 |
|
Alex Tselegidis
|
403edba15f
|
Merge pull request #1245 from JanC/1244-secreterie-providers
[1244] Fix providers not visible for secretaries
|
2022-05-10 13:51:44 +02:00 |
|
Alex Tselegidis
|
0742b275ef
|
Merge pull request #1243 from JanC/1231-email-validation
[1231] Validate appointment email only when set
|
2022-05-10 13:48:50 +02:00 |
|
Alex Tselegidis
|
5de23ab889
|
Merge pull request #1242 from JanC/1241-trim-baseurl
[1241] Trim base url slashes
|
2022-05-10 13:42:10 +02:00 |
|
Alex Tselegidis
|
b949375fe6
|
Merge pull request #1240 from JanC/1239-secretary-fix
[1239] Fix Secretary cannot book a new appointment
|
2022-05-10 13:40:49 +02:00 |
|
Alex Tselegidis
|
5bfdd57db8
|
Merge pull request #1229 from tanielkirikal/develop
Add Estonian translation
|
2022-05-10 13:14:29 +02:00 |
|
Alex Tselegidis
|
23c626da14
|
Update 3rd party packages
|
2022-05-10 13:13:55 +02:00 |
|