Code

OneDish branch#37

Code

Open

ghost wants to merge 65 commits intokth-csc-iprog:masterkth-csc-iprog/dinnerplanner-html:masterfrom sofiajag:oneDish-branchsofiajag/dinnerplanner-html:oneDish-branchCopy head branch name to clipboard

+26,908-15

Commits

Commits on Jan 19, 2018

• test

  sofiaJagerstrom

  committed
  1528816

• dagens

  

  voojagig

  committed
  e566028

• Första delen av dinnerModel

  

  voojagig

  committed
  5d0373e

Commits on Jan 22, 2018

• Bootstrap mm

  

  voojagig

  committed
  4ba82bb

• Utkast på startsida

  Show description for c3d32c5
  

  voojagig

  committed
  c3d32c5

Commits on Jan 23, 2018

• Nytt utkast - View2B

  Show description for a9b9d3a
  

  lindelindblad

  committed
  a9b9d3a

Commits on Jan 24, 2018

• dagens view2

  sofiaJagerstrom

  committed
  b4f2a4c

Commits on Jan 25, 2018

• view 2-3-4

  

  lindelindblad

  committed
  b2d4e19

• views kopplade till data

  sofiaJagerstrom

  committed
  f32a8ab

• lite försökt till förbättring

  sofiaJagerstrom

  committed
  f078aeb

Commits on Jan 26, 2018

• koppling mellan JS och HTML

  Show description for 7a506c2
  sofiaJagerstrom

  committed
  7a506c2

Commits on Jan 27, 2018

• view5

  Show description for d1274c4
  sofiaJagerstrom

  committed
  d1274c4

Commits on Jan 28, 2018

• uppdatera landingpage

  

  lindelindblad

  committed
  d4ea33a

• view6

  sofiaJagerstrom

  committed
  900901a

• Merge remote-tracking branch 'origin/master'

  Show description for 55cdbac
  

  lindelindblad

  committed
  55cdbac

• kommentar

  Show description for 7598a69
  

  lindelindblad

  committed
  7598a69

• Revert "Merge remote-tracking branch 'origin/master'"

  Show description for 3749004
  

  lindelindblad

  committed
  3749004

• Rätt filer

  Show description for be666fd
  

  lindelindblad

  committed
  be666fd

• update view4

  

  lindelindblad

  committed
  adb9c71

• header

  sofiaJagerstrom

  committed
  3b561f0

• flyttning av filer

  sofiaJagerstrom

  committed
  476a2b5

• fler flyttningar...

  sofiaJagerstrom

  committed
  c62c478

• Updated stylesheet, remove obsolete files

  

  lindelindblad

  committed
  cb64411

Commits on Jan 31, 2018

• kommentarer fr seminar

  Show description for c9ce3c5
  

  lindelindblad

  committed
  c9ce3c5

Commits on Feb 6, 2018

• skapade mappar för resp lab

  

  lindelindblad

  committed
  cf7f54b

• Ny controller och index

  Show description for aaaef98
  

  lindelindblad

  committed
  aaaef98

• controller

  sofiaJagerstrom

  committed
  a9bfa06

• added controlles av div.

  

  lindelindblad

  committed
  f93872f

• new stateController

  Show description for b9e775c
  

  lindelindblad

  committed
  b9e775c

Commits on Feb 8, 2018

• lagt till headern, fixat med searchView och mainPic, är ännu inte klara

  Show description for da6670c
  sofiaJagerstrom

  committed
  da6670c

Commits on Feb 9, 2018

• ...

  sofiaJagerstrom

  committed
  3611be7

• uppdaterade knapp och hämtning av data

  

  lindelindblad

  committed
  32f59ea

• added observers

  Show description for 0a5bd1e
  

  lindelindblad

  committed
  0a5bd1e

Commits on Feb 11, 2018

• loadView() fixad och synkad m knappar

  Show description for bb4fe74
  

  lindelindblad

  committed
  bb4fe74

Commits on Feb 12, 2018

• dagens

  Show description for a4a7974
  sofiaJagerstrom

  committed
  a4a7974

• småsaker i dinnermodel

  Show description for 5cc8481
  

  lindelindblad

  committed
  5cc8481

Commits on Feb 13, 2018

• mkt ändringar, nya controllers och fix...

  sofiaJagerstrom

  committed
  9766c39

Commits on Feb 14, 2018

• ...

  sofiaJagerstrom

  committed
  7562550

• printView

  sofiaJagerstrom

  committed
  297d551

• varje rätt är en egen knapp

  

  lindelindblad

  committed
  91c93bd

• ...

  sofiaJagerstrom

  committed
  a5b7aee

• :(

  Show description for 6d6de37
  

  lindelindblad

  committed
  6d6de37

• småsaker.

  

  lindelindblad

  committed
  b85437f

• klar lab 2

  Show description for 611a3c8
  

  lindelindblad

  committed
  611a3c8

• klar lab 2 - rensad!

  

  lindelindblad

  committed
  810a178

Commits on Feb 20, 2018

• Ny mapp för lab3

  Show description for 49514bf
  

  lindelindblad

  committed
  49514bf

Commits on Feb 25, 2018

• ...

  Show description for 9fc1a98
  sofiaJagerstrom

  committed
  9fc1a98

• Revert "..."

  Show description for b041b92
  sofiaJagerstrom

  committed
  b041b92

Commits on Feb 27, 2018

• ny mapp för lab 3 (inkl susta uppd. flr lab2)

  

  lindelindblad

  committed
  b93daf4

• lab 3 ok!

  

  lindelindblad

  committed
  19904a3

• labb2 klart

  Show description for b2970f3
  sofiaJagerstrom

  committed
  b2970f3

• getAllDishes uppd. med ajaxreq.

  

  lindelindblad

  committed
  fcefa0d

• halv loadRecipe (api)

  

  lindelindblad

  committed
  e416f53

• Nästan Klar!

  Show description for 4c13320
  

  lindelindblad

  committed
  4c13320

• småfix

  

  lindelindblad

  committed
  1b0a78d

• tog bort kommentarer

  sofiaJagerstrom

  committed
  2e4bce5

Commits on Mar 16, 2018

• lab4

  sofiaJagerstrom

  committed
  bf57508

• sideview + searchview ok

  Show description for 48dd928
  

  lindelindblad

  committed
  48dd928

• search ok!

  

  lindelindblad

  committed
  948620d

• getalldishes update

  

  lindelindblad

  committed
  53a7016

Commits on Mar 19, 2018

• laddar rätter ok

  

  lindelindblad

  committed
  63379ae

• ShowDish visar info, layout ok

  

  lindelindblad

  committed
  e1e05b8

• update() fungerar

  

  lindelindblad

  committed
  b9d3156

• ok filter, men ska flyttas till selectdish

  

  lindelindblad

  committed
  9c0a0e3

• ok filter från selectdish

  

  lindelindblad

  committed
  95313a7