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

Feature/chart code refactoring #198

Merged
merged 18 commits into from Jul 6, 2015
Merged

Feature/chart code refactoring #198

merged 18 commits into from Jul 6, 2015

Commits on Jun 29, 2015

  1. class for elastic search created

    @frenchbread
    frenchbread committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    e408583 View commit details
    Browse the repository at this point in the history

  2. doSearch method added

    @frenchbread
    frenchbread committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    6370f53 View commit details
    Browse the repository at this point in the history

  3. getMonthAnalytics method for getting chart data

    @frenchbread
    frenchbread committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    c7db412 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2015

  1. required arguments for methods added & packages updates

    @frenchbread
    frenchbread committed Jul 1, 2015
    Configuration menu
    Copy the full SHA
    105d3a8 View commit details
    Browse the repository at this point in the history

  2. dataset label change

    @frenchbread
    frenchbread committed Jul 1, 2015
    Configuration menu
    Copy the full SHA
    2fc164c View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2015

  1. updater package versions

    @frenchbread
    frenchbread committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    958f812 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into feature/chart-code-refactoring 

    Conflicts:
server/methods/elasticSearch.js
    @frenchbread
    frenchbread committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    4123a13 View commit details
    Browse the repository at this point in the history

  3. fixing conflicts

    @frenchbread
    frenchbread committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    8a13dd9 View commit details
    Browse the repository at this point in the history

  4. classname changed to ApiUmbrellaElastic

    @frenchbread
    frenchbread committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    903acf0 View commit details
    Browse the repository at this point in the history

  5. Added comments to lines

    @frenchbread
    frenchbread committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    3c6f8d8 View commit details
    Browse the repository at this point in the history

  6. comments style changed

    @frenchbread
    frenchbread committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    d250f2c View commit details
    Browse the repository at this point in the history

  7. Renamed variables

    @frenchbread
    frenchbread committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    ec7a8a6 View commit details
    Browse the repository at this point in the history

  8. Added moment-range package

    @frenchbread
    frenchbread committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    a9dd233 View commit details
    Browse the repository at this point in the history

  9. Optimised and fixed analytics data

    @frenchbread
    frenchbread committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    f68c984 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2015

  1. Added comments to lines

    @frenchbread
    frenchbread committed Jul 3, 2015
    Configuration menu
    Copy the full SHA
    e7e818a View commit details
    Browse the repository at this point in the history

  2. Added "query" as additional parameter

    @frenchbread
    frenchbread committed Jul 3, 2015
    Configuration menu
    Copy the full SHA
    ded82e3 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2015

  1. some checking added for reliability

    @frenchbread
    frenchbread committed Jul 6, 2015
    Configuration menu
    Copy the full SHA
    71e75d9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/dynamic-elasticSearch-query' into feature/chart… 

    …-code-refactoring
    @frenchbread
    frenchbread committed Jul 6, 2015
    Configuration menu
    Copy the full SHA
    d908c1d View commit details
    Browse the repository at this point in the history