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

Conversation

jesbu1
Copy link

@jesbu1 jesbu1 commented Jun 11, 2018

No description provided.

jesbu1 and others added 30 commits February 20, 2018 15:01
@jesbu1
udpated compute happiness
be0db2d
@AndyLc
Merge branch 'master' of https://github.com/AndyLc/e-mission-server
62170c2
@jesbu1
fixed division by zero
7a8b054
@AndyLc
Merge branch 'master' of https://github.com/AndyLc/e-mission-server
b58da47
@jesbu1
changed structure of debugging statements
5a5a983
@jesbu1
changed suggestion_sys to say something else when user has 0 trips
00fb237
@vasvenk
Creating polar bear for a user upon sign up
3556d52
@vasvenk
Merge branch 'master' of https://github.com/AndyLc/e-mission-server
89d2787
@vasvenk
Changed to update oldhappiness to curr happiness
f061508
@jesbu1
changed webpage
338f7b8
@jesbu1
Merge branch 'master' of https://github.com/AndyLc/e-mission-server
47b3714
@vasvenk
User is now added to Tiersys immediately after signup
1763ae4
@vasvenk
Merge branch 'master' of https://github.com/AndyLc/e-mission-server
9cecd4e
@jesbu1
Jesse changes
9820a72
@jesbu1
analytics and bold
824ae3e
@jesbu1
Merge branch 'master' of https://github.com/AndyLc/e-mission-server
57aca19
@jesbu1
must commit
08b08cd
@jesbu1
Merge branch 'master' of https://github.com/AndyLc/e-mission-server
34afe2e
@vasvenk
Changed because none is bad
32329e4
@vasvenk
Merge branch 'master' of https://github.com/AndyLc/e-mission-server
c8c089f
@jesbu1
Merge branch 'master' of https://github.com/AndyLc/e-mission-server
ac81e4c 
What even is this
@vasvenk
Temporary solution
1a54679
@jesbu1
Merge branch 'master' of https://github.com/AndyLc/e-mission-server
4afe1b9 
Chnaged polarbear
@vasvenk
More none checks
151bdc9
@jesbu1
Merge branch 'master' of https://github.com/AndyLc/e-mission-server
7d6af9e 
Check None
@vasvenk
Commented out immediate polarbear code for now
7f4aa12
@jesbu1
Merge branch 'master' of https://github.com/AndyLc/e-mission-server
1528458 
Commented out immediate polarbear chanages
@jesbu1
added support for new users in tiersys
e54891d
@jesbu1
added polarbear support for new users
fe5baaa
@jesbu1
more polearbear.py support for new users
23bb211
jackcsullivan and others added 23 commits March 19, 2018 13:29
@jackcsullivan
more stop sign resizing issues
a7b257d
@jesbu1
changed android link to e++mission
ee3376f
@jesbu1
added qr code, removed image of second step
0395667
@jesbu1
weird fixes
d97024a
@jesbu1
removed comment
ba68ed1
@jesbu1
fixed parentheses for suggestion sys
1ba3d8d
@jesbu1
got rid of stop sign and second arrow
5ca967e
@jesbu1
open links in new tab
a862d53
@tsekylekobie
fixed typo in faq
ca0373a
@tsekylekobie
updated experiment timeline
bbd41d1
@tsekylekobie
Merge branch 'master' of https://github.com/AndyLc/e-mission-server
32f014e
@tsekylekobie
updated end date
3c20da6
@jackcsullivan
less text on beginning of landing page
33ee0a9
@jesbu1
new computecarbon and penalty
d5f7d5b
@jesbu1
Merge branch 'master' of https://github.com/AndyLc/e-mission-server
f6306c4
@jesbu1
new computecarbon and penalty
dcabbcd
@jesbu1
fixed penalty
cc7e8a2
@jleyden
fixed syntax error
1c369fd
@jesbu1
fixed syntax error
3872cbf
@jesbu1
Merge branch 'master' of https://github.com/AndyLc/e-mission-server
783e646
@jesbu1
another syntax error
9f895fc
@jesbu1
adding responses csv for analysis
ab13189
@jesbu1
removed stuff that shouldn't be checked in
13609ce
@AmplabJenkins
Copy link

Can one of the admins verify this patch?

@shankari
Copy link
Contributor

Why do you need to check in the matplotlib-ubuntu-*/fontList.py3k.cache. Those look like matplotlib font caches, which should definitely not be checked in.

@shankari
Copy link
Contributor

what are the emission/tests/data/real_examples/*.timeline files. They are new here, but I don't see them used anywhere in the tests...

@jesbu1
Copy link
Author

jesbu1 commented Jun 11, 2018 •
edited
Loading

No idea what the real_examples/ files are
Wait actually, i think I know what those are, those are no longer required i'll just remove them

@shankari shankari changed the base branch from random-forest-mode-detection to master September 23, 2023 04:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@jesbu1 @AmplabJenkins @shankari @AndyLc @vasvenk @jackcsullivan @tsekylekobie @jleyden