From a2a1f9a061e8f2f3c0a631c26a8144c3c18be27f Mon Sep 17 00:00:00 2001 From: sweagent Date: Sun, 21 Apr 2024 20:09:27 +0000 Subject: [PATCH 1/2] Fix: In the Version V1.14.0, the README is not up to date Closes #356 --- README.md | 9 --------- documentation/Development_Environment_Setup.md | 1 + documentation/Installation.md | 1 + documentation/Release_Process.md | 1 + documentation/Update.md | 1 + 5 files changed, 4 insertions(+), 9 deletions(-) create mode 100644 documentation/Development_Environment_Setup.md create mode 100644 documentation/Installation.md create mode 100644 documentation/Release_Process.md create mode 100644 documentation/Update.md diff --git a/README.md b/README.md index 3c44e02b..d9244fe0 100644 --- a/README.md +++ b/README.md @@ -26,15 +26,6 @@ | --- | --- | --- | --- | | [![Django CI](https://github.com/KoalixSwitzerland/koalixcrm/actions/workflows/django.yml/badge.svg)](https://github.com/KoalixSwitzerland/koalixcrm/actions/workflows/django.yml) | [![Codacy Badge](https://app.codacy.com/project/badge/Grade/cfae578b5c174f438786c935fa425002)](https://app.codacy.com/gh/KoalixSwitzerland/koalixcrm/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
[![Codacy Badge](https://app.codacy.com/project/badge/Coverage/cfae578b5c174f438786c935fa425002)](https://app.codacy.com/gh/KoalixSwitzerland/koalixcrm/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_coverage)| [![Docker Automated build](https://img.shields.io/docker/automated/koalixswitzerland/koalixcrm.svg)]()
[![Docker Stars](https://img.shields.io/docker/stars/koalixswitzerland/koalixcrm.svg)]() [![Docker Pulls](https://img.shields.io/docker/pulls/koalixswitzerland/koalixcrm.svg)]() | [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/koalix-crm/Lobby) | -## Demos -The demo-branch is automatically deployed and can be found here: -[Demo-Deployment](https://demo.koalixcrm.koalix.net/admin/). - -To be able to log in use the following credentials - ## Documentation You can find the documentation of koalixcrm here: [doc](http://readthedocs.org/docs/koalixcrm/en/master/) diff --git a/documentation/Development_Environment_Setup.md b/documentation/Development_Environment_Setup.md new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/documentation/Development_Environment_Setup.md @@ -0,0 +1 @@ + diff --git a/documentation/Installation.md b/documentation/Installation.md new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/documentation/Installation.md @@ -0,0 +1 @@ + diff --git a/documentation/Release_Process.md b/documentation/Release_Process.md new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/documentation/Release_Process.md @@ -0,0 +1 @@ + diff --git a/documentation/Update.md b/documentation/Update.md new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/documentation/Update.md @@ -0,0 +1 @@ + From 7142e1160f46a1097fe20fe5fa2804c709e09915 Mon Sep 17 00:00:00 2001 From: Aaron Riedener Date: Mon, 22 Apr 2024 21:40:05 +0200 Subject: [PATCH 2/2] [Issue #356] ci: Update the koalixcrm version to 1.14.1 --- README.md | 9 ++++++++- koalixcrm/version.py | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d9244fe0..efd0cd85 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,14 @@ You can find the documentation of koalixcrm here: [doc](http://readthedocs.org/d Some information about the installation of koalixcrm: [installation](https://github.com/scaphilo/koalixcrm/wiki/Installation) ## Development environment setup -Information about the development environment setup for this and similar projects can be found here: [Development environment setup](https://github.com/scaphilo/koalixcrm/wiki/Development-Environment-Setup) +To set up the development environment for KoalixCRM, you can use Docker with the following commands: + +docker-compose pull +docker-compose up + +To run the application, use: + +docker compose run --service-ports web python manage.py runserver 0.0.0.0:8000 --settings=projectsettings.settings.development_docker_sqlite_settings.py ## Release Process Information about the release process: [Release Process](https://github.com/scaphilo/koalixcrm/wiki/Release-Process) diff --git a/koalixcrm/version.py b/koalixcrm/version.py index 30bf4725..8c5e6707 100644 --- a/koalixcrm/version.py +++ b/koalixcrm/version.py @@ -1 +1 @@ -KOALIXCRM_VERSION = "1.14.0" +KOALIXCRM_VERSION = "1.14.1"