From e562fa4cfee75c2ccead5564a5211ac8571e5ab2 Mon Sep 17 00:00:00 2001 From: Erling Aaby Date: Wed, 24 Apr 2013 23:02:01 +0200 Subject: Text inserted into divid home --- views/home.ejs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/views/home.ejs b/views/home.ejs index 2b35cec..b292012 100644 --- a/views/home.ejs +++ b/views/home.ejs @@ -59,6 +59,14 @@

Passer for alle

Divid er for alle. Å dele er sosialt og derfor holder Divid det sosialt.

+
-- cgit v1.2.3 From 09dccdca7bd42227f64266f9b1ca944ba42b3b3d Mon Sep 17 00:00:00 2001 From: Erling Aaby Date: Wed, 24 Apr 2013 23:05:59 +0200 Subject: Edited img in Divid home --- views/home.ejs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/views/home.ejs b/views/home.ejs index b292012..a216168 100644 --- a/views/home.ejs +++ b/views/home.ejs @@ -76,7 +76,9 @@
  • Bruk appen fra din Iphone, Android eller windows mobile. Du kan legge til utgifter og utlegg underveis.
- + + +
-- cgit v1.2.3 From ea1388c71ac290b07f89877ab00ae038c0f4b035 Mon Sep 17 00:00:00 2001 From: Erling Aaby Date: Wed, 24 Apr 2013 23:08:53 +0200 Subject: fixed img name iphone --- public/img/Iphone.png | Bin 7339 -> 4280 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/public/img/Iphone.png b/public/img/Iphone.png index 77f1b60..cb03917 100644 Binary files a/public/img/Iphone.png and b/public/img/Iphone.png differ -- cgit v1.2.3 From 075e1c95e12d68c7d407d9853a1f0290d5f18fa8 Mon Sep 17 00:00:00 2001 From: Erling Aaby Date: Wed, 24 Apr 2013 23:10:59 +0200 Subject: fix img --- views/home.ejs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/views/home.ejs b/views/home.ejs index a216168..417a07b 100644 --- a/views/home.ejs +++ b/views/home.ejs @@ -76,9 +76,9 @@
  • Bruk appen fra din Iphone, Android eller windows mobile. Du kan legge til utgifter og utlegg underveis.
- - - + + +
-- cgit v1.2.3 From 72b09d12dbcfaa1b25901c32f73321a98dd40543 Mon Sep 17 00:00:00 2001 From: Erling Aaby Date: Wed, 24 Apr 2013 23:13:33 +0200 Subject: edited names img --- public/img/Iphone.png | Bin 4280 -> 0 bytes public/img/iph.png | Bin 0 -> 4280 bytes views/home.ejs | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 public/img/Iphone.png create mode 100644 public/img/iph.png diff --git a/public/img/Iphone.png b/public/img/Iphone.png deleted file mode 100644 index cb03917..0000000 Binary files a/public/img/Iphone.png and /dev/null differ diff --git a/public/img/iph.png b/public/img/iph.png new file mode 100644 index 0000000..cb03917 Binary files /dev/null and b/public/img/iph.png differ diff --git a/views/home.ejs b/views/home.ejs index 417a07b..23eb67f 100644 --- a/views/home.ejs +++ b/views/home.ejs @@ -76,7 +76,7 @@
  • Bruk appen fra din Iphone, Android eller windows mobile. Du kan legge til utgifter og utlegg underveis.
- +
-- cgit v1.2.3 From 00a051700656d172214522e56170626919b2929e Mon Sep 17 00:00:00 2001 From: Erling Aaby Date: Wed, 24 Apr 2013 23:16:44 +0200 Subject: text edit --- views/home.ejs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/views/home.ejs b/views/home.ejs index 23eb67f..1b51a16 100644 --- a/views/home.ejs +++ b/views/home.ejs @@ -85,7 +85,8 @@

