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
|
9fbe6c6b8b
|
Update docs
|
2022-02-24 15:44:30 +01:00 |
|
Alex Tselegidis
|
f1ba0c2688
|
Applied the right software version to the doc files.
|
2021-10-18 13:51:00 +02:00 |
Caine85
|
2f76db0f14
|
Update console.md
Missing commands params.
|
2021-08-28 12:57:56 +02:00 |
|
Alex Tselegidis
|
ccd63eabe4
|
Updated doc references
|
2020-12-12 13:42:51 +02:00 |
|
Alex Tselegidis
|
87f3755197
|
Added information about the console support
|
2020-12-05 10:58:38 +02:00 |