Skip to content

Commit

Permalink
Merge 73dc13b into 405871c
Browse files Browse the repository at this point in the history
  • Loading branch information
Hisham waleed karam committed Aug 5, 2018
2 parents 405871c + 73dc13b commit 1d72211
Show file tree
Hide file tree
Showing 6 changed files with 82 additions and 6,800 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ install:
- sudo apt-get install -y --force-yes oracle-java8-installer ant maven2 --no-install-recommends
- sudo update-java-alternatives --set java-8-oracle
- pip install celery
- pip install geonode>2.7.5.dev20180125135927
- pip install -e . --upgrade
- pip install django-autocomplete-light==2.3.3
- pip install coveralls
Expand All @@ -51,4 +50,6 @@ after_success:
notifications:
email:
- hisham.karam@cartologic.com
- hishamwaleedkaram@gmail.com
- hishamwaleedkaram@gmail.com
- ahmednosman@cartologic.com
- ahmedNourElDeen@cartologic.com
11 changes: 7 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
[![GitHub stars](https://img.shields.io/github/stars/cartologic/cartoview.svg)](https://github.com/cartologic/cartoview/stargazers)
[![GitHub forks](https://img.shields.io/github/forks/cartologic/cartoview.svg)](https://github.com/cartologic/cartoview/network)
[![Coverage Status](https://coveralls.io/repos/github/cartologic/cartoview/badge.svg?branch=master)](https://coveralls.io/github/cartologic/cartoview?branch=master)
[![Build Status](https://travis-ci.org/cartologic/cartoview.svg?branch=master)](https://travis-ci.org/cartologic/cartoview)
[![GitHub license](https://img.shields.io/github/license/cartologic/cartoview.svg)](https://github.com/cartologic/cartoview/blob/master/LICENSE)
[![GitHub issues](https://img.shields.io/github/issues/cartologic/cartoview.svg)](https://github.com/cartologic/cartoview/issues)
[![Twitter](https://img.shields.io/twitter/url/https/github.com/cartologic/cartoview.svg?style=social)](https://twitter.com/intent/tweet?text=Wow:&url=https%3A%2F%2Fgithub.com%2Fcartologic%2Fcartoview)
Expand All @@ -12,6 +14,8 @@
- CartoView is a GIS Web Mapping Application Market.
- Cartoview extends the popular [GeoNode](http://geonode.org/) SDI to provide the ability to create, share, and visualize GIS Web Mapping Applications very easily and very quickly from the browser without programming.

***

## Docker Installation:
- install [docker](https://docs.docker.com/v17.12/install/#server) and [docker-compose](https://docs.docker.com/compose/install/#prerequisites)
- clone cartoview and navigate to cartoview folder
Expand All @@ -35,6 +39,8 @@
- start the containers with `docker-compose up -d` or `make up`
- stop the containers with `docker-compose down` or `make down`

***

## How To Add Cartoview To Existing Geonode:
- install cartoview with pip:
- `pip install cartoview --no-cache-dir`
Expand Down Expand Up @@ -65,7 +71,4 @@
from cartoview.app_manager.settings import load_apps
INSTALLED_APPS += load_apps()
```
- restart your server

## Docs:
- [How to use and install](http://cartologic.github.io)
- **restart your server**
4 changes: 2 additions & 2 deletions cartoview/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@


def get_current_version():
import geonode.version
return geonode.version.get_version(__version__)
from .version import get_version
return get_version(__version__)
Loading

0 comments on commit 1d72211

Please sign in to comment.