Code

Merging#1

Code

Open

mtrogers wants to merge 242 commits intomtrogers:mastermtrogers/CEN3031Project:masterfrom nchen94:masternchen94/CEN3031Project:masterCopy head branch name to clipboard

+17,187-1

Commits

Commits on Sep 8, 2014

• Update README.md

  nchen94

  committed
  3f77240

  Copy full SHA for 3f77240

Commits on Sep 21, 2014

• Meanjs folder for Hummingbird- sltalty

  sltclss

  committed
  c2ffeaf

  Copy full SHA for c2ffeaf

• test

  Show description for 832a715
  nchen94

  committed
  832a715

  Copy full SHA for 832a715

• Code Standards -sltalty

  sltclss

  committed
  81a1114

  Copy full SHA for 81a1114

Commits on Sep 29, 2014

• Test run

  Show description for 1b4570d
  

  davidgithub614

  committed
  1b4570d

  Copy full SHA for 1b4570d

Commits on Oct 1, 2014

• Change folder name

  

  davidgithub614

  committed
  300c28c

  Copy full SHA for 300c28c

Commits on Oct 5, 2014

• Removed Old

  nchen94

  committed
  b9edeca

  Copy full SHA for b9edeca

• Merge branch 'master' of https://github.com/nchen94/CEN3031Project

  Show description for 8383bba
  nchen94

  committed
  8383bba

  Copy full SHA for 8383bba

• Removed Old

  nchen94

  committed
  03e9111

  Copy full SHA for 03e9111

• New project commit using yo generator without Articles.

  sltclss

  committed
  1f14e33

  Copy full SHA for 1f14e33

• General Commit: Added customer module

  sltclss

  committed
  c88154b

  Copy full SHA for c88154b

• Implemented user story 79241514

  Show description for cbade17
  nchen94

  committed
  cbade17

  Copy full SHA for cbade17

Commits on Oct 8, 2014

• Mock-up folders

  Show description for bdf5232
  nchen94

  committed
  bdf5232

  Copy full SHA for bdf5232

• updated Models

  Show description for 6ac3835
  nchen94

  committed
  6ac3835

  Copy full SHA for 6ac3835

• Update

  

  davidgithub614

  committed
  c6285c2

  Copy full SHA for c6285c2

• general commit

  nchen94

  committed
  b7d2dcf

  Copy full SHA for b7d2dcf

• General Commit: Minor changes

  

  davidgithub614

  committed
  a14f7a4

  Copy full SHA for a14f7a4

• Customer Dashboard added. Order history view and controller created.

  sltclss

  committed
  88b4d4e

  Copy full SHA for 88b4d4e

Commits on Oct 9, 2014

• General Commit: Minor changes

  

  davidgithub614

  committed
  72c6193

  Copy full SHA for 72c6193

• Model test for bill, contact and inventory added

  

  davidgithub614

  committed
  2e92d68

  Copy full SHA for 2e92d68

Commits on Oct 10, 2014

• General Commit: Minor changes

  nchen94

  committed
  b935e44

  Copy full SHA for b935e44

Commits on Oct 11, 2014

• General Commit: CSS changes (footer)

  sltclss

  committed
  2134268

  Copy full SHA for 2134268

Commits on Oct 12, 2014

• Model test for messaging

  

  davidgithub614

  committed
  d1ad3f7

  Copy full SHA for d1ad3f7

• General Commit: Bug fix

  

  davidgithub614

  committed
  7ba7168

  Copy full SHA for 7ba7168

• General Commit: Front-end sign-in test fix and modal $emit change.

  sltclss

  committed
  be0c6b2

  Copy full SHA for be0c6b2

• General Commit: new model

  Show description for 5c65c98
  nchen94

  committed
  5c65c98

  Copy full SHA for 5c65c98

• General Commit

  nchen94

  committed
  d4f5840

  Copy full SHA for d4f5840

• Merge pull request #1 from nchen94/Nancy's

  Show description for 4c37900
  nchen94

  committed
  4c37900

  Copy full SHA for 4c37900

