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

Cookiefix #12

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open

Cookiefix #12

wants to merge 21 commits into from

Commits on Mar 28, 2017

  1. added gitignore

    @sam1360
    sam1360 committed Mar 28, 2017
    Configuration menu
    Copy the full SHA
    2abcb41 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master'

    @sam1360
    sam1360 committed Mar 28, 2017
    Configuration menu
    Copy the full SHA
    284c731 View commit details
    Browse the repository at this point in the history

  3. Minor code style changes

    @sam1360
    sam1360 committed Mar 28, 2017
    Configuration menu
    Copy the full SHA
    6142284 View commit details
    Browse the repository at this point in the history

  4. more minor changes

    @sam1360
    sam1360 committed Mar 28, 2017
    Configuration menu
    Copy the full SHA
    be586ec View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2017

  1. Merge branch 'master' of github.com:mozillascience/citation-web-server

    @sam1360
    sam1360 committed Apr 10, 2017
    Configuration menu
    Copy the full SHA
    a95b4a2 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2017

  1. Style changes to the code and touched up package.json

    @sam1360
    sam1360 committed Apr 13, 2017
    Configuration menu
    Copy the full SHA
    fd0afad View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master'

    @sam1360
    sam1360 committed Apr 13, 2017
    Configuration menu
    Copy the full SHA
    6e8608a View commit details
    Browse the repository at this point in the history

  3. Added oauthToken and did some cleanup with jslint

    @sam1360
    sam1360 committed Apr 13, 2017
    Configuration menu
    Copy the full SHA
    98cd670 View commit details
    Browse the repository at this point in the history

  4. ****NOT WORKING****added github secret route and partially added gith… 

    …ub token
    @sam1360
    sam1360 committed Apr 13, 2017
    Configuration menu
    Copy the full SHA
    79909bc View commit details
    Browse the repository at this point in the history

Commits on May 2, 2017

  1. Merge remote-tracking branch 'upstream/master'

    @sam1360
    sam1360 committed May 2, 2017
    Configuration menu
    Copy the full SHA
    76fe295 View commit details
    Browse the repository at this point in the history

  2. Small change in package.json

    @sam1360
    sam1360 committed May 2, 2017
    Configuration menu
    Copy the full SHA
    cdcaed9 View commit details
    Browse the repository at this point in the history

  3. updated version number

    @sam1360
    sam1360 committed May 2, 2017
    Configuration menu
    Copy the full SHA
    b39c84a View commit details
    Browse the repository at this point in the history

  4. changes to make server to properly run on heroku

    @sam1360
    sam1360 committed May 2, 2017
    Configuration menu
    Copy the full SHA
    5356793 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2017

  1. Merge branch 'master' of github.com:mozillascience/citation-web-server

    @sam1360
    sam1360 committed May 9, 2017
    Configuration menu
    Copy the full SHA
    b2926bb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://git.heroku.com/software-citation

    @sam1360
    sam1360 committed May 9, 2017
    Configuration menu
    Copy the full SHA
    dab0aae View commit details
    Browse the repository at this point in the history

Commits on May 10, 2017

  1. Fix to make it so the cookie wont be overwritten

    @sam1360
    sam1360 committed May 10, 2017
    Configuration menu
    Copy the full SHA
    d75bd04 View commit details
    Browse the repository at this point in the history

  2. Fix to make it so the cookie wont be overwritten

    @sam1360
    sam1360 committed May 10, 2017
    Configuration menu
    Copy the full SHA
    763367f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'cookiefix' of github.com:sam1360/citation-web-server in… 

    …to cookiefix
    @sam1360
    sam1360 committed May 10, 2017
    Configuration menu
    Copy the full SHA
    70ad072 View commit details
    Browse the repository at this point in the history

  4. client id change

    @sam1360
    sam1360 committed May 10, 2017
    Configuration menu
    Copy the full SHA
    dd27280 View commit details
    Browse the repository at this point in the history

  5. Fix formatting for pr.

    @sam1360
    sam1360 committed May 10, 2017
    Configuration menu
    Copy the full SHA
    c6c2122 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2017

  1. Updated the citation core

    @sam1360
    sam1360 committed May 11, 2017
    Configuration menu
    Copy the full SHA
    ea0fefc View commit details
    Browse the repository at this point in the history