Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
alextselegidis committed Jan 20, 2025
2 parents e7215b8 + 40b20c6 commit a3389ec
Show file tree
Hide file tree
Showing 14 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ developers to maintain and readjust their custom modifications on the main proje
- Improve the CalDAV syncing mechanism so that it connects to more systems without problems (#1622)
- Fix various 1.5.0 API issues (#1562)
- Correct email issues by replacing the internal email library with phpmailer (#1587)
- Fix ICS file mimetype (#1630)
- Fix ICS file mimetype (#1630)
- Incorrect Timezone Handling in CalDAV Synchronization Causes Time Shifts (#1626)
- No color change in the appointment modal window (in the backend calendar) (#1641)
- The plain user password might appear in the log messages in case of an error (#1590)
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "alextselegidis/easyappointments",
"description": "Open Source Web Scheduler",
"version": "dev-1.5.0",
"version": "1.5.1",
"homepage": "https://easyappointments.org",
"type": "project",
"license": "GPL-3.0",
Expand Down
2 changes: 1 addition & 1 deletion docs/caldav-calendar-sync.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@ clicking on "Enable Sync" > "CalDAV".
- Username: <username-from-previous-step>
- Password: <password-from-previous-step>

*This document applies to Easy!Appointments v1.5.0.*
*This document applies to Easy!Appointments v1.5.1.*

[Back](readme.md)
2 changes: 1 addition & 1 deletion docs/console.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,6 @@ php index.php console help

This command will give more information about the console capabilities.

*This document applies to Easy!Appointments v1.5.0.*
*This document applies to Easy!Appointments v1.5.1.*

[Back](readme.md)
2 changes: 1 addition & 1 deletion docs/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@ Phpldapadmin, an admin portal for openldap is available on `http://localhost:820

A production image of Easy!Appointments can be found at: https://github.com/alextselegidis/easyappointments-docker

*This document applies to Easy!Appointments v1.5.0.*
*This document applies to Easy!Appointments v1.5.1.*

[Back](readme.md)
2 changes: 1 addition & 1 deletion docs/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ You get this warning because PHP is not configured with a timezone setting. This
`date_default_timezone_set('America/Los_Angeles'); // Use your own timezone string.`


*This document applies to Easy!Appointments v1.5.0.*
*This document applies to Easy!Appointments v1.5.1.*

[Back](readme.md)
2 changes: 1 addition & 1 deletion docs/get-involved.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ You are more than welcome to help with the translation progress of the user inte

It would be much appreciated if you would take 5 minutes of your time to fill this small form on your experience with Easy!Appointments. User feedback is very important and will help with the future planning of the project. Fill the [E!A Feedback Form](https://docs.google.com/forms/d/15dw1jl7lUgw4q-XXMn13Gx_e8zJxAiyWYMOdqtZqIHU/viewform).

*This document applies to Easy!Appointments v1.5.0.*
*This document applies to Easy!Appointments v1.5.1.*

[Back](readme.md)
2 changes: 1 addition & 1 deletion docs/google-calendar-sync.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ Google Developers – https://developers.google.com/google-apps/calendar

E!A Support Group – https://groups.google.com/forum/#!forum/easy-appointments

*This document applies to Easy!Appointments v1.5.0.*
*This document applies to Easy!Appointments v1.5.1.*

[Back](readme.md)
2 changes: 1 addition & 1 deletion docs/installation-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ Finally just add a link in your website that points to your Easy!Appointments in

Happy Bookin'!

*This document applies to Easy!Appointments v1.5.0.*
*This document applies to Easy!Appointments v1.5.1.*

[Back](readme.md)
2 changes: 1 addition & 1 deletion docs/ldap.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,6 @@ The LDAP DN is a value that can also be manually set, either from the UI or from
If LDAP is enabled, Easy!Appointments will first try to check for the local credentials, but if this does not work, then
the app will try to check the password against the LDAP entry and log the user in.

*This document applies to Easy!Appointments v1.5.0.*
*This document applies to Easy!Appointments v1.5.1.*

[Back](readme.md)
2 changes: 1 addition & 1 deletion docs/manage-translations.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ Easy!Appointments is based upon CodeIgniter (PHP Framework) and it uses its buil

Follow these steps in order to add or adjust your translations and modify the message of the user interface of Easy!Appointments. If you want contribute to the translation process of Easy!Appointments please read the [Get Involved](https://github.com/alextselegidis/easyappointments/wiki/Get-Involved!) wiki page for more information. Please share your translations with the user community.

*This document applies to Easy!Appointments v1.5.0.*
*This document applies to Easy!Appointments v1.5.1.*

[Back](readme.md)
2 changes: 1 addition & 1 deletion docs/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ Welcome to the documentation pages of Easy!Appointments. Navigate through the av
- [CalDAV Calendar Sync](caldav-calendar-sync.md)
- [FAQ](faq.md)

*This document applies to Easy!Appointments v1.5.0.*
*This document applies to Easy!Appointments v1.5.1.*
2 changes: 1 addition & 1 deletion docs/rest-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,6 @@ fastcgi_param PHP_AUTH_PW $http_authorization;

[[Source]](http://serverfault.com/a/520943)

*This document applies to Easy!Appointments v1.5.0.*
*This document applies to Easy!Appointments v1.5.1.*

[Back](readme.md)
2 changes: 1 addition & 1 deletion docs/update-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,6 @@ Open your browser to the Easy!Appointments installation URL, login to the backen

Use the data of the old `configuration.php` file in the new `config.php`.

*This document applies to Easy!Appointments v1.5.0.*
*This document applies to Easy!Appointments v1.5.1.*

[Back](readme.md)

0 comments on commit a3389ec

Please sign in to comment.