• Model test for order, form and result

  

  davidgithub614

  committed
  982f588

  Copy full SHA for 982f588

• General Commit: Minor change in order test

  

  davidgithub614

  committed
  86d0124

  Copy full SHA for 86d0124

• Implementation of registration user story 79242026--jcaneus1

  Olguy

  committed
  33e0bca

  Copy full SHA for 33e0bca

• functions to manipulate ng-show for verification purpose added in authentication controller

  Olguy

  committed
  bfe24bc

  Copy full SHA for bfe24bc

• General Commit

  nchen94

  committed
  f972603

  Copy full SHA for f972603

• Merge branch 'master' of https://github.com/nchen94/CEN3031Project

  nchen94

  committed
  d627e2b

  Copy full SHA for d627e2b

• General Commit

  nchen94

  committed
  ede35f3

  Copy full SHA for ede35f3

• General Commit

  

  davidgithub614

  committed
  8f14a32

  Copy full SHA for 8f14a32

• General Commit

  

  davidgithub614

  committed
  d6b01ea

  Copy full SHA for d6b01ea

• Remove connection to user model

  

  davidgithub614

  committed
  4732bd3

  Copy full SHA for 4732bd3

• Minor change to contact model test

  

  davidgithub614

  committed
  fffe7df

  Copy full SHA for fffe7df

• General Commit

  nchen94

  committed
  48b944f

  Copy full SHA for 48b944f

• Model test for medical history

  

  davidgithub614

  committed
  c16539e

  Copy full SHA for c16539e

• Merge branch 'master' of https://github.com/nchen94/CEN3031Project

  Show description for 3de2340
  nchen94

  committed
  3de2340

  Copy full SHA for 3de2340

• General Commit

  nchen94

  committed
  eb7dfb3

  Copy full SHA for eb7dfb3

• General Commit: created new-order view and controller.

  sltclss

  committed
  566f138

  Copy full SHA for 566f138

• General Commit: created new-order view and controller.

  sltclss

  committed
  b805a62

  Copy full SHA for b805a62

• General Commit: changed gitignore file for lib/ css files

  sltclss

  committed
  01bfbf7

  Copy full SHA for 01bfbf7

• update terminal

  Show description for 388751a
  schoenfelde

  committed
  388751a

  Copy full SHA for 388751a

• Forgot Password

  Show description for 2b769b9
  schoenfelde

  committed
  2b769b9

  Copy full SHA for 2b769b9

• new pictures

  Show description for d6fb2b0
  schoenfelde

  committed
  d6fb2b0

  Copy full SHA for d6fb2b0

• Pending Tab

  Show description for 4cfc26c
  schoenfelde

  committed
  4cfc26c

  Copy full SHA for 4cfc26c

Commits on Oct 13, 2014

• Implemented User Story 79242014 -gandhima24

  MonicaGandhi

  committed
  99271f3

  Copy full SHA for 99271f3

• Implemented User Story 79242014 -gandhima24

  MonicaGandhi

  committed
  d054e65

  Copy full SHA for d054e65

• Implemented User Story 79242014 -gandhima24

  MonicaGandhi

  committed
  56dea9e

  Copy full SHA for 56dea9e

• Fixed Pending

  Show description for 6d7c44e
  schoenfelde

  committed
  6d7c44e

  Copy full SHA for 6d7c44e

• Changed the front page

  Show description for b882894
  schoenfelde

  committed
  b882894

  Copy full SHA for b882894

• last part of wallpaper

  schoenfelde

  committed
  d92281d

  Copy full SHA for d92281d

• Implemented $http connection to back-end for New Order and Pending Orders, added Express routes, and fixed minor bugs.

  sltclss

  committed
  3788491

  Copy full SHA for 3788491

• General Commit: fixed datepicker for registration

  sltclss

  committed
  06c6be2

  Copy full SHA for 06c6be2

• General commit: new-order testing bug

  sltclss

  committed
  0db06b0

  Copy full SHA for 0db06b0

Commits on Oct 14, 2014

• General Commit: initial front-end web app mock-ups

  sltclss

  committed
  aac6dfb

  Copy full SHA for aac6dfb

