Skip to content

Commit

Permalink
Merge pull request #99 from sensebox/development
Browse files Browse the repository at this point in the history
Merge `development` into `master`
Changes:
- Move Sketch generation into separate package loaded through npm
- Sketches are now always generated on-the-fly at each request
- More Slack notifications for addBox, removeBox, addUser, removeUser
- Fix #96 e-mail addresses are not compared case insensitive
- move code from controllers to models
  • Loading branch information
ubergesundheit authored Jul 31, 2017
2 parents 7a79858 + 4d5e66d commit e3d797d
Show file tree
Hide file tree
Showing 51 changed files with 962 additions and 3,220 deletions.
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
node_modules
mongo-data
userimages
usersketches
osem-mongo
docker-compose.yml
Dockerfile
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ node_modules

config/index.js

usersketches
userimages
mongo-data
.env
Expand Down
3 changes: 0 additions & 3 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@ dump

npm-debug.log
node_modules
files/
!files/template.ino

usersketches
userimages
mongo-data
.env
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ openSenseMap-API
================

[![Join the chat at https://gitter.im/sensebox/openSenseMap-API](https://badges.gitter.im/sensebox/openSenseMap-API.svg)](https://gitter.im/sensebox/openSenseMap-API?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
This is the back-end for [openSenseMap](http://opensensemap.org).
This is the back-end for [openSenseMap](https://opensensemap.org).

openSenseMap is part of the [senseBox](http//sensebox.de) project.
To get more information about openSenseBox and senseBox visit the before mentioned links or have a look at this [video](https://www.youtube.com/watch?v=uTOWYa42_rI).
openSenseMap is part of the [senseBox](https://sensebox.de) project.
To get more information about openSenseMap and senseBox visit the before mentioned links or have a look at this [video](https://www.youtube.com/watch?v=uTOWYa42_rI).

Originally, this API has been built as part the bachelor thesis of @mpfeil at the ifgi (Institute for Geoinformatics, WWU Münster).

Expand Down
1 change: 0 additions & 1 deletion config/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ const isProdEnv = function isProdEnv () {
// environment variables starting with `OSEM_` will override the values here.
// Example: `OSEM_targetfolder` will override the setting for `targetFolder`
const config = {
targetFolder: './usersketches/', // absolute location of generated arduino sketch ino files
imageFolder: './userimages/', // absolute location of user images
logFolder: './logs/', // absolute location of error log files

Expand Down
1 change: 0 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ services:
- ./app.js:/usr/src/app/app.js
- ./lib:/usr/src/app/lib
- ./config/index.js:/usr/src/app/config/index.js
- ./usersketches:/usr/src/app/usersketches
- ./userimages:/usr/src/app/userimages
env_file: .env
depends_on:
Expand Down
230 changes: 0 additions & 230 deletions files/deprecated/template_gisgk/template_gisgk.ino

This file was deleted.

Loading

0 comments on commit e3d797d

Please sign in to comment.