Merge branch 'master' into master

pull/170/head
gkconsulting 2017-05-15 22:27:57 +02:00 zatwierdzone przez GitHub
commit 9286c3d1e0
3 zmienionych plików z 4 dodań i 4 usunięć

Wyświetl plik

@ -217,6 +217,8 @@ gdalinfo --version
```
Should all work without errors.
Ubuntu 16.04 LTS users can refer to this [script](https://gist.githubusercontent.com/lkpanganiban/5226cc8dd59cb39cdc1946259c3fea6e/raw/f9f41ad0c1dfdd2d26a452d3b2732dbaf3fd3608/webodm_install.sh) to install WebODM natively on a new machine.
## OpenDroneMap, node-OpenDroneMap, WebODM... what?
The [OpenDroneMap project](https://github.com/OpenDroneMap/) is composed of several components.

Wyświetl plik

@ -77,7 +77,7 @@ ul#side-menu.nav{
.content{
clear: both;
padding-top: 56px;
padding-top: 60px;
h1,h2,h3,h4,h5{
padding-top: 4px;
@ -224,6 +224,3 @@ button i.glyphicon{
top: 0px;
}
.content {
padding-top: 100px;
}

Wyświetl plik

@ -78,6 +78,7 @@ rebuild(){
run "rm -fr node_modules/ || sudo rm -fr node_modules/"
run "rm -fr nodeodm/external/node-OpenDroneMap || sudo rm -fr nodeodm/external/node-OpenDroneMap"
run "docker-compose build --no-cache"
run "docker images --no-trunc -aqf \"dangling=true\" | xargs docker rmi"
echo -e "\033[1mDone!\033[0m You can now start WebODM by running $0 start"
}