Commits on Oct 15, 2014

• "Implementation of user story for the customer history --jcaneus"

  Olguy

  committed
  9989784

  Copy full SHA for 9989784

Commits on Oct 18, 2014

• Updated Backend

  nchen94

  committed
  5d64d2b

  Copy full SHA for 5d64d2b

• General Commit: fixed small errors and formatted

  nchen94

  committed
  7d2d08c

  Copy full SHA for 7d2d08c

Commits on Oct 19, 2014

• General Commit: minor adjustment on model test

  

  davidgithub614

  committed
  780a326

  Copy full SHA for 780a326

Commits on Oct 21, 2014

• General Commit

  nchen94

  committed
  67719c7

  Copy full SHA for 67719c7

Commits on Oct 22, 2014

• General Commit

  Show description for e7ff64a
  nchen94

  committed
  e7ff64a

  Copy full SHA for e7ff64a

• Adding result controller and routes

  nchen94

  committed
  6d66b9b

  Copy full SHA for 6d66b9b

Commits on Oct 25, 2014

• Added Result functions/routes

  Show description for e261a47
  nchen94

  committed
  e261a47

  Copy full SHA for e261a47

• General Commit

  

  davidgithub614

  committed
  8677019

  Copy full SHA for 8677019

Commits on Oct 28, 2014

• Bug fixes for Registration, additon of module lab, and Implemented User Story 81484780 (3 of 5 Tasks, so others can work on additional user stories)

  sltclss

  committed
  6db1faf

  Copy full SHA for 6db1faf

• General Commit: Registration back-end bug fix

  sltclss

  committed
  59998e1

  Copy full SHA for 59998e1

Commits on Oct 29, 2014

• Update README.md

  nchen94

  committed
  3e3c844

  Copy full SHA for 3e3c844

• Added Verify HTML and controller

  Show description for a0d744c
  schoenfelde

  committed
  a0d744c

  Copy full SHA for a0d744c

Commits on Oct 30, 2014

• lab view for verify

  schoenfelde

  committed
  3ef8224

  Copy full SHA for 3ef8224

Commits on Oct 31, 2014

• added validation for status and roles

  nchen94

  committed
  3120486

  Copy full SHA for 3120486

• General Commit

  

  davidgithub614

  committed
  6f6c10e

  Copy full SHA for 6f6c10e

• LabFacility model and functions.

  Show description for 93907ad
  nchen94

  committed
  93907ad

  Copy full SHA for 93907ad

• Change model test

  

  davidgithub614

  committed
  42a9bc7

  Copy full SHA for 42a9bc7

• General Commit: misc

  nchen94

  committed
  872586d

  Copy full SHA for 872586d

• Minor bug

  

  davidgithub614

  committed
  51dd7b9

  Copy full SHA for 51dd7b9

Commits on Nov 1, 2014

• Merge remote-tracking branch 'origin/master' into sltalty

  sltclss

  committed
  43382a6

  Copy full SHA for 43382a6

• General Commit: minor change to model test

  

  davidgithub614

  committed
  a483581

  Copy full SHA for a483581

• Added check for input result

  

  davidgithub614

  committed
  b5bb108

  Copy full SHA for b5bb108

• Check valid order ID and verifier ID

  Show description for 0b0effb
  

  davidgithub614

  committed
  0b0effb

  Copy full SHA for 0b0effb

• General Commit

  

  davidgithub614

  committed
  eec409f

  Copy full SHA for eec409f

• Added some comments in results controller

  

  davidgithub614

  committed
  548a3e3

  Copy full SHA for 548a3e3

• Return Verifier List, Updated result functions

  nchen94

  committed
  0e66a9f

  Copy full SHA for 0e66a9f

• Added lab controller, connect to lab-nav controller, and mock backend calls

  sltclss

  committed
  aba0744

  Copy full SHA for aba0744

• General Commit: Adding comments

  Show description for 8f660ce
  nchen94

  committed
  8f660ce

  Copy full SHA for 8f660ce

• connected input result page

  MonicaGandhi

  committed
  e602622

  Copy full SHA for e602622

