Commit graph

145 commits

Author SHA1 Message Date
74baecc207
branding to develop branch 2023-12-31 21:46:27 +03:00
a146375bf8
extra merge things 2023-12-22 23:51:54 +03:00
abfac25d81
merge changes from master branch 2023-12-22 23:44:48 +03:00
Alex Tselegidis
e6b3ffd66b Add support for custom fields on customers (#1133) 2023-12-11 09:54:29 +01:00
Alex Tselegidis
aa10b57b3a Remove line breaks from translations 2023-12-08 11:28:24 +01:00
Alex Tselegidis
c8a9e2c24b Enable prettier for php and reformat the entire application directory 2023-11-29 10:24:09 +01:00
Alex Tselegidis
e6ed92697f Add blocked periods section in the business settings page (#432) 2023-11-17 08:20:16 +01:00
Alex Tselegidis
f3d7b78b15 Add the blocked periods to the webhooks page (#432) 2023-11-17 08:06:34 +01:00
Alex Tselegidis
fbcd35f197 Add blocked period CRUD operations to the app (#432) 2023-11-03 18:25:23 +01:00
Alex Tselegidis
c37757e969 Translation changes 2023-10-26 08:11:48 +02:00
Alex Tselegidis
ae76ad7385 Do not allow a customer to book the same hours multiple times
(#1420)
2023-10-23 11:46:41 +02:00
Alex Tselegidis
c1535ef527 Typo in greek translation (#1425) 2023-10-16 11:48:23 +02:00
Alex Tselegidis
cbbcaa417f Corrections to the german translations (#1404) 2023-10-12 12:56:13 +02:00
Alex Tselegidis
3aba05bd28 Update the croatian translations 2023-10-04 16:39:28 +03:00
Alex Tselegidis
b1bf3ac3c0 Update the catalan translations 2023-10-04 15:55:41 +03:00
Alex Tselegidis
5473544258 Allow working plan exceptions to be defined as non-working days (#1383). 2023-07-10 08:22:55 +02:00
Alex Tselegidis
198c855b74 Update the newer german translation strings 2023-07-05 17:39:35 +02:00
Ronan LE MEILLAT
5cd3d9284a French translations 2023-06-13 15:05:52 +02:00
Ronan LE MEILLAT
ea1ff5fd1a missing \ 2023-06-13 14:00:33 +02:00
Ronan LE MEILLAT
0bcfd016c1 Update french translations 2023-06-13 11:59:39 +02:00
Alex Tselegidis
8dbe0842d8 Add Swedish as a selectable language in the web-ui (#1369). 2023-06-12 12:50:37 +02:00
Alex Tselegidis
791030ba60 Update the russian translation file 2023-04-24 09:43:28 +02:00
Alex Tselegidis
83a83755e4 Merge branch 'translaster-master' into develop 2023-04-24 09:43:03 +02:00
krote5k
01dfd12959 Russian translation is done 2023-04-17 15:17:47 +05:00
Alex Tselegidis
a5f5bbb071 Correct the german translation of "October" 2023-04-17 10:07:45 +02:00
Alex Tselegidis
299842cdb2 Correct language name in translation file 2023-03-17 08:00:04 +01:00
Alex Tselegidis
af1904679e Add the croatian translation files 2023-03-06 10:42:50 +01:00
Alex Tselegidis
629bdfc062 Add missing translations 2023-02-02 08:54:32 +01:00
Alex Tselegidis
655d98fc69 Update Italian language
# Conflicts:
#	application/language/italian/translations_lang.php
2022-12-12 09:20:57 +01:00
Eero Jääskeläinen
8c532d8552 Finnish: More linguistic duration text 2022-11-15 11:07:05 +02:00
Eero Jääskeläinen
1c67fc7ff6 Finnish translations 2022-11-09 09:14:07 +02:00
Alex Tselegidis
d8634dc366 Update the polish translation (thanks to #1312) 2022-10-19 16:12:07 +03:00
Alex Tselegidis
0f6df76667 Allow the users to define their own status and assign them to appointments (#244). 2022-10-16 21:54:26 +03:00
Alex Tselegidis
218bbea800
Merge pull request #1308 from herzogmedia/220927_updateGerman
Update german language files
2022-10-03 10:39:04 +03:00
Lukas Herzog
1da9c2586d update german language strings 2022-09-27 18:29:02 +02:00
Alex Tselegidis
d408b6040a Make sure at least one field is displayed in the booking page 2022-07-27 02:26:19 +03:00
Alex Tselegidis
2f289b48cb Add missing translation keys to german, persian and portuguese-br 2022-07-26 17:19:45 +03:00
Alex Tselegidis
b5788d47d8 Change the "book advance timeout" label to "allow rescheduling/cancellation before" for better clarity 2022-07-26 16:51:02 +03:00
Alex Tselegidis
cec1ef6175 Add missing translations 2022-07-26 16:40:00 +03:00
Alex Tselegidis
0d5e60cdb7 Add support for dynamic webhook definition in the settings page (#581) 2022-06-20 12:12:36 +03:00
Alex Tselegidis
2e21b05545 Rename the "limit_customer_visibility" setting to "limit_customer_access" 2022-05-27 09:23:38 +02:00
Alex Tselegidis
9b9888df47 Add new limit_customer_visibility setting (#1199) 2022-05-26 15:55:26 +02:00
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