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

Pr branch #582

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

Pr branch #582

wants to merge 492 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Feb 20, 2018

  1. udpated compute happiness

    @jesbu1
    jesbu1 committed Feb 20, 2018
    Configuration menu
    Copy the full SHA
    be0db2d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @AndyLc
    AndyLc committed Feb 20, 2018
    Configuration menu
    Copy the full SHA
    62170c2 View commit details
    Browse the repository at this point in the history

  3. fixed division by zero

    @jesbu1
    jesbu1 committed Feb 20, 2018
    Configuration menu
    Copy the full SHA
    7a8b054 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2018

  1. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @AndyLc
    AndyLc committed Feb 22, 2018
    Configuration menu
    Copy the full SHA
    b58da47 View commit details
    Browse the repository at this point in the history

  2. changed structure of debugging statements

    @jesbu1
    jesbu1 committed Feb 22, 2018
    Configuration menu
    Copy the full SHA
    5a5a983 View commit details
    Browse the repository at this point in the history

  3. changed suggestion_sys to say something else when user has 0 trips

    @jesbu1
    jesbu1 committed Feb 22, 2018
    Configuration menu
    Copy the full SHA
    00fb237 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2018

  1. Creating polar bear for a user upon sign up

    @vasvenk
    vasvenk committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    3556d52 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @vasvenk
    vasvenk committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    89d2787 View commit details
    Browse the repository at this point in the history

  3. Changed to update oldhappiness to curr happiness

    @vasvenk
    vasvenk committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    f061508 View commit details
    Browse the repository at this point in the history

  4. changed webpage

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    338f7b8 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    47b3714 View commit details
    Browse the repository at this point in the history

  6. User is now added to Tiersys immediately after signup

    @vasvenk
    vasvenk committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    1763ae4 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @vasvenk
    vasvenk committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    9cecd4e View commit details
    Browse the repository at this point in the history

  8. Jesse changes

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    9820a72 View commit details
    Browse the repository at this point in the history

  9. analytics and bold

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    824ae3e View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    57aca19 View commit details
    Browse the repository at this point in the history

  11. must commit

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    08b08cd View commit details
    Browse the repository at this point in the history

  12. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    34afe2e View commit details
    Browse the repository at this point in the history

  13. Changed because none is bad

    @vasvenk
    vasvenk committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    32329e4 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @vasvenk
    vasvenk committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    c8c089f View commit details
    Browse the repository at this point in the history

  15. Merge branch 'master' of https://github.com/AndyLc/e-mission-server 

    What even is this
    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    ac81e4c View commit details
    Browse the repository at this point in the history

  16. Temporary solution

    @vasvenk
    vasvenk committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    1a54679 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'master' of https://github.com/AndyLc/e-mission-server 

    Chnaged polarbear
    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    4afe1b9 View commit details
    Browse the repository at this point in the history

  18. More none checks

    @vasvenk
    vasvenk committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    151bdc9 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'master' of https://github.com/AndyLc/e-mission-server 

    Check None
    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    7d6af9e View commit details
    Browse the repository at this point in the history

  20. Commented out immediate polarbear code for now

    @vasvenk
    vasvenk committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    7f4aa12 View commit details
    Browse the repository at this point in the history

  21. Merge branch 'master' of https://github.com/AndyLc/e-mission-server 

    Commented out immediate polarbear chanages
    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    1528458 View commit details
    Browse the repository at this point in the history

  22. added support for new users in tiersys

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    e54891d View commit details
    Browse the repository at this point in the history

  23. added polarbear support for new users

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    fe5baaa View commit details
    Browse the repository at this point in the history

  24. more polearbear.py support for new users

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    23bb211 View commit details
    Browse the repository at this point in the history

  25. indexing

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    b48aef9 View commit details
    Browse the repository at this point in the history

  26. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    656fb0c View commit details
    Browse the repository at this point in the history

  27. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @AndyLc
    AndyLc committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    fa8106e View commit details
    Browse the repository at this point in the history

  28. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    2e49e82 View commit details
    Browse the repository at this point in the history

  29. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @AndyLc
    AndyLc committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    130f6da View commit details
    Browse the repository at this point in the history

  30. update_one syntax

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    0754dbc View commit details
    Browse the repository at this point in the history

  31. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    7b078f6 View commit details
    Browse the repository at this point in the history

  32. fixed syntax

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    832e226 View commit details
    Browse the repository at this point in the history

  33. Uncommmented registration polabear code

    @vasvenk
    vasvenk committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    24975e8 View commit details
    Browse the repository at this point in the history

  34. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @vasvenk
    vasvenk committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    f9586f9 View commit details
    Browse the repository at this point in the history

  35. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    e7e4182 View commit details
    Browse the repository at this point in the history

  36. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    4baf351 View commit details
    Browse the repository at this point in the history

  37. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @AndyLc
    AndyLc committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    d5ec752 View commit details
    Browse the repository at this point in the history

  38. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    01c28e1 View commit details
    Browse the repository at this point in the history

  39. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @AndyLc
    AndyLc committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    e7c07ce View commit details
    Browse the repository at this point in the history

  40. fixed another error

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    884c29c View commit details
    Browse the repository at this point in the history

  41. fixed another syntax

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    fe4bb43 View commit details
    Browse the repository at this point in the history

  42. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    621b76e View commit details
    Browse the repository at this point in the history

  43. testing

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    2f21b35 View commit details
    Browse the repository at this point in the history

  44. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    b748627 View commit details
    Browse the repository at this point in the history

  45. fixed jesse error

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    2336a06 View commit details
    Browse the repository at this point in the history

  46. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    03727c2 View commit details
    Browse the repository at this point in the history

  47. wef

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    3dea5be View commit details
    Browse the repository at this point in the history

  48. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    5eb380c View commit details
    Browse the repository at this point in the history

  49. Added to get_databast

    @vasvenk
    vasvenk committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    3fa1a08 View commit details
    Browse the repository at this point in the history

  50. fix keyerror possibly

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    ebc5f6e View commit details
    Browse the repository at this point in the history

  51. Made changes to db

    @vasvenk
    vasvenk committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    583373a View commit details
    Browse the repository at this point in the history

  52. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @vasvenk
    vasvenk committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    a29e0c4 View commit details
    Browse the repository at this point in the history

  53. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    6808603 View commit details
    Browse the repository at this point in the history

  54. fixing keyerrror

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    4364f56 View commit details
    Browse the repository at this point in the history

  55. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    115eac5 View commit details
    Browse the repository at this point in the history

  56. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    97fdd4d View commit details
    Browse the repository at this point in the history

  57. fixed syntax error

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    8c8eb40 View commit details
    Browse the repository at this point in the history

  58. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    0ae21dc View commit details
    Browse the repository at this point in the history

  59. fixed nonetype errro'

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    db75360 View commit details
    Browse the repository at this point in the history

  60. Syntax

    @vasvenk
    vasvenk committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    60cfa98 View commit details
    Browse the repository at this point in the history

  61. Why

    @vasvenk
    vasvenk committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    d107930 View commit details
    Browse the repository at this point in the history

  62. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    ed14e7f View commit details
    Browse the repository at this point in the history

  63. just trying somethign

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    4911eab View commit details
    Browse the repository at this point in the history

  64. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    497f469 View commit details
    Browse the repository at this point in the history

  65. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    0560dda View commit details
    Browse the repository at this point in the history

  66. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    0b5392f View commit details
    Browse the repository at this point in the history

  67. trying to fix issues

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    27f7eab View commit details
    Browse the repository at this point in the history

  68. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    be648ee View commit details
    Browse the repository at this point in the history

  69. pls

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    0adcf57 View commit details
    Browse the repository at this point in the history

  70. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    ec23180 View commit details
    Browse the repository at this point in the history

  71. please

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    1918d8c View commit details
    Browse the repository at this point in the history

  72. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    0ac15e4 View commit details
    Browse the repository at this point in the history

  73. hopefully fuixed

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    bbede65 View commit details
    Browse the repository at this point in the history

  74. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    47afaea View commit details
    Browse the repository at this point in the history

  75. maybe fixed deletion error

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    b47abdb View commit details
    Browse the repository at this point in the history

  76. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    e8338b0 View commit details
    Browse the repository at this point in the history

  77. maybe fixed

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    83c80f0 View commit details
    Browse the repository at this point in the history

  78. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    95296f9 View commit details
    Browse the repository at this point in the history

  79. temp fix'

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    ce1861b View commit details
    Browse the repository at this point in the history

  80. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    169066d View commit details
    Browse the repository at this point in the history

  81. fix

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    943b8ee View commit details
    Browse the repository at this point in the history

  82. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    79af493 View commit details
    Browse the repository at this point in the history

  83. fix

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    a781ecd View commit details
    Browse the repository at this point in the history

  84. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    4eb8a00 View commit details
    Browse the repository at this point in the history

  85. nonecheck

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    1292522 View commit details
    Browse the repository at this point in the history

  86. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    240ebb3 View commit details
    Browse the repository at this point in the history

  87. fixed nonechecks

    @jesbu1
    jesbu1 committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    81354c8 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2018

  1. get_new_tier_db() method change

    @jackcsullivan
    jackcsullivan committed Feb 24, 2018
    Configuration menu
    Copy the full SHA
    5278917 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 24, 2018
    Configuration menu
    Copy the full SHA
    2624f88 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 24, 2018
    Configuration menu
    Copy the full SHA
    a8d9caa View commit details
    Browse the repository at this point in the history

  4. update

    @jesbu1
    jesbu1 committed Feb 24, 2018
    Configuration menu
    Copy the full SHA
    ba13e22 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 24, 2018
    Configuration menu
    Copy the full SHA
    2c06f20 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 24, 2018
    Configuration menu
    Copy the full SHA
    69d8320 View commit details
    Browse the repository at this point in the history

  7. added debug

    @jesbu1
    jesbu1 committed Feb 24, 2018
    Configuration menu
    Copy the full SHA
    06f88e2 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 24, 2018
    Configuration menu
    Copy the full SHA
    1c886c5 View commit details
    Browse the repository at this point in the history

  9. logging error

    @jesbu1
    jesbu1 committed Feb 24, 2018
    Configuration menu
    Copy the full SHA
    81f2bce View commit details
    Browse the repository at this point in the history

  10. Fixed none error

    @vasvenk
    vasvenk committed Feb 24, 2018
    Configuration menu
    Copy the full SHA
    081c4de View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 24, 2018
    Configuration menu
    Copy the full SHA
    8ed0870 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2018

  1. updated suggestion message to ask to tap the suggesiton

    @jesbu1
    jesbu1 committed Feb 25, 2018
    Configuration menu
    Copy the full SHA
    3b2f0e5 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2018

  1. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 26, 2018
    Configuration menu
    Copy the full SHA
    0b50cdc View commit details
    Browse the repository at this point in the history

  2. merging

    @jesbu1
    jesbu1 committed Feb 26, 2018
    Configuration menu
    Copy the full SHA
    a462b0e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @AndyLc
    AndyLc committed Feb 26, 2018
    Configuration menu
    Copy the full SHA
    e4aad38 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @AndyLc
    AndyLc committed Feb 26, 2018
    Configuration menu
    Copy the full SHA
    bbdf860 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 26, 2018
    Configuration menu
    Copy the full SHA
    205b6f6 View commit details
    Browse the repository at this point in the history

  6. added support for new modes mentioned by decision tree in suggestions… 

    …ys, user carbon calculation, and check_for_notifications
    @jesbu1
    jesbu1 committed Feb 26, 2018
    Configuration menu
    Copy the full SHA
    644929c View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2018

  1. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 27, 2018
    Configuration menu
    Copy the full SHA
    0e9f07e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @AndyLc
    AndyLc committed Feb 27, 2018
    Configuration menu
    Copy the full SHA
    93d8e65 View commit details
    Browse the repository at this point in the history

  3. fixed typo

    @jesbu1
    jesbu1 committed Feb 27, 2018
    Configuration menu
    Copy the full SHA
    719db6a View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @AndyLc
    AndyLc committed Feb 27, 2018
    Configuration menu
    Copy the full SHA
    12351fe View commit details
    Browse the repository at this point in the history

  5. Added safety check for User.getUsername(user_id)

    @AndyLc
    AndyLc committed Feb 27, 2018
    Configuration menu
    Copy the full SHA
    507ff3c View commit details
    Browse the repository at this point in the history

  6. Fix tab-space usage

    @AndyLc
    AndyLc committed Feb 27, 2018
    Configuration menu
    Copy the full SHA
    31d650b View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2018

  1. Fixed issue with usernames

    @vasvenk
    vasvenk committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    d00e6c1 View commit details
    Browse the repository at this point in the history

  2. Who knows

    @jesbu1
    jesbu1 committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    f711535 View commit details
    Browse the repository at this point in the history

  3. Pls dont break

    @jesbu1
    jesbu1 committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    325c717 View commit details
    Browse the repository at this point in the history

  4. None check:

    @vasvenk
    vasvenk committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    308e445 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/AndyLc/e-mission-server 

    New commit
    @jesbu1
    jesbu1 committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    78e0805 View commit details
    Browse the repository at this point in the history

  6. First batch of landing page changes

    @jackcsullivan
    jackcsullivan committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    22bcdae View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jackcsullivan
    jackcsullivan committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    c0dc15f View commit details
    Browse the repository at this point in the history

  8. This code dont make no sense

    @vasvenk
    vasvenk committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    2a54ade View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @vasvenk
    vasvenk committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    8cae37a View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' of https://github.com/AndyLc/e-mission-server 

    Lawd save me
    @jesbu1
    jesbu1 committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    3fe9319 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    39e164e View commit details
    Browse the repository at this point in the history

  12. Draft of study details on landing page

    @jackcsullivan
    jackcsullivan committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    bf4e507 View commit details
    Browse the repository at this point in the history

  13. changed website text

    @jesbu1
    jesbu1 committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    048b2d8 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    ac35d1f View commit details
    Browse the repository at this point in the history

  15. landing pages misc changes

    @jackcsullivan
    jackcsullivan committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    c8610c0 View commit details
    Browse the repository at this point in the history

  16. made landing page header black and bold

    @jesbu1
    jesbu1 committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    d44386f View commit details
    Browse the repository at this point in the history

  17. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    4f0bca9 View commit details
    Browse the repository at this point in the history

  18. website changes

    @jesbu1
    jesbu1 committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    06807cb View commit details
    Browse the repository at this point in the history

  19. added support for scss filepath in webapp

    @jesbu1
    jesbu1 committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    182baa2 View commit details
    Browse the repository at this point in the history

  20. webserver changes

    @jesbu1
    jesbu1 committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    0d346c5 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2018

  1. added navbar collapsable menu so it doesn't take up the whole screen … 

    …on mobile
    @jesbu1
    jesbu1 committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    4a26ca5 View commit details
    Browse the repository at this point in the history

  2. log intake

    @AndyLc
    AndyLc committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    21bc61d View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2018

  1. added raw carbon metric for user

    @jesbu1
    jesbu1 committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    88ce09a View commit details
    Browse the repository at this point in the history

  2. Modified tiersys to save user metrics in a new DB

    @vasvenk
    vasvenk committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    ab07647 View commit details
    Browse the repository at this point in the history

  3. conf

    @AndyLc
    AndyLc committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    9e1044a View commit details
    Browse the repository at this point in the history

  4. emission

    @AndyLc
    AndyLc committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    310c82a View commit details
    Browse the repository at this point in the history

  5. Added client in try block

    @vasvenk
    vasvenk committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    80702ad View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @AndyLc
    AndyLc committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    830d691 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2018

  1. added note to step 2 of landing page

    @jackcsullivan
    jackcsullivan committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    465bb03 View commit details
    Browse the repository at this point in the history

  2. fixing error in suggestion sys

    @jesbu1
    jesbu1 committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    bc142d1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    a6c1f8f View commit details
    Browse the repository at this point in the history

  4. polar bear math update

    @AndyLc
    AndyLc committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    f03a793 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @AndyLc
    AndyLc committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    bf9605f View commit details
    Browse the repository at this point in the history

  6. fix addition

    @AndyLc
    AndyLc committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    e21701b View commit details
    Browse the repository at this point in the history

  7. Fixed carbonTierRank

    @vasvenk
    vasvenk committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    7e11692 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2018

  1. fixing new user tier maybe

    @jesbu1
    jesbu1 committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    f16c016 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    239f1c2 View commit details
    Browse the repository at this point in the history

  3. pushing hotfix

    @jesbu1
    jesbu1 committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    1a22ad6 View commit details
    Browse the repository at this point in the history

  4. hotfix for polarbear

    @jesbu1
    jesbu1 committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    4e5b789 View commit details
    Browse the repository at this point in the history

  5. forgot to import datetime

    @jesbu1
    jesbu1 committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    231d83d View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @AndyLc
    AndyLc committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    a565e31 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @AndyLc
    AndyLc committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    ea92cca View commit details
    Browse the repository at this point in the history

  8. fixed divding into buckets

    @jesbu1
    jesbu1 committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    e3688a4 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @AndyLc
    AndyLc committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    d4194fa View commit details
    Browse the repository at this point in the history

  10. trying another way to divide into buckets

    @jesbu1
    jesbu1 committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    9144bf9 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @AndyLc
    AndyLc committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    fe4021b View commit details
    Browse the repository at this point in the history

  12. added debugging print statements

    @jesbu1
    jesbu1 committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    0502bf8 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @AndyLc
    AndyLc committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    518a614 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @AndyLc
    AndyLc committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    3b11f2d View commit details
    Browse the repository at this point in the history

  15. found source of weird buckets error

    @jesbu1
    jesbu1 committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    8f4c880 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @AndyLc
    AndyLc committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    2149e80 View commit details
    Browse the repository at this point in the history

  17. syntax fix

    @jesbu1
    jesbu1 committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    4776975 View commit details
    Browse the repository at this point in the history

  18. refactor

    @jesbu1
    jesbu1 committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    242b229 View commit details
    Browse the repository at this point in the history

  19. added logging statement

    @jesbu1
    jesbu1 committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    e0c8c74 View commit details
    Browse the repository at this point in the history

  20. fix for polar bear usernames

    @jesbu1
    jesbu1 committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    efef18d View commit details
    Browse the repository at this point in the history

  21. logging debug syntax

    @jesbu1
    jesbu1 committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    f3ebab9 View commit details
    Browse the repository at this point in the history

  22. changed to inferred_section for suggestion sys and notification checking

    @jesbu1
    jesbu1 committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    47a44fe View commit details
    Browse the repository at this point in the history

  23. Nonetype check

    @jesbu1
    jesbu1 committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    1b9ae13 View commit details
    Browse the repository at this point in the history

  24. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @AndyLc
    AndyLc committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    bb5fa8f View commit details
    Browse the repository at this point in the history

  25. Changed step 1 come back to this page text to red

    @jackcsullivan
    jackcsullivan committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    a11e319 View commit details
    Browse the repository at this point in the history

  26. checking in website test file

    @jesbu1
    jesbu1 committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    63964bc View commit details
    Browse the repository at this point in the history

  27. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    95a9642 View commit details
    Browse the repository at this point in the history

  28. making script more generalizeable

    @jesbu1
    jesbu1 committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    397f9b1 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2018

  1. limiting to 5 polar bears

    @jesbu1
    jesbu1 committed Mar 7, 2018
    Configuration menu
    Copy the full SHA
    92b4a88 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2018

  1. added another nonetype check for username

    @jesbu1
    jesbu1 committed Mar 8, 2018
    Configuration menu
    Copy the full SHA
    fead010 View commit details
    Browse the repository at this point in the history

  2. none error

    @jesbu1
    jesbu1 committed Mar 8, 2018
    Configuration menu
    Copy the full SHA
    cbe2a9c View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2018

  1. cfc_webapp update to get uuid from request

    @jesbu1
    jesbu1 committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    5ec3406 View commit details
    Browse the repository at this point in the history

  2. Made a none chec for tierNum

    @vasvenk
    vasvenk committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    b8e602a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @vasvenk
    vasvenk committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    527923a View commit details
    Browse the repository at this point in the history

  4. added faq

    @tsekylekobie
    tsekylekobie committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    7b036fe View commit details
    Browse the repository at this point in the history

  5. omg i think we fixed it

    @jesbu1
    jesbu1 committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    e3f3d26 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @tsekylekobie
    tsekylekobie committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    ed09597 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @AndyLc
    AndyLc committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    ed1b1a7 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    b43e8be View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @AndyLc
    AndyLc committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    c37f098 View commit details
    Browse the repository at this point in the history

  10. another nonechcek

    @jesbu1
    jesbu1 committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    16c0169 View commit details
    Browse the repository at this point in the history

  11. faq

    @jesbu1
    jesbu1 committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    acd2df8 View commit details
    Browse the repository at this point in the history

  12. syntax

    @jesbu1
    jesbu1 committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    3209cce View commit details
    Browse the repository at this point in the history

  13. idk man

    @jesbu1
    jesbu1 committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    a2c90ae View commit details
    Browse the repository at this point in the history

  14. aoiwejf

    @jesbu1
    jesbu1 committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    5653986 View commit details
    Browse the repository at this point in the history

  15. faq

    @jesbu1
    jesbu1 committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    d14fd2a View commit details
    Browse the repository at this point in the history

  16. fixed faq links

    @tsekylekobie
    tsekylekobie committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    dbe3315 View commit details
    Browse the repository at this point in the history

  17. fix the css and js links

    @tsekylekobie
    tsekylekobie committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    2044725 View commit details
    Browse the repository at this point in the history

  18. fixing dict stuff

    @jesbu1
    jesbu1 committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    fe72875 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    5080f88 View commit details
    Browse the repository at this point in the history

  20. force kill faq

    @tsekylekobie
    tsekylekobie committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    1eb9057 View commit details
    Browse the repository at this point in the history

  21. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @tsekylekobie
    tsekylekobie committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    eb412bd View commit details
    Browse the repository at this point in the history

  22. fixed link to home page

    @tsekylekobie
    tsekylekobie committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    ebd902a View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2018

  1. fixed penalty metric

    @jesbu1
    jesbu1 committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    db9fc2c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    57d9d30 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @AndyLc
    AndyLc committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    a0e4035 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @AndyLc
    AndyLc committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    5f3b387 View commit details
    Browse the repository at this point in the history

  5. fixing leaderboard and polar bear size

    @jesbu1
    jesbu1 committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    ac9eea0 View commit details
    Browse the repository at this point in the history

  6. fix vas error lmao xd

    @AndyLc
    AndyLc committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    45505e4 View commit details
    Browse the repository at this point in the history

  7. hello vas

    @jesbu1
    jesbu1 committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    9261dea View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    3b8465f View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @AndyLc
    AndyLc committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    8627d55 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2018

  1. user.py and polarbear.py

    @AndyLc
    AndyLc committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    9f0ca5b View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2018

  1. adding for info about error

    @jesbu1
    jesbu1 committed Mar 16, 2018
    Configuration menu
    Copy the full SHA
    296864d View commit details
    Browse the repository at this point in the history

  2. omg

    @jesbu1
    jesbu1 committed Mar 16, 2018
    Configuration menu
    Copy the full SHA
    d8dbe0e View commit details
    Browse the repository at this point in the history

  3. specialized faq and social media links

    @tsekylekobie
    tsekylekobie committed Mar 16, 2018
    Configuration menu
    Copy the full SHA
    e0ca162 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @tsekylekobie
    tsekylekobie committed Mar 16, 2018
    Configuration menu
    Copy the full SHA
    1a2888a View commit details
    Browse the repository at this point in the history

  5. added shared/footer route

    @tsekylekobie
    tsekylekobie committed Mar 16, 2018
    Configuration menu
    Copy the full SHA
    7b02fb5 View commit details
    Browse the repository at this point in the history

  6. preferences screenshot

    @jackcsullivan
    jackcsullivan committed Mar 16, 2018
    Configuration menu
    Copy the full SHA
    bf16e9d View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2018

  1. fixed social media links

    @tsekylekobie
    tsekylekobie committed Mar 19, 2018
    Configuration menu
    Copy the full SHA
    e83c805 View commit details
    Browse the repository at this point in the history

  2. Stop landing page image

    @jackcsullivan
    jackcsullivan committed Mar 19, 2018
    Configuration menu
    Copy the full SHA
    bcd8860 View commit details
    Browse the repository at this point in the history

  3. twitter/fb images

    @jackcsullivan
    jackcsullivan committed Mar 19, 2018
    Configuration menu
    Copy the full SHA
    5f9d210 View commit details
    Browse the repository at this point in the history

  4. rescaled stop sign

    @jackcsullivan
    jackcsullivan committed Mar 19, 2018
    Configuration menu
    Copy the full SHA
    8f31ccb View commit details
    Browse the repository at this point in the history

  5. more stop sign resizing issues

    @jackcsullivan
    jackcsullivan committed Mar 19, 2018
    Configuration menu
    Copy the full SHA
    a7b257d View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2018

  1. changed android link to e++mission

    @jesbu1
    jesbu1 committed Mar 22, 2018
    Configuration menu
    Copy the full SHA
    ee3376f View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2018

  1. added qr code, removed image of second step

    @jesbu1
    jesbu1 committed Mar 29, 2018
    Configuration menu
    Copy the full SHA
    0395667 View commit details
    Browse the repository at this point in the history

  2. weird fixes

    @jesbu1
    jesbu1 committed Mar 29, 2018
    Configuration menu
    Copy the full SHA
    d97024a View commit details
    Browse the repository at this point in the history

  3. removed comment

    @jesbu1
    jesbu1 committed Mar 29, 2018
    Configuration menu
    Copy the full SHA
    ba68ed1 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2018

  1. fixed parentheses for suggestion sys

    @jesbu1
    jesbu1 committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    1ba3d8d View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2018

  1. got rid of stop sign and second arrow

    @jesbu1
    jesbu1 committed Apr 7, 2018
    Configuration menu
    Copy the full SHA
    5ca967e View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2018

  1. open links in new tab

    @jesbu1
    jesbu1 committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    a862d53 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2018

  1. fixed typo in faq

    @tsekylekobie
    tsekylekobie committed Apr 13, 2018
    Configuration menu
    Copy the full SHA
    ca0373a View commit details
    Browse the repository at this point in the history

  2. updated experiment timeline

    @tsekylekobie
    tsekylekobie committed Apr 13, 2018
    Configuration menu
    Copy the full SHA
    bbd41d1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @tsekylekobie
    tsekylekobie committed Apr 13, 2018
    Configuration menu
    Copy the full SHA
    32f014e View commit details
    Browse the repository at this point in the history

  4. updated end date

    @tsekylekobie
    tsekylekobie committed Apr 13, 2018
    Configuration menu
    Copy the full SHA
    3c20da6 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2018

  1. less text on beginning of landing page

    @jackcsullivan
    jackcsullivan committed Apr 28, 2018
    Configuration menu
    Copy the full SHA
    33ee0a9 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2018

  1. new computecarbon and penalty

    @jesbu1
    jesbu1 committed May 16, 2018
    Configuration menu
    Copy the full SHA
    d5f7d5b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed May 16, 2018
    Configuration menu
    Copy the full SHA
    f6306c4 View commit details
    Browse the repository at this point in the history

  3. new computecarbon and penalty

    @jesbu1
    jesbu1 committed May 16, 2018
    Configuration menu
    Copy the full SHA
    dcabbcd View commit details
    Browse the repository at this point in the history

  4. fixed penalty

    @jesbu1
    jesbu1 committed May 16, 2018
    Configuration menu
    Copy the full SHA
    cc7e8a2 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2018

  1. fixed syntax error

    @jleyden
    jleyden committed May 18, 2018
    Configuration menu
    Copy the full SHA
    1c369fd View commit details
    Browse the repository at this point in the history

  2. fixed syntax error

    @jesbu1
    jesbu1 committed May 18, 2018
    Configuration menu
    Copy the full SHA
    3872cbf View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/AndyLc/e-mission-server

    @jesbu1
    jesbu1 committed May 18, 2018
    Configuration menu
    Copy the full SHA
    783e646 View commit details
    Browse the repository at this point in the history

  4. another syntax error

    @jesbu1
    jesbu1 committed May 18, 2018
    Configuration menu
    Copy the full SHA
    9f895fc View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2018

  1. adding responses csv for analysis

    @jesbu1
    jesbu1 committed Jun 6, 2018
    Configuration menu
    Copy the full SHA
    ab13189 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2018

  1. removed stuff that shouldn't be checked in

    @jesbu1
    jesbu1 committed Jun 11, 2018
    Configuration menu
    Copy the full SHA
    13609ce View commit details
    Browse the repository at this point in the history

  2. removed matplotlib

    @jesbu1
    jesbu1 committed Jun 11, 2018
    Configuration menu
    Copy the full SHA
    ca72110 View commit details
    Browse the repository at this point in the history

  3. removed timeline files that were unnecessary

    @jesbu1
    jesbu1 committed Jun 11, 2018
    Configuration menu
    Copy the full SHA
    2444df7 View commit details
    Browse the repository at this point in the history