• Bug fix

  Show description for dfa9b46
  nchen94

  committed
  dfa9b46

  Copy full SHA for dfa9b46

• Implement input result

  MonicaGandhi

  committed
  53031ab

  Copy full SHA for 53031ab

• Added check for valid verifier ID

  

  davidgithub614

  committed
  9493f53

  Copy full SHA for 9493f53

• Fixed some minor bug

  

  davidgithub614

  committed
  f18d34d

  Copy full SHA for f18d34d

• General commit

  

  davidgithub614

  committed
  7e8809d

  Copy full SHA for 7e8809d

Commits on Nov 2, 2014

• General Commit: Suppress the === warning

  

  davidgithub614

  committed
  27c69d0

  Copy full SHA for 27c69d0

• Merge remote-tracking branch 'origin/sltalty'

  nchen94

  committed
  1934b76

  Copy full SHA for 1934b76

• General Commit: minor bugs

  Show description for b4139b3
  nchen94

  committed
  b4139b3

  Copy full SHA for b4139b3

• General Commit

  nchen94

  committed
  bcadd3f

  Copy full SHA for bcadd3f

• General Commit: Suppress JS Hint errors

  

  davidgithub614

  committed
  704d6c8

  Copy full SHA for 704d6c8

Commits on Nov 3, 2014

• Result.create function implemented

  sltclss

  committed
  96013e1

  Copy full SHA for 96013e1

• Implemented front-end verify results and submit results.

  sltclss

  committed
  94a5246

  Copy full SHA for 94a5246

• Front End Testing and small changes

  nchen94

  committed
  79a446d

  Copy full SHA for 79a446d

• General Commit: Seqid Dependency

  

  davidgithub614

  committed
  33a00e8

  Copy full SHA for 33a00e8

• General Commit: Minor changes

  

  davidgithub614

  committed
  4624cd1

  Copy full SHA for 4624cd1

• Added some more tests

  

  davidgithub614

  committed
  76a02f1

  Copy full SHA for 76a02f1

• "Completed Order Page to view completed orders" --jcaneus1

  Olguy

  committed
  2374a4f

  Copy full SHA for 2374a4f

• General Commit: Minor bug fixed

  

  davidgithub614

  committed
  fec670f

  Copy full SHA for fec670f

• Temporary disable signup test

  

  davidgithub614

  committed
  056d7e3

  Copy full SHA for 056d7e3

Commits on Nov 4, 2014

• Remove and clean up files containing JsFiddle which we are no longer using --jcaneus

  Olguy

  committed
  ab2a6c2

  Copy full SHA for ab2a6c2

• Minor Changes

  schoenfelde

  committed
  ca46299

  Copy full SHA for ca46299

• Merge branch 'master' of https://github.com/nchen94/CEN3031Project

  Show description for 4d55a9c
  schoenfelde

  committed
  4d55a9c

  Copy full SHA for 4d55a9c

• Update for the completed Order page --jcaneus1

  Olguy

  committed
  92ce7c5

  Copy full SHA for 92ce7c5

• Added more tests for lab facility model

  

  davidgithub614

  committed
  4aad6e1

  Copy full SHA for 4aad6e1

• Minor bug fixed

  

  davidgithub614

  committed
  989a43e

  Copy full SHA for 989a43e

Commits on Nov 5, 2014

• Minor changes

  

  davidgithub614

  committed
  882a0d7

  Copy full SHA for 882a0d7

• Implemented Backend testing

  nchen94

  committed
  3860113

  Copy full SHA for 3860113

• Added results controller test

  

  davidgithub614

  committed
  d2e69a3

  Copy full SHA for d2e69a3

• Formatted Completed Orders added listing function and routes for orders

  sltclss

  committed
  5c7af94

  Copy full SHA for 5c7af94

• Testing for new-result

  schoenfelde

  committed
  1d4f956

  Copy full SHA for 1d4f956

• have made changes in the html pages of the lab-nav controller,

  MonicaGandhi

  committed
  a0804ed

  Copy full SHA for a0804ed

• made html page for lab orders that are failed

  MonicaGandhi

  committed
  eabc409

  Copy full SHA for eabc409

