From e5487b4ad862c3ccad65aa8df97ba07aa537ef65 Mon Sep 17 00:00:00 2001 From: Joel Collins Date: Thu, 25 Jun 2020 15:54:54 +0100 Subject: [PATCH] Removed submodule stuff --- .gitlab-ci.yml | 5 ----- README.md | 2 +- openflexure_microscope/api/static/README.md | 15 ++------------- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bd947a73..379984f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,12 +15,7 @@ build: stage: build image: nikolaik/python-nodejs:python3.7-nodejs14 - variables: - GIT_SUBMODULE_STRATEGY: recursive - before_script: - - git submodule sync --recursive - - git submodule update --init --recursive - curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python script: diff --git a/README.md b/README.md index 8670cda0..e2733291 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Full developer documentation can be found on [**ReadTheDocs**](https://openflexu This includes installing the server in a mode better suited for active development. ## Installation -* `git clone --recurse-submodules https://gitlab.com/openflexure/openflexure-microscope-server.git` +* `git clone https://gitlab.com/openflexure/openflexure-microscope-server.git` * (If running on a microscope Pi) `ofm activate` * `poetry install` * `poetry run build_static` diff --git a/openflexure_microscope/api/static/README.md b/openflexure_microscope/api/static/README.md index fe2c20e5..1e8fbe26 100644 --- a/openflexure_microscope/api/static/README.md +++ b/openflexure_microscope/api/static/README.md @@ -1,23 +1,12 @@ # OpenFlexure Microscope JS Client -[![pipeline status](https://gitlab.com/openflexure/openflexure-microscope-jsclient/badges/master/pipeline.svg?style=flat-square)](https://gitlab.com/openflexure/openflexure-microscope-jsclient/commits/master) - -A user client for the OpenFlexure Microscope, written in Vue.js. - -## Install - -A general guide on setting up your microscope can be found [here on our website](https://www.openflexure.org/projects/microscope/). - -## Develop -* Clone the repo, and run `npm install` -* Scripts to build and serve are included in `package.json` ## Developer notes ### VS Code and ESLint -To prevent the editor from interfering with ESLint, add to your project `settings.json `: +To prevent the editor from interfering with ESLint, add to your project `settings.json`: -``` +```json { "editor.tabSize": 2, "cSpell.enabled": false,