Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Np mj sort items soon integers #66

Draft
wants to merge 13 commits into
base: master
Choose a base branch
from
Draft

Np mj sort items soon integers #66

wants to merge 13 commits into from

Commits on Jan 29, 2020

  1. make PR

    @ajiles91
    ajiles91 committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    3485388 View commit details
    Browse the repository at this point in the history

  2. added estimates.js

    @ajiles91
    ajiles91 committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    2e2ac6e View commit details
    Browse the repository at this point in the history

  3. added comment to additem.js to test branch pull

    @MonicaDJohnson
    MonicaDJohnson committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    ff7293e View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2020

  1. Merge branch 'aj-mj-add-number-of-purchases' of https://github.com/th… 

    …e-collab-lab/tcl-3-smart-shopping-list into aj-mj-add-number-of-purchases
    @MonicaDJohnson
    MonicaDJohnson committed Jan 30, 2020
    Configuration menu
    Copy the full SHA
    350f846 View commit details
    Browse the repository at this point in the history

  2. working on counter

    @MonicaDJohnson
    MonicaDJohnson committed Jan 30, 2020
    Configuration menu
    Copy the full SHA
    74fcb83 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2020

  1. counter set up for numberOfPurchases variable

    @ajiles91
    ajiles91 committed Feb 2, 2020
    Configuration menu
    Copy the full SHA
    2a03d00 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #65 from the-collab-lab/aj-mj-add-number-of-purchases 

    Adding numberofPurchases and lastestInterval to database
    @ajiles91
    ajiles91 authored Feb 2, 2020
    Configuration menu
    Copy the full SHA
    ae3f81f View commit details
    Browse the repository at this point in the history

  3. implemented adding calculated estimate to items in database with fake… 

    … latestInterval variable
    @ajiles91
    ajiles91 committed Feb 2, 2020
    Configuration menu
    Copy the full SHA
    f7a7099 View commit details
    Browse the repository at this point in the history

  4. added prevDate variable to try to calculate time interval for calcula… 

    …teEstimate function
    @ajiles91
    ajiles91 committed Feb 2, 2020
    Configuration menu
    Copy the full SHA
    3969747 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2020

  1. Merge branch 'master' into np-mj-sort-items-soon-integers

    Steve Gardner committed Feb 7, 2020
    Configuration menu
    Copy the full SHA
    1bf2df9 View commit details
    Browse the repository at this point in the history

  2. Fix remaining holdovers from branching

    Steve Gardner committed Feb 7, 2020
    Configuration menu
    Copy the full SHA
    e9a3eea View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2020

  1. attempt to filter to <= 7

    @mikeramz86
    mikeramz86 committed Feb 8, 2020
    Configuration menu
    Copy the full SHA
    2e2f328 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2020

  1. trying to sort by nextExpectedPurchased

    @ajiles91
    ajiles91 committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    7e53584 View commit details
    Browse the repository at this point in the history