• general commit

  MonicaGandhi

  committed
  2697158

  Copy full SHA for 2697158

• genral changes

  MonicaGandhi

  committed
  d9477e6

  Copy full SHA for d9477e6

• 'multiple front end test' --jcaneus1

  Olguy

  committed
  cf41087

  Copy full SHA for cf41087

• Change console log message for easier reading

  

  davidgithub614

  committed
  4f1fd1f

  Copy full SHA for 4f1fd1f

• Temporary disable some tests

  

  davidgithub614

  committed
  56a6b88

  Copy full SHA for 56a6b88

Commits on Nov 10, 2014

• "Clean up and remove non working xeditable codes on the customer dashboard --jcaneus1"

  Olguy

  committed
  ef06822

  Copy full SHA for ef06822

Commits on Nov 11, 2014

• Created admin module (controllers, views, and routes); route separation for different user types.

  sltclss

  committed
  3d5ab4b

  Copy full SHA for 3d5ab4b

Commits on Nov 12, 2014

• Create a function to list all orders & minor change

  

  davidgithub614

  committed
  87906ec

  Copy full SHA for 87906ec

• Small bug fixed

  

  davidgithub614

  committed
  2b1cda2

  Copy full SHA for 2b1cda2

• created new functions and added registrationCode

  Show description for f4086b1
  nchen94

  committed
  f4086b1

  Copy full SHA for f4086b1

• Inventory View and Controller

  Show description for ed0b7a6
  schoenfelde

  committed
  ed0b7a6

  Copy full SHA for ed0b7a6

Commits on Nov 13, 2014

• created adminedashboard orderstatus and shipment status view and contoller. and some general change.along with the some modificaions in the medicalhistory of the customerdashboard.

  MonicaGandhi

  committed
  37c2a8d

  Copy full SHA for 37c2a8d

• 'Implementation of Customer-lab view for the admin page as well as the controller (Admin Controller)'--jcaneus1

  Olguy

  committed
  38ef3b6

  Copy full SHA for 38ef3b6

• General Commit

  nchen94

  committed
  ca4847a

  Copy full SHA for ca4847a

• General commit: bug fixes

  sltclss

  committed
  2e745fb

  Copy full SHA for 2e745fb

• Added function to decrease item amount when shipped

  

  davidgithub614

  committed
  7971366

  Copy full SHA for 7971366

Commits on Nov 14, 2014

• Temporary comment out the errors

  

  davidgithub614

  committed
  05759d0

  Copy full SHA for 05759d0

• List for Customers and labs

  nchen94

  committed
  fe722fd

  Copy full SHA for fe722fd

• 'views for customer-lab from admin page' --jcaneus1

  Olguy

  committed
  f4eff18

  Copy full SHA for f4eff18

Commits on Nov 15, 2014

• "modifying customer-lab view as well as admin controller to pull information (Name, Id, date) from the backend" --jcaneus1

  Olguy

  committed
  39d5458

  Copy full SHA for 39d5458

Commits on Nov 16, 2014

• Routing interceptions

  sltclss

  committed
  15bf349

  Copy full SHA for 15bf349

• General commits: form fixes and back-end call setups

  sltclss

  committed
  f9d498d

  Copy full SHA for f9d498d

• Finished implementing decrease item function

  

  davidgithub614

  committed
  003fc1e

  Copy full SHA for 003fc1e

• Minor bug fixed

  

  davidgithub614

  committed
  f796d17

  Copy full SHA for f796d17

Commits on Nov 17, 2014

• Hot fix

  

  davidgithub614

  committed
  f678c3c

  Copy full SHA for f678c3c

• General commit

  

  davidgithub614

  committed
  5694bfc

  Copy full SHA for 5694bfc

• Functions for Lab and Admins

  Show description for 63463fd
  nchen94

  committed
  63463fd

  Copy full SHA for 63463fd

• Setup inventory connections (changed inventory increment/update to take in itemId instead of name), fixed ship kit front-end, added re-route check...

  sltclss

  committed
  283ba46

  Copy full SHA for 283ba46

