Commit graph

103 commits

Author SHA1 Message Date
Alex Tselegidis
e09647d01f Fix the booking cancellation flow and make sure analytics are loaded in both confirmation and cancellation (#1200) 2022-05-26 15:35:17 +02:00
Alex Tselegidis
6666e5862c Support multiple Bootswatch themes for the app (#1205). 2022-05-22 14:39:19 +02:00
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
d4b69cd553 Update italian translation 2022-05-10 14:45:09 +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
f0e976c9ac Update Catalan translation (thanks to Marc Folch) 2022-04-25 14:10:23 +02:00
Alex Tselegidis
899de8f029 Update turkish translation (thanks to Doğukan Sahil) 2022-04-25 14:08:20 +02:00
Alex Tselegidis
227612565d Correct translation message key 2022-04-19 09:14:13 +02:00
Alex Tselegidis
c332a3621e Add serbian translation 2022-04-19 09:12:49 +02:00
tanielkirikal
083e747740
Update translations_lang.php 2022-04-01 12:02:36 +03:00
tanielkirikal
6b12815f4b
Update translations_lang.php 2022-03-31 17:27:22 +03:00
tanielkirikal
c48579b906
Add estonian translation 2022-03-31 17:08:04 +03:00
Alex Tselegidis
5378bc4940
Merge branch 'develop' into develop 2022-02-10 20:28:29 +01: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
7d9e3279bf Booking message styling updates. 2022-01-24 13:12:44 +01:00
Alex Tselegidis
79652feba9 Booking confirmation styling updates. 2022-01-24 12:58:48 +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
Kim Holzmann
52ac27cee1 danish translation 2021-12-11 23:27:35 +01:00
Kim Holzmann
6c321b5c2c Update email_lang.php
Dansih translation
2021-12-11 23:15:11 +01:00
Kim Holzmann
cdd1e49a13 Danish translation
Danish translation
2021-12-11 23:12:11 +01:00
alextselegidis
1cd0d45153 Converted the settings menu to a dropdown widget 2021-11-22 08:09:56 +01:00
alextselegidis
702089beb7 Removed period from translation key 2021-11-12 21:26:43 +01:00
Thomas Saedt
9671def4ea Merge branch 'develop' into 1081_hide_data_fields 2021-10-20 22:12:47 +02:00
Alex Tselegidis
6606340da4 Update French translations (#1107). 2021-10-18 13:54:38 +02:00
Alex Tselegidis
03f5fed5a6 Merge branch 'lourdas-master' into develop 2021-10-04 09:38:20 +02:00
Alex Tselegidis
a210c32b73 Czech translation corrections 2021-10-04 09:25:44 +02:00
Vasileios Lourdas
0d708077ca Updated Greek language file.
Fixed a few typos and translated a couple of messages.
2021-09-26 20:01:24 +03:00
Thomas Saedt
bc87d5a573 [1081] added rudimentary translations for client form settings 2021-05-30 13:53:06 +02:00
Thomas S
ea2cdeff70 [1081] Added visual buttons to hide or show form fields 2021-05-29 20:58:08 +02:00
Vitor Mattos
ab07b585f0 Update translation 2021-04-16 20:51:31 -03:00
Vitor Mattos
de867ef4c5 Remove duplicated translate key 2021-04-16 20:33:14 -03:00
Vitor Mattos
ca57834262 New translation 2021-04-16 19:14:13 -03:00
Vitor Mattos
f6437ce1bc Update pt_BR translations 2021-04-16 14:08:59 -03:00
Alex Tselegidis
f9bb741810 Merge branch 'add-ga4-support' of https://github.com/c0un7-z3r0/easyappointments into develop
# Conflicts:
#	application/language/german/translations_lang.php
2021-04-07 10:44:00 +02:00
Alex Tselegidis
25ca6a2349 Added additional translation files in the persian languages directory 2021-04-07 10:35:53 +02:00
Alex Tselegidis
65bc7a2092 Merge branch 'develop' of https://github.com/mhsenpc/easyappointments into develop
# Conflicts:
#	application/config/config.php
2021-04-07 10:35:00 +02:00