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

Staging #115

Merged
merged 91 commits into from
Mar 16, 2015
Merged

Staging #115

merged 91 commits into from
Mar 16, 2015

Conversation

vr2262
Copy link
Contributor

@vr2262 vr2262 commented Mar 16, 2015

  • Vagrant stuff
  • Capistrano stuff
  • Moved files into dokomoforms/ folder
  • Store more information for facility questions
  • More tests


     

jmwohl and others added 30 commits February 19, 2015 19:21
@jmwohl
added vagrant shtuff
28849da
@jmwohl
vagrant file runs webapp with nohup
cb4f185
@jmwohl
merged conflict
95f0321
@jmwohl
fixed provisioning to add python3.4
4a8ec7d
@jmwohl
added symlink to make python 3 the default 'python'
47be921
@Snkz
moved +/- codes out so i can do the same with dk
b733716
@jmwohl
updated readme
c142ac1
@jmwohl
Merge branch 'staging' of github.com:SEL-Columbia/dokomoforms into va…
1b6bbc2 
…grant
@vr2262
fix borken chrome tests
38501ac
@vr2262
Add test class name to selenium run name
b87dfea
@Snkz
added template for dont-know
c74b69b
@Snkz
Merge branch 'staging' of github.com:SEL-Columbia/dokomoforms into st…
e5f9748 
…aging
@jmwohl
Merge branch 'staging' of github.com:SEL-Columbia/dokomoforms into va…
daaf8b2 
…grant
@jmwohl
removed trigger dep
149808b
@vr2262
Moved a bunch of things into the dokomoforms/ folder. You're welcome @…
45a93cd 
…csytan
@vr2262
extra cleanup
97a742c
@vr2262
Updated javascript tests
a9656f2
@vr2262
update .travis.yml
fa33f43
@vr2262
renamed pages to handlers
23247e7
@Snkz
Merge branch 'master' into staging
2f7a4ae
@vr2262
Merge remote-tracking branch 'origin/staging' into refactor-friday
353d0c1
@vr2262
Merge pull request #105 from SEL-Columbia/refactor-friday
7e2676b 
Refactor Friday
@vr2262
Add test name to manual selenium run
849ad8e
@Snkz
marker realligned
a0a2397
@Snkz
Merge branch 'staging' of github.com:SEL-Columbia/dokomoforms into st…
0797e08 
…aging
@vr2262
One more shot at xvfb selenium tests
c579a53
@vr2262
Merge pull request #108 from SEL-Columbia/xvfb_travis
45c5193 
One more shot at xvfb selenium tests
@vr2262
Added the Persona test (with some contorted mocks). Fixes #107
ab2d8ed
@vr2262
Change noqa comment
88189f6
@jmwohl
changed python3 to python
89d2774
Snkz and others added 28 commits March 10, 2015 15:28
@Snkz
test mock staging endpoint now
6274bf0
@vr2262
Enable maps for facility questions
2e8cade
@vr2262
Merge branch 'staging' of github.com:SEL-Columbia/dokomoforms into st…
bd03628 
…aging
@jmwohl
Merge branch 'staging' of github.com:SEL-Columbia/dokomoforms into de…
2ff7175 
…ploy
@vr2262
Merge pull request #111 from SEL-Columbia/deploy
9918c08 
Deploy
@jmwohl
added example environment deploy config file
a4381ff
@vr2262
Added test showing incorrect behavior of aggregation.api.count for "f…
4d44680 
…acility" type
@vr2262
Fix test
1c6544a
@vr2262
Fix broken count behavior on "facility" question
cf6e02b
@vr2262
Extra cleanup
041bd80
@vr2262
Rename survey.metadata to survey.survey_metadata
82ea382
@vr2262
Working on updating... need to continue testing api_test:TestSubmission
136f45a
@vr2262
Fix up db and api stuff
38cc85e
@vr2262
Start fixing js stuff... need help @Snkz
e5e649b
@vr2262
Add test for multiselect question
a9d88b2
@vr2262
Merge pull request #112 from SEL-Columbia/extra_selenium_tests
bd4cf4f 
Add test for multiselect question
@vr2262
Fix handlers_test
2f4a4b0
@vr2262
Don't enforce anything about metadata
3b25423
@Snkz
added metadata updated tests
8e61978
@Snkz
merged
6f9b657
@vr2262
Return metadata in survey representation
db9e73e
@vr2262
Merge pull request #113 from SEL-Columbia/answer_metadata_column
5dac62d 
Answer metadata column
@vr2262
Update SQLAlchemy 0.9.8 -> 0.9.9
76c88ba
@vr2262
Update README.md
892b971
@vr2262
xvfb is super useful
70b532b
@vr2262
Merge remote-tracking branch 'origin/staging' into update_sqlalchemy
0ba6c54
@vr2262
SQLAlchemy 0.9.9 outputs a new error
9785139
@vr2262
Merge pull request #114 from SEL-Columbia/update_sqlalchemy
7e18e5b 
Update SQLAlchemy 0.9.8 -> 0.9.9
Snkz added a commit that referenced this pull request Mar 16, 2015
@Snkz
Merge pull request #115 from SEL-Columbia/staging
fbfaa2a 
basic auth as well

[Finishes #89440542] [Finishes #88736672]
@Snkz Snkz merged commit fbfaa2a into master Mar 16, 2015
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.
3 participants
@vr2262 @Snkz @jmwohl