• General commits: fixed back-end inventory list, set inventory view form attributes and pristine state, added data-ng-init functions for admin views.

  sltclss

  committed
  363e52b

  Copy full SHA for 363e52b

• general commits

  sltclss

  committed
  45a76d6

  Copy full SHA for 45a76d6

• General Commits

  nchen94

  committed
  47b0664

  Copy full SHA for 47b0664

• Minor changes

  

  davidgithub614

  committed
  7045b14

  Copy full SHA for 7045b14

• Enable add new kit function

  

  davidgithub614

  committed
  0d64855

  Copy full SHA for 0d64855

• General commit

  nchen94

  committed
  c05df42

  Copy full SHA for c05df42

• General commit

  sltclss

  committed
  193b578

  Copy full SHA for 193b578

• General commit

  

  davidgithub614

  committed
  352e36c

  Copy full SHA for 352e36c

• General Commit

  nchen94

  committed
  33d8744

  Copy full SHA for 33d8744

• Added check for item count when ship order

  

  davidgithub614

  committed
  40b2005

  Copy full SHA for 40b2005

• register page for customer lab kit

  MonicaGandhi

  committed
  c9f5d4c

  Copy full SHA for c9f5d4c

• controller for register

  MonicaGandhi

  committed
  2bff300

  Copy full SHA for 2bff300

• 'testing function for various controller functions --jcaneus1'

  Olguy

  committed
  03df196

  Copy full SHA for 03df196

• general changes

  MonicaGandhi

  committed
  c5245d6

  Copy full SHA for c5245d6

• fixed function name: order.server.controller.js

  

  Elliot Schoenfeld

  authored and

  Elliot Schoenfeld

  committed
  e962217

  Copy full SHA for e962217

• general commit

  nchen94

  committed
  502e47b

  Copy full SHA for 502e47b

• fix errors in console.log in order.server

  

  Elliot Schoenfeld

  authored and

  Elliot Schoenfeld

  committed
  58a8b7e

  Copy full SHA for 58a8b7e

• Fixed the HTML and made it pretty

  

  Elliot Schoenfeld

  authored and

  Elliot Schoenfeld

  committed
  b2c9294

  Copy full SHA for b2c9294

• general commit: add adminsignout route

  sltclss

  committed
  83a06ad

  Copy full SHA for 83a06ad

• General Commit: fix the fix for adminsignout

  sltclss

  committed
  8fbd529

  Copy full SHA for 8fbd529

• Fixing CSS bugs

  sltclss

  committed
  976bcd1

  Copy full SHA for 976bcd1

Commits on Nov 18, 2014

• 'More testing function for various controller functions --jcaneus1'

  Olguy

  committed
  8c9c446

  Copy full SHA for 8c9c446

• 'some more front end testing for the admin view as well as the customer view --jcaneus1'

  Olguy

  committed
  79395e4

  Copy full SHA for 79395e4

• Cleaned up the html/controller on the client side

  Show description for 21853c1
  

  Elliot Schoenfeld

  authored and

  Elliot Schoenfeld

  committed
  21853c1

  Copy full SHA for 21853c1

• More or Less fixed the Inventory

  Show description for ad6fc1b
  

  Elliot Schoenfeld

  authored and

  Elliot Schoenfeld

  committed
  ad6fc1b

  Copy full SHA for ad6fc1b

• Fixed the inventory model test

  Show description for 0f736f3
  

  davidgithub614

  committed
  0f736f3

  Copy full SHA for 0f736f3

• General commit

  

  davidgithub614

  committed
  1fdc224

  Copy full SHA for 1fdc224

• Fixed placed to ship process; still need inventory decrement

  sltclss

  committed
  7a42ebc

  Copy full SHA for 7a42ebc

• Added Billing and shipping fields for orders

  nchen94

  committed
  d26b8af

  Copy full SHA for d26b8af

• General commit

  

  davidgithub614

  committed
  e58ba40

  Copy full SHA for e58ba40

• General commit

  

  davidgithub614

  committed
  33e7b5e

  Copy full SHA for 33e7b5e

Commits on Nov 19, 2014

