diff --git a/README.md b/README.md index d84a44f9e..da5cc1648 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ environment via `docker-compose`. Just clone the repository, run the following c and visit http://localhost:3000 in your browser. ``` -$ git clone https://gitlab.com/bramw/baserow.git +$ git clone --branch master https://gitlab.com/bramw/baserow.git $ cd baserow $ docker-compose up ``` @@ -61,7 +61,7 @@ Execute the following commands to start a development version of the baserow env which has debug and hot re-loading features enabled. ``` -$ git clone https://gitlab.com/bramw/baserow.git +$ git clone --branch master https://gitlab.com/bramw/baserow.git $ cd baserow $ docker-compose -f docker-compose.yml -f docker-compose.dev.yml up $ # OR use our ./dev.sh script which also ensures your dev containers run as your user @@ -96,7 +96,7 @@ Created by Bram Wiepjes (Baserow) - bram@baserow.io. Distributes under the MIT license. See `LICENSE` for more information. -Version: 1.2.0 +Version: 1.3.0 The official repository can be found at https://gitlab.com/bramw/baserow. diff --git a/backend/setup.py b/backend/setup.py index 62833a2cd..71d700e71 100644 --- a/backend/setup.py +++ b/backend/setup.py @@ -6,7 +6,7 @@ from setuptools import find_packages, setup PROJECT_DIR = os.path.dirname(__file__) REQUIREMENTS_DIR = os.path.join(PROJECT_DIR, "requirements") -VERSION = "1.2.0" +VERSION = "1.3.0" def get_requirements(env): diff --git a/backend/src/baserow/config/settings/base.py b/backend/src/baserow/config/settings/base.py index c622ecdf9..06657478b 100644 --- a/backend/src/baserow/config/settings/base.py +++ b/backend/src/baserow/config/settings/base.py @@ -212,7 +212,7 @@ SPECTACULAR_SETTINGS = { "name": "MIT", "url": "https://gitlab.com/bramw/baserow/-/blob/master/LICENSE", }, - "VERSION": "1.2.0", + "VERSION": "1.3.0", "SERVE_INCLUDE_SCHEMA": False, "TAGS": [ {"name": "Settings"}, diff --git a/changelog.md b/changelog.md index 544ca44ad..444f29c12 100644 --- a/changelog.md +++ b/changelog.md @@ -2,6 +2,8 @@ ## Unreleased +## Released (2021-06-02) + * Fixed bug where the grid view would fail hard if a cell is selected and the component is destroyed. * Made it possible to import a JSON file when creating a table. diff --git a/deploy/cloudron/CloudronManifest.json b/deploy/cloudron/CloudronManifest.json index 38e0eee4d..f79d9c3a4 100644 --- a/deploy/cloudron/CloudronManifest.json +++ b/deploy/cloudron/CloudronManifest.json @@ -8,7 +8,7 @@ "contactEmail": "bram@baserow.io", "icon": "file://logo.png", "tags": ["no-code", "nocode", "database", "data", "collaborate", "airtable"], - "version": "1.2.0", + "version": "1.3.0", "healthCheckPath": "/_health", "httpPort": 80, "addons": { diff --git a/deploy/cloudron/Dockerfile b/deploy/cloudron/Dockerfile index 2d954d095..b5aed2b12 100644 --- a/deploy/cloudron/Dockerfile +++ b/deploy/cloudron/Dockerfile @@ -18,7 +18,7 @@ RUN service supervisor stop && service nginx stop RUN rm -f /etc/nginx/sites-enabled/* ADD start.sh /app/code -RUN git clone https://gitlab.com/bramw/baserow.git +RUN git clone --branch master https://gitlab.com/bramw/baserow.git RUN virtualenv -p python3 env RUN env/bin/pip install --no-cache -r baserow/backend/requirements/base.txt RUN (cd baserow/web-frontend && yarn install && yarn build) diff --git a/deploy/cloudron/README.md b/deploy/cloudron/README.md index 8105f78ae..c346c09de 100644 --- a/deploy/cloudron/README.md +++ b/deploy/cloudron/README.md @@ -1,11 +1,11 @@ **Build** ``` -$ docker build -t registry.gitlab.com/bramw/baserow/cloudron:1.2.0 . +$ docker build -t registry.gitlab.com/bramw/baserow/cloudron:1.3.0 . ``` **Push** ``` -$ docker push registry.gitlab.com/bramw/baserow/cloudron:1.2.0 +$ docker push registry.gitlab.com/bramw/baserow/cloudron:1.3.0 ``` diff --git a/docs/development/running-the-dev-environment.md b/docs/development/running-the-dev-environment.md index 6baf31c49..cfecd3102 100644 --- a/docs/development/running-the-dev-environment.md +++ b/docs/development/running-the-dev-environment.md @@ -11,7 +11,7 @@ dev environment locally, otherwise please start from the Installing Requirements below. ```bash -$ git clone https://gitlab.com/bramw/baserow.git +$ git clone --branch master https://gitlab.com/bramw/baserow.git $ cd baserow $ docker-compose -f docker-compose.yml -f docker-compose.dev.yml up $ # OR use our ./dev.sh script which also ensures your dev containers run as your user @@ -67,7 +67,7 @@ Baserow's code to your computer. ``` $ cd ~/baserow -$ git clone https://gitlab.com/bramw/baserow.git +$ git clone --branch master https://gitlab.com/bramw/baserow.git Cloning into 'baserow'... ... $ cd baserow diff --git a/docs/guides/installation/install-on-cloudron.md b/docs/guides/installation/install-on-cloudron.md index b143190b4..c71916601 100644 --- a/docs/guides/installation/install-on-cloudron.md +++ b/docs/guides/installation/install-on-cloudron.md @@ -35,14 +35,14 @@ to your machine. This contains the Cloudron manifest file that you need when ins the app. ``` -$ git clone https://gitlab.com/bramw/baserow.git +$ git clone --branch master https://gitlab.com/bramw/baserow.git $ cd baserow/deploy/cloudron ``` After that you can install the Baserow Cloudron app by executing the following commands. ``` -$ cloudron install -l baserow.{YOUR_DOMAIN} --image registry.gitlab.com/bramw/baserow/cloudron:1.2.0 +$ cloudron install -l baserow.{YOUR_DOMAIN} --image registry.gitlab.com/bramw/baserow/cloudron:1.3.0 App is being installed. ... App is installed. @@ -67,7 +67,7 @@ First you need to figure out what your app id is. You can do so by executing the the latest version. ``` -cloudron update --app {YOUR_APP_ID} --image registry.gitlab.com/bramw/baserow/cloudron:1.2.0 +cloudron update --app {YOUR_APP_ID} --image registry.gitlab.com/bramw/baserow/cloudron:1.3.0 ``` > Note that you must replace the image with the most recent image of Baserow. The diff --git a/docs/guides/running-baserow-locally.md b/docs/guides/running-baserow-locally.md index 4b4d8cc11..97d32da06 100644 --- a/docs/guides/running-baserow-locally.md +++ b/docs/guides/running-baserow-locally.md @@ -10,7 +10,7 @@ building your own production Baserow setup. If you are familiar with git and docker-compose run these commands to launch baserow locally, otherwise please start from the Installing Requirements section below. ```bash -$ git clone https://gitlab.com/bramw/baserow.git +$ git clone --branch master https://gitlab.com/bramw/baserow.git $ cd baserow $ docker-compose up ``` @@ -58,7 +58,7 @@ Baserow's code to your computer. ``` $ cd ~/baserow -$ git clone https://gitlab.com/bramw/baserow.git +$ git clone --branch master https://gitlab.com/bramw/baserow.git Cloning into 'baserow'... ... $ cd baserow diff --git a/docs/plugins/boilerplate.md b/docs/plugins/boilerplate.md index f50226d4e..91b799f23 100644 --- a/docs/plugins/boilerplate.md +++ b/docs/plugins/boilerplate.md @@ -15,7 +15,7 @@ python and pip. ``` $ cd ~/baserow $ pip install cookiecutter -$ git clone https://gitlab.com/bramw/baserow.git +$ git clone --branch master https://gitlab.com/bramw/baserow.git Cloning into 'baserow'... ``` diff --git a/web-frontend/package.json b/web-frontend/package.json index 1e523891b..f7ac0aa48 100644 --- a/web-frontend/package.json +++ b/web-frontend/package.json @@ -1,6 +1,6 @@ { "name": "baserow", - "version": "1.2.0", + "version": "1.3.0", "private": true, "description": "Baserow: open source no-code database web frontend.", "author": "Bram Wiepjes (Baserow)",