From 6244e73c13999dae021e957647405bb61289399e Mon Sep 17 00:00:00 2001 From: Diego Ferreira Date: Mon, 14 Oct 2019 00:58:21 -0700 Subject: [PATCH 1/2] Update README.md --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index 259c560c3..e4682590b 100644 --- a/README.md +++ b/README.md @@ -56,6 +56,7 @@ Another moving part is the new-ish Annotations 2.0 which uses [Leaflet.Illustrat Please consider which installation method you prefer. Cloud Installation requires fewer steps and is platform agnostic, but you may value working from your terminal, for familiarity, more. - [Standard Installation](#Standard-Installation) +- [Windows Installation](#windows-installation) - [Cloud Installation](#Cloud-Installation)
@@ -195,6 +196,14 @@ $ rails server -b 0.0.0.0
+### Windows Installation +We recommend you either work in a virtual environment, or on a dual booted system to avoid dependencies issues and also Unix system works smoother with Ruby and Rails. This will not only benefit you now for mapknitter, but in future working on other Ruby projects +on as they will get into development further, a linux or mac based OS would be better. +1. [Dual Booting](https://www.tecmint.com/install-ubuntu-alongside-with-windows-dual-boot/amp/), [option2](https://askubuntu.com/questions/1031993/how-to-install-ubuntu-18-04-alongside-windows-10), [video guide](https://www.youtube.com/watch?v=qNeJvujdB-0&fbclid=IwAR0APhs89jlNR_ENKbSwrp6TI6P-wxlx-a0My9XBvPNAfwtADZaAXqcKtP4) +2. [Setting up a linux virtual env](https://itsfoss.com/install-linux-in-virtualbox/) + +
+ ## Logging in when running locally Because MapKnitter uses a remote OpenID login system that depends on PublicLab.org, it can be hard to log in when running it locally. To get around this, we've created a local login route that requires no password: From d3e864badd1dc2ed6c87f49015ef9fa97b16b380 Mon Sep 17 00:00:00 2001 From: Cess Date: Sun, 10 Nov 2019 22:45:57 +0300 Subject: [PATCH 2/2] correct grammar --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e4682590b..54a89b0c4 100644 --- a/README.md +++ b/README.md @@ -197,8 +197,8 @@ $ rails server -b 0.0.0.0
### Windows Installation -We recommend you either work in a virtual environment, or on a dual booted system to avoid dependencies issues and also Unix system works smoother with Ruby and Rails. This will not only benefit you now for mapknitter, but in future working on other Ruby projects -on as they will get into development further, a linux or mac based OS would be better. +We recommend you either work in a virtual environment, or on a dual booted system to avoid dependencies issues and also Unix system works smoother with Ruby and Rails. This will not only benefit you now for Mapknitter, but also in future while working on other Ruby projects, a Linux or Mac OS will make your life easier. + 1. [Dual Booting](https://www.tecmint.com/install-ubuntu-alongside-with-windows-dual-boot/amp/), [option2](https://askubuntu.com/questions/1031993/how-to-install-ubuntu-18-04-alongside-windows-10), [video guide](https://www.youtube.com/watch?v=qNeJvujdB-0&fbclid=IwAR0APhs89jlNR_ENKbSwrp6TI6P-wxlx-a0My9XBvPNAfwtADZaAXqcKtP4) 2. [Setting up a linux virtual env](https://itsfoss.com/install-linux-in-virtualbox/)