• fixed shipping and back-end order functional test

  sltclss

  committed
  922894a

  Copy full SHA for 922894a

• General commit

  sltclss

  committed
  cf3271a

  Copy full SHA for cf3271a

• 'testing --jcaneus1'

  Olguy

  committed
  d9908c1

  Copy full SHA for d9908c1

• 'More front end test added --jcaneus'

  Olguy

  committed
  ef3276a

  Copy full SHA for ef3276a

• General commit

  

  davidgithub614

  committed
  cb987d0

  Copy full SHA for cb987d0

• Added result controller test (bugs commented out)

  

  davidgithub614

  committed
  e4d536d

  Copy full SHA for e4d536d

• General commit

  

  davidgithub614

  committed
  12e62d4

  Copy full SHA for 12e62d4

• 'more tests cases checking for error message from the Get responses --jcaneus1'

  Olguy

  committed
  1806953

  Copy full SHA for 1806953

• Added more tests for back-end model

  

  davidgithub614

  committed
  344e558

  Copy full SHA for 344e558

• Added test and Fixed small bug

  nchen94

  committed
  6c24a9c

  Copy full SHA for 6c24a9c

Commits on Nov 21, 2014

• cleaned up MH

  

  Elliot Schoenfeld

  authored and

  Elliot Schoenfeld

  committed
  bbbcb94

  Copy full SHA for bbbcb94

• Added email back-end function

  sltclss

  committed
  934746d

  Copy full SHA for 934746d

• Added List of Registered Orders for LAB

  

  Elliot Schoenfeld

  authored and

  Elliot Schoenfeld

  committed
  70fe208

  Copy full SHA for 70fe208

• Changed DATE to TEXT

  

  Elliot Schoenfeld

  authored and

  Elliot Schoenfeld

  committed
  578838f

  Copy full SHA for 578838f

Commits on Nov 22, 2014

• Customer/Admin Backend functions updated

  nchen94

  committed
  8da5868

  Copy full SHA for 8da5868

• Automatically send an email to reset password

  

  davidgithub614

  committed
  449aa61

  Copy full SHA for 449aa61

Commits on Nov 23, 2014

• 'added new rows in customer and lab page --jcaneus1'

  Olguy

  committed
  47418d8

  Copy full SHA for 47418d8

• Inventory decrement/increment fix; login type check restrictions added

  sltclss

  committed
  7069399

  Copy full SHA for 7069399

• some major changes in customer page view and addding a order button on customer splash page which will functions as new order

  MonicaGandhi

  committed
  b4093ff

  Copy full SHA for b4093ff

• general commits

  sltclss

  committed
  e86b799

  Copy full SHA for e86b799

• General commit: new order fixes (some still in progress)

  sltclss

  committed
  00f69ad

  Copy full SHA for 00f69ad

• Formatting of Customer History

  

  Elliot Schoenfeld

  authored and

  Elliot Schoenfeld

  committed
  34c8da9

  Copy full SHA for 34c8da9

• Fixed date problem for the admin list return as well as the ship kit bug

  sltclss

  committed
  2c48774

  Copy full SHA for 2c48774

• General Commit: Fixed status names

  nchen94

  committed
  07f9392

  Copy full SHA for 07f9392

• General Commit

  nchen94

  committed
  9a1a47b

  Copy full SHA for 9a1a47b

• General commit

  nchen94

  committed
  6618202

  Copy full SHA for 6618202

• General Commit

  nchen94

  committed
  2fcb08b

  Copy full SHA for 2fcb08b

• Added more email functions

  

  davidgithub614

  committed
  97d16f5

  Copy full SHA for 97d16f5

• General commit

  

  davidgithub614

  committed
  5ae81a4

  Copy full SHA for 5ae81a4

• Fixed email

  

  davidgithub614

  committed
  8073f01

  Copy full SHA for 8073f01

Commits on Nov 24, 2014

• Added Notification Functionality

  

  Elliot Schoenfeld

  authored and

  Elliot Schoenfeld

  committed
  e71318a

  Copy full SHA for e71318a

Commits on Nov 29, 2014