Hvordan bruke divid

    -
  • Vi tar bryet og løser delingen rettferdig. Ikke la uvissheten om at du glemmer eller manglende tillit til folk hindre deg i dele eller låne. Divid hjelper deg med å holde oversikt over dine utlegg og lån.
    • +
  • Vi tar bryet og løser delingen rettferdig. Ikke la uvissheten om at du glemmer eller manglende tillit til folk hindre deg i dele eller låne.
    • +
  • Divid hjelper deg med å holde oversikt over dine utlegg og lån.
  • Hold venner og bekjente oppdatert med hva de skylder deg og vice versa.
  • Du slipper kvitteringer - ta bilde av de og kast de i søpla. Bildene lastes opp til Divids servere så har du de senere hvis det er bruk for de.
  • Eller ta bilde av personen med gjenstanden vedkommende har lånt av deg.
    • -- cgit v1.2.3 From db923920329463cabb0d3e36caef89ea5fa03af5 Mon Sep 17 00:00:00 2001 From: Erling Aaby Date: Wed, 24 Apr 2013 23:21:06 +0200 Subject: text edit --- views/home.ejs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/views/home.ejs b/views/home.ejs index 1b51a16..d53395e 100644 --- a/views/home.ejs +++ b/views/home.ejs @@ -17,13 +17,12 @@
    -

    Prøv Divid

    -

    Opprett prosjekt

    -
    -

    Inviter deltakere

    -
    -

    Del utgifter

    +

    Prøv Divid

    +

    Opprett prosjekt

    +

    Inviter deltakere

    +

    Del utgifter

    Registrer » +

    Appen er tilgjengelig her:

    -- cgit v1.2.3 From 2b88c49fe74881c28ae5dabc716f9935cd27d3a6 Mon Sep 17 00:00:00 2001 From: Erling Aaby Date: Wed, 24 Apr 2013 23:22:32 +0200 Subject: text edit --- views/home.ejs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/views/home.ejs b/views/home.ejs index d53395e..deb7e4d 100644 --- a/views/home.ejs +++ b/views/home.ejs @@ -18,9 +18,11 @@

    Prøv Divid

    -

    Opprett prosjekt

    -

    Inviter deltakere

    -

    Del utgifter

    +
      +

      Opprett prosjekt

      +

      Inviter deltakere

      +

      Del utgifter

      +
    Registrer »

    Appen er tilgjengelig her:

    -- cgit v1.2.3 From dd23f3a913c4c0b1bb3dc2b9a5c1477f9df23706 Mon Sep 17 00:00:00 2001 From: Dennis Eriksen Date: Wed, 24 Apr 2013 23:31:08 +0200 Subject: cleaned up package.json --- package.json | 49 +++++++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index e218182..48ae466 100644 --- a/package.json +++ b/package.json @@ -1,22 +1,31 @@ { - "name": "DERS", - "version": "0.0.1", - "private": true, - "scripts": { - "start": "nodemon app" - }, - "dependencies": { - "express": "3.1.0", - "ejs": "*", - "mongoose": "*", - "connect": "*", - "emailjs": "*", - "mongodb": "*", - "moment": "*", - "less-middleware": "*", - "passport": "*", - "passport-local": "*", - "passport-facebook": "*", - "bcrypt": "*" - } + "name": "Divid" + , "description": "A bachelorproject ending in a webapplication for social accounting" + , "version": "0.0.2" + , "private": true + , "engines": { + "node": "0.10.x" + , "npm": "1.2.x" + } + , "scripts": { + "start": "NODE_ENV=development ./node_modules/.bin/nodemon app.js" + , "test": "NODE_ENV=test ./node_modules/.bin/mocha --reporter spec test/test-*.js" + } + , "dependencies": { + "express": "latest" + , "ejs": "latest" + , "mongoose": "latest" + , "connect": "latest" + , "mongodb": "latest" + , "less-middleware": "latest" + , "passport": "latest" + , "passport-local": "latest" + , "passport-facebook": "latest" + , "passport-twitter": "latest" + , "bcrypt": "latest" + , "nodemon": "latest" + } + , "decDependencies": { + "mocha": "latest" + } } -- cgit v1.2.3