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
|
227612565d
|
Correct translation message key
|
2022-04-19 09:14:13 +02:00 |
|
mickemartinsson
|
f090dbfc5a
|
Swedish translation
New and updated translation to Swedish
|
2022-02-05 08:53:11 +01:00 |
|
Alex Tselegidis
|
4c0793129d
|
The calendar will ask for the kind of event to be added after selecting time slots with the mouse.
|
2022-01-24 22:55:35 +01:00 |
|
Alex Tselegidis
|
03010184f6
|
Improve the display of the booking link for services, providers and service-provider combinations.
|
2022-01-24 22:37:05 +01:00 |
|
Alex Tselegidis
|
4f5fbb8262
|
Display appointments from all providers in one view.
|
2022-01-24 22:07:24 +01:00 |
|
Alex Tselegidis
|
d580463977
|
Add reset company color button so that the color can be easily switched back to the original state.
|
2022-01-24 20:58:15 +01:00 |
|
Alex Tselegidis
|
2f41c28786
|
Add a new "is_private" flag to services and providers so that they do not appear in the booking page (#378).
|
2022-01-24 20:50:14 +01:00 |
|
Alex Tselegidis
|
2bf9a6193e
|
Add a new setting that toggles the login link of the booking page (#1148).
|
2022-01-24 20:02:17 +01:00 |
|
Alex Tselegidis
|
e9a9314909
|
Enable the change of the brand logo and colors from the backend (#789).
|
2022-01-24 18:36:12 +01:00 |
|
Alex Tselegidis
|
083a3e07f6
|
Add the ability to temporarily block new appointments / set away message (#940).
|
2022-01-24 16:38:03 +01:00 |
|
Alex Tselegidis
|
e1fe30d73b
|
Update the backend header setting menu item titles.
|
2022-01-24 15:56:14 +01:00 |
|
Alex Tselegidis
|
e659bd6e08
|
Add soft phone number validation (#820).
|
2022-01-24 15:48:20 +01:00 |
|
Alex Tselegidis
|
59c44994f7
|
Add custom Matomo analytics integration (#974).
|
2022-01-19 10:18:00 +01:00 |
|
Alex Tselegidis
|
36cf005da2
|
Add "color" to translation files.
|
2022-01-18 18:54:22 +01:00 |
|
Alex Tselegidis
|
09775d25d5
|
Rename all "unavailable" occurrences to "unavailability" for consistency.
|
2022-01-18 12:54:41 +01:00 |
|
Alex Tselegidis
|
4eec5fbe46
|
Refactored the booking settings page functionality and structure
|
2021-12-20 09:16:44 +01:00 |
|
Alex Tselegidis
|
568ff9be2e
|
Renamed the service category resource to just category
|
2021-12-15 08:00:48 +01:00 |
|
alextselegidis
|
1cd0d45153
|
Converted the settings menu to a dropdown widget
|
2021-11-22 08:09:56 +01:00 |
|
Thomas Saedt
|
bc87d5a573
|
[1081] added rudimentary translations for client form settings
|
2021-05-30 13:53:06 +02:00 |
|
Alex Tselegidis
|
e79c2d558e
|
Added comment at the end of the language files so that new keys can be easily inserted
|
2021-03-25 12:38:29 +01:00 |
|
Alex Tselegidis
|
0af112723d
|
Added missing translation keys in language files
|
2021-03-25 12:34:46 +01:00 |
|
Alex Tselegidis
|
76672db959
|
Make sure that the duration of a service does not become less than the minimum acceptable value as otherwise it will make problems with the availability generation
|
2021-03-25 11:32:10 +01:00 |
|
Alex Tselegidis
|
731fb52ab4
|
Display confirmation modal when disabling a connected Google Calendar Sync (#955).
|
2020-12-12 14:22:25 +02:00 |
|
Alex Tselegidis
|
190e2d792a
|
Updated the swedish translation (thanks to Thomas Dilts)
|
2020-12-01 09:39:02 +02:00 |
|
Alex Tselegidis
|
0e6fdebe0f
|
Completed the working plan exceptions feature.
|
2020-10-20 16:05:00 +03:00 |
|
Alex Tselegidis
|
13ff9cfc4a
|
Replaced exclamation mark with period in translation messages.
|
2020-09-28 13:51:12 +03:00 |
|
Alex Tselegidis
|
30eb95461a
|
Improvements and fixes on the custom availability feature
|
2020-09-23 12:24:42 +03:00 |
|
Alex Tselegidis
|
f05a4be918
|
Renamed the step_*_title translation keys to meaningful keys based on their content (most translations kept unchanged as the previous texts still matches)
|
2020-09-03 14:57:17 +03:00 |
|
Johan Idstam
|
8236b39e84
|
Swedish for translations_lang.php
|
2020-05-18 21:44:03 +02:00 |
|