• Fixed lab reject result and new result creation check

  sltclss

  committed
  b5e7bd7

  Copy full SHA for b5e7bd7

• Fixed verify; fixing customerhistory

  sltclss

  committed
  30ca4f8

  Copy full SHA for 30ca4f8

Commits on Dec 4, 2014

• fixed date bug in users

  sltclss

  committed
  ccdf2ad

  Copy full SHA for ccdf2ad

Commits on Dec 6, 2014

• General commit

  

  davidgithub614

  committed
  b5770d0

  Copy full SHA for b5770d0

• Email for result

  

  davidgithub614

  committed
  91a8733

  Copy full SHA for 91a8733

Commits on Dec 7, 2014

• Quick fix

  

  davidgithub614

  committed
  037e4bb

  Copy full SHA for 037e4bb

• Fix email for result

  

  davidgithub614

  committed
  9dc17b6

  Copy full SHA for 9dc17b6

• Fixed back-end test

  

  davidgithub614

  committed
  c002321

  Copy full SHA for c002321

• Added inventory testing

  

  Elliot Schoenfeld

  authored and

  Elliot Schoenfeld

  committed
  a01e881

  Copy full SHA for a01e881

• Clean code

  

  davidgithub614

  committed
  202028f

  Copy full SHA for 202028f

• More admin tests

  

  Elliot Schoenfeld

  authored and

  Elliot Schoenfeld

  committed
  7f621d7

  Copy full SHA for 7f621d7

• Fixed customer view info and completed order email (still in progress)

  sltclss

  committed
  397f2ac

  Copy full SHA for 397f2ac

Commits on Dec 8, 2014

• 'fixing some front end test' --jcaneus1

  Olguy

  committed
  d701a24

  Copy full SHA for d701a24

• Clean code

  

  davidgithub614

  committed
  399ddfb

  Copy full SHA for 399ddfb

• General commit

  

  davidgithub614

  committed
  9df3e8e

  Copy full SHA for 9df3e8e

• 'Fix Register controller issue' --jcaneus1

  Olguy

  committed
  da2ace5

  Copy full SHA for da2ace5

• 'signin() authentication test related issue got fixed' --jcaneus1

  Olguy

  committed
  9615558

  Copy full SHA for 9615558

Commits on Dec 9, 2014

• Fixed two front-end tests and email function

  

  davidgithub614

  committed
  1ad03bf

  Copy full SHA for 1ad03bf

Commits on Dec 10, 2014

• 'more front end test for the lab view' --jcaneus1

  Olguy

  committed
  679d455

  Copy full SHA for 679d455

• Added view features to lab; general bug fixes.

  sltclss

  committed
  f210ede

  Copy full SHA for f210ede

• "lab and verify test cleanup file" --jcaneus1

  Olguy

  committed
  d668a06

  Copy full SHA for d668a06

• "Admin clean up files" --jcaneus1

  Olguy

  committed
  908d39d

  Copy full SHA for 908d39d

• implemented basic view functions

  sltclss

  committed
  70cf2a6

  Copy full SHA for 70cf2a6

• Fixed some weird back-end test bugs

  

  davidgithub614

  committed
  873bc6f

  Copy full SHA for 873bc6f

• Fixed some small bugs.

  

  Elliot Schoenfeld

  authored and

  Elliot Schoenfeld

  committed
  cd0de81

  Copy full SHA for cd0de81

• Fixed bugs created by fixing bugs

  

  Elliot Schoenfeld

  authored and

  Elliot Schoenfeld

  committed
  df80552

  Copy full SHA for df80552

• Fixed testing for lab

  

  Elliot Schoenfeld

  authored and

  Elliot Schoenfeld

  committed
  143a469

  Copy full SHA for 143a469

• General commit

  

  davidgithub614

  committed
  8f1799a

  Copy full SHA for 8f1799a

• fixed email and verify bugs

  sltclss

  committed
  fefdbf5

  Copy full SHA for fefdbf5

Commits on Aug 31, 2015

• General commit

  

  davidgithub614

  committed
  85726e4

  Copy full SHA for 85726e4