Commits

Branch selector

 jake

User selector

All users

Datepicker

All time

Commit History

Commits on Apr 19, 2018

• added user authentication

  

  Jake Hsiao

  authored and

  Jake Hsiao

  committed
  e42947b

  Copy full SHA for e42947b

Commits on Apr 17, 2018

• refactor button function, no more while loop

  

  Jake Hsiao

  authored and

  Jake Hsiao

  committed
  40da8fa

  Copy full SHA for 40da8fa

• got Sidebar to render, possible removing DrinkListEntry component

  

  Jake Hsiao

  authored and

  Jake Hsiao

  committed
  885a285

  Copy full SHA for 885a285

• got handleExitButton on Drink page to work correctly

  

  Jake Hsiao

  authored and

  Jake Hsiao

  committed
  defccbf

  Copy full SHA for defccbf

Commits on Apr 14, 2018

• Merge pull request #15 from gregimba/jake

  Show description for 3f8b16a
  gregimba

  authored
  3f8b16a

  Copy full SHA for 3f8b16a

• Merge pull request #14 from gregimba/grant

  Show description for 5257cbd
  gregimba

  authored
  5257cbd

  Copy full SHA for 5257cbd

• added conditional rendering

  

  Jake Hsiao

  authored and

  Jake Hsiao

  committed
  dbca189

  Copy full SHA for dbca189

Commits on Apr 13, 2018

• working on Conditional Rendering

  

  Jake Hsiao

  authored and

  Jake Hsiao

  committed
  9da5497

  Copy full SHA for 9da5497

Commits on Apr 12, 2018

• merge Button component into Ingredient component

  

  Jake Hsiao

  authored and

  Jake Hsiao

  committed
  2522b43

  Copy full SHA for 2522b43

• refactor Button component

  

  Jake Hsiao

  authored and

  Jake Hsiao

  committed
  7e16981

  Copy full SHA for 7e16981

• add ingredient to database

  gregimba

  committed
  ffadfcd

  Copy full SHA for ffadfcd

• insert drinks completed

  gregimba

  committed
  32ef4ce

  Copy full SHA for 32ef4ce

• added like and dislike button functions

  

  Jake Hsiao

  authored and

  Jake Hsiao

  committed
  4c7006c

  Copy full SHA for 4c7006c

• write files to json

  gregimba

  committed
  91edfa4

  Copy full SHA for 91edfa4

• Merge branch 'grant' of https://github.com/gregimba/Mixr into grant

  gregimba

  committed
  c5d0d2b

  Copy full SHA for c5d0d2b

• cleanup logic

  gregimba

  committed
  c649b14

  Copy full SHA for c649b14

• write files instead of inital db

  gregimba

  committed
  30e5b7d

  Copy full SHA for 30e5b7d

• rename unclear variables

  

  Jake Hsiao

  authored and

  Jake Hsiao

  committed
  c3c0f74

  Copy full SHA for c3c0f74

Commits on Apr 11, 2018

• inital db writes

  gregimba

  committed
  b925f71

  Copy full SHA for b925f71

• fix merge

  

  Jake Hsiao

  authored and

  Jake Hsiao

  committed
  e9b1c87

  Copy full SHA for e9b1c87

• delete unnecessary line

  

  Jake Hsiao

  authored and

  Jake Hsiao

  committed
  5238827

  Copy full SHA for 5238827

• have basic react component setup

  

  Jake Hsiao

  authored and

  Jake Hsiao

  committed
  c2e293b

  Copy full SHA for c2e293b

• delete unnecessary line

  

  Jake Hsiao

  authored and

  Jake Hsiao

  committed
  1bd91fa

  Copy full SHA for 1bd91fa

• have basic react component setup

  

  Jake Hsiao

  authored and

  Jake Hsiao

  committed
  6653ada

  Copy full SHA for 6653ada

• Merge pull request #10 from gregimba/grant

  Show description for 4bff9a2
  

  Joz

  authored
  4bff9a2

  Copy full SHA for 4bff9a2

• Update index.js

  

  Joz

  authored
  445f31d

  Copy full SHA for 445f31d

• update readme

  gregimba

  committed
  a683dd9

  Copy full SHA for a683dd9

• rewrite without migrations in order to handle join tables correctly

  gregimba

  committed
  94dac79

  Copy full SHA for 94dac79

• update readme

  gregimba

  committed
  03763de

  Copy full SHA for 03763de

• Merge pull request #9 from gregimba/grant

  Show description for 48e1d8f
  gregimba

  authored
  48e1d8f

  Copy full SHA for 48e1d8f

• refactor readme

  gregimba

  committed
  6b9fd59

  Copy full SHA for 6b9fd59

• basic postgres setup

  gregimba

  committed
  e65247e

  Copy full SHA for e65247e

• rework migrations

  gregimba

  committed
  4829b18

  Copy full SHA for 4829b18

• rewrite of database code using sequelize-cli and rework migrations

  gregimba

  committed
  58feaf9

  Copy full SHA for 58feaf9

• Merge pull request #8 from gregimba/grant

  Show description for e5e554c
  gregimba

  authored
  e5e554c

  Copy full SHA for e5e554c

Pagination

Previous

Next