ifl
/
iflrandevu
forked from mirrors/easyappointments
1
1
Fork 0
Code Issues 6 Pull Requests Releases 3 Activity
2,847 Commits 2 Branches 38 Tags 55 MiB
Commit Graph

938 Commits

Author SHA1 Message Date
Alex Tselegidis 353a13fa38 Soft-Delete customer appointments when deleting a customer. 2022-05-10 14:40:19 +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 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 e3d3673ebf Add max password length constant 2022-05-09 23:26:46 +02:00
Alex Tselegidis 63dbb51dec Check the role slug in Api.php 2022-05-09 23:26:28 +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
Jan Chaloupecky a8ef23f81d Better content type header parsing 2022-04-25 10:12:01 +02:00
Jan Chaloupecky c7437fddc1 Fixed base url trailing slash 2022-04-22 13:27:33 +02:00
Jan Chaloupecky 6429dabb41 Added secretary_providers in the JS script_vars 2022-04-22 13:15:06 +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
Alex Tselegidis 326c86f94e Update rate limit function signature 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 5036c90222
Add estonian language to config.php 2022-03-31 17:10:10 +03:00
tanielkirikal c48579b906
Add estonian translation 2022-03-31 17:08:04 +03:00
Alex Tselegidis 76f9d2c6b8 Release v1.5.0-dev.2 2022-03-29 12:01:06 +02:00
Alex Tselegidis 0564ded317 Perform various DB migration fixes and improvements 2022-03-29 10:35:50 +02:00
Alex Tselegidis efc532664a Use grouped_timezones consistently across the app controllers 2022-03-29 10:16:07 +02:00
Alex Tselegidis 669aa2f6c6 Add customer language and timezone fields to the appointments modal (#1094) 2022-03-29 10:15:24 +02:00
Alex Tselegidis c5ab2849cd Change login URL in the installation template 2022-03-29 09:58:31 +02:00
Alex Tselegidis 942cb3d46f Update the usage of the localization http client across all layouts and pages 2022-03-28 08:33:45 +02:00
Alex Tselegidis 8f66376b74 Move the change change language method to the new localization controller (removed from account) 2022-03-28 08:30:51 +02:00
Alex Tselegidis 2f67141d75 Apply the new add-to-google button for 1.5 2022-03-28 08:18:00 +02:00
Alex Tselegidis 1b20f49f9d Rearrange main controller create/update commands 2022-03-25 12:50:40 +01:00
Alex Tselegidis cb410f739d Merge unset statements wherever possible 2022-03-25 12:46:49 +01:00
Alex Tselegidis e4e285931f Move the consent creation process to when the appointment gets created and not earlier 2022-03-25 12:44:05 +01:00
Alex Tselegidis afe21e3960 Set the create_datetime value when creating a new consent 2022-03-25 12:43:23 +01:00
Alex Tselegidis 62d3a00fd9 Remove unnecessary file (post-merge fix) 2022-03-25 12:40:48 +01:00
Alex Tselegidis e11814057d Whitelist other incoming request params 2022-03-25 12:29:17 +01:00
Alex Tselegidis b7833643c2 Whitelist incoming account update request params (#1225) 2022-03-25 11:59:00 +01:00
Alex Tselegidis 0452e9543d Perform styling improvements in final booking step 2022-03-25 11:09:29 +01:00
Alex Tselegidis 2d88e720ae Add more contrast 2022-03-25 11:02:07 +01:00
Alex Tselegidis 328dc1b0ee Auto load the new rate limit helper 2022-03-25 10:58:17 +01:00
Alex Tselegidis a3b8228122 Merge branch '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/core/EA_Controller.php
#	application/core/EA_Model.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/general_functions.js
#	assets/js/pages/booking_confirmation.js
#	assets/js/working_plan_exceptions_modal.js
#	composer.json
#	composer.lock
#	docs/console.md
#	docs/docker.md
#	docs/faq.md
#	docs/get-involved.md
#	docs/google-calendar-sync.md
#	docs/installation-guide.md
#	docs/manage-translations.md
#	docs/readme.md
#	docs/rest-api.md
#	docs/update-guide.md
#	gulpfile.js
#	system/core/Input.php
#	system/core/Output.php
#	system/core/Security.php
#	system/libraries/Session/drivers/Session_files_driver.php
 2022-03-25 10:53:46 +01:00
Alex Tselegidis 44af526a6f Release v1.4.3 2022-03-08 18:27:15 +01:00
Alex Tselegidis c1a8dba1a3 Reduce the default rate limit duration to 2 minutes 2022-03-08 17:25:25 +01:00
Alex Tselegidis 293f4fe663 Add missing customer data from stripped array 2022-03-04 18:04:53 +01:00
Alex Tselegidis 16613905ba Release v1.4.3-beta.1 2022-02-25 11:19:40 +01:00
Alex Tselegidis dce26bafe0 Fix timezone issue with add-to-google link of the booking page (#1216) 2022-02-24 15:58:30 +01:00
Alex Tselegidis f7ffb25f05 Replace Google Client JS with the Google Calendar Template link in the book success page (#1216) 2022-02-24 15:38:51 +01:00
Alex Tselegidis bb71c97736 Security configuration enhancements in the application (#1208) 2022-02-23 14:54:41 +01:00
Alex Tselegidis aeee91f4ed PHP 8.1 support (#1209) 2022-02-23 13:42:27 +01:00
Alex Tselegidis cc5d219311 Provider and secretary users can only add unavailabilities for their authorized users (#1214) 2022-02-23 12:00:39 +01:00
Alex Tselegidis b841864bc9 The table calendar view breaks for secretaries and providers due to appointment and unavailability removals (#1211) 2022-02-23 11:42:30 +01:00
Alex Tselegidis 9c87d53079 Remove the Google Calendar read-only scope use as it is not needed (#1212) 2022-02-23 11:33:26 +01:00
Alex Tselegidis cd1842fc40 Switch to go-to-latest database migration configuration for simplicity (#1213) 2022-02-23 11:29:45 +01:00
Alex Tselegidis 1cf4f5246f Move the change language operation into a new public controller (#1210) 2022-02-23 11:09:24 +01:00
Alex Tselegidis 5569369b15 Remove the Google Calendar read-only scope use as it is not needed (#1212) 2022-02-23 11:02:09 +01:00
Alex Tselegidis ed178ca631 PHP 8.1 support (#1209) 2022-02-23 09:35:50 +01:00
Alex Tselegidis c133b24874 Remove unused "render" helper file from the project as it is no longer used (use the components instead). 2022-02-10 20:57:38 +01:00
Alex Tselegidis 3d71f019e2 Add missing parameter to Secretaries_model.php 2022-02-10 20:54:27 +01:00
Alex Tselegidis 6d404b0a9a The installation page uses the custom bootstrap style. 2022-02-10 20:54:15 +01:00
Alex Tselegidis 7fdc5cf7fe Correct the installation page (#1187) 2022-02-10 20:40:44 +01: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 050478492c Make the captcha challenges more user friendly. 2022-01-26 22:04:33 +01:00
Alex Tselegidis 4410c5fb8c Release v1.5.0-dev.1 2022-01-25 00:11:51 +01:00
Alex Tselegidis 24f6b5b4e9 Move cache busting parameter out of config.php 2022-01-25 00:11:43 +01:00
Alex Tselegidis ccc503e618 Touch the new timestamp fields on insert/update. 2022-01-24 23:42:13 +01:00
Alex Tselegidis 2c203ae1aa Add support for soft appointment, service, customer and provider removals (#1115). 2022-01-24 23:32:42 +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 987dc4aaeb Add missing "me-2" class to sync button. 2022-01-24 22:41:09 +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 42534ffcb3 Service duration values shorter than 5 minutes should be acceptable via the services page (#1110). 2022-01-24 22:09:30 +01:00
Alex Tselegidis 4f5fbb8262 Display appointments from all providers in one view. 2022-01-24 22:07:24 +01:00
Alex Tselegidis 97f98c5118 All the user roles with access to the backend calendar page can filter by service (#956). 2022-01-24 21:57:17 +01:00
Alex Tselegidis d4d7fd13d0 Add a border between the display selected service and provider provider 2022-01-24 21:23:41 +01:00
Alex Tselegidis 9271c21fba Optimize column display in the booking page. 2022-01-24 21:15:33 +01:00
Alex Tselegidis ab4e404fac The display-selected-service and display-selected-provider elements will be invisible by default. 2022-01-24 21:05:43 +01:00
Alex Tselegidis 442c644c01 Move the terms and privacy checkbox to the last step. 2022-01-24 21:04:03 +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 cd51576217 Update about page content 2022-01-24 17:43:44 +01:00
Alex Tselegidis ca01a25e19 Load the new file utility for on layout files. 2022-01-24 17:11:13 +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 ff5b03fe53 Bottom margin between legal setting contents. 2022-01-24 15:53:07 +01:00
Alex Tselegidis e659bd6e08 Add soft phone number validation (#820). 2022-01-24 15:48:20 +01:00
Alex Tselegidis 08f09d66a9 Change placeholder service and provider text. 2022-01-24 15:47:02 +01:00
Alex Tselegidis f31fcfbca7 Company name styling. 2022-01-24 15:45:24 +01:00
Alex Tselegidis 458595fa24 Add an option to deactivate the remove-all-data function for customers (#808). 2022-01-24 15:31:42 +01:00
Alex Tselegidis 5982a79852 Skip the first booking step if both service and provider were preselected (#1117). 2022-01-24 15:22:34 +01:00
Alex Tselegidis 296cfd31c9 Reduce margin in booking_settings.php template. 2022-01-24 14:20:09 +01:00
Alex Tselegidis a91d6c0ce6 Language selection bg color in backend pages. 2022-01-24 14:18:47 +01:00
Alex Tselegidis 5ca7d93781 Change the dropdown-menu-right to dropdown-menu-end (bootstrap v5). 2022-01-24 13:48:06 +01:00
Alex Tselegidis ad8308794c The login/logout/recovery page have a better structure. 2022-01-24 13:42:13 +01:00
Alex Tselegidis becf82ad67 Change the success elements with the primary brand 2022-01-24 13:41:59 +01:00
Alex Tselegidis aa00c97fb3 Styling changes to the booking cancellation frame. 2022-01-24 13:28:29 +01:00
Alex Tselegidis 7d9e3279bf Booking message styling updates. 2022-01-24 13:12:44 +01:00
Alex Tselegidis 500bf90cd1 Correct variable initialization for booking cancellation frame. 2022-01-24 13:09:57 +01:00
Alex Tselegidis 79652feba9 Booking confirmation styling updates. 2022-01-24 12:58:48 +01:00