Commits

Commits on Jan 16, 2017

updated heroku API key for CI
eripheebs
committed
0ea4af1

Commits on Jan 15, 2017

can pick whether academic or student at sign up
eripheebs
committed
700457d

Commits on Dec 9, 2016

Merge pull request #128 from empowerhack/forgotten-email
kevinpmcc
authored
e3f7143

Commits on Dec 6, 2016

updated to use jamiya@vocapp.org
kevinpmcc
committed
c20fc62

Commits on Dec 5, 2016

Merge branch 'prototype-v0.1' into forgotten-email
kevinpmcc
committed
9c8ec29

Commits on Dec 3, 2016

Merge pull request #127 from empowerhack/121-update-seeds
kevinpmcc
authored
aea4760
removing more duplicated tests
kevinpmcc
committed
25cf761
removing save_and_open_page
kevinpmcc
committed
e2e47ef
one test failing, not sure why, save_and_open_page indicates it should be passing
kevinpmcc
committed
30fbc57
Merge pull request #126 from empowerhack/fix-answer-test-issue
kevinpmcc
authored
e8e2ef5
fixed answer test issue
kevinpmcc
committed
619641c
merge conflict fixed
kevinpmcc
committed
d857cd8
mergin
kevinpmcc
committed
a00acd7
fixed merge conflicts
kevinpmcc
committed
faae676
Merge pull request #123 from empowerhack/118-add-defintionen
kevinpmcc
authored
3127e4d
fixed merge conflicts
kevinpmcc
committed
1b97626
Merge pull request #122 from empowerhack/119-add-ref-URL
kevinpmcc
authored
52978b1

Commits on Dec 2, 2016

Merge pull request #125 from empowerhack/111-fix-dropdown-list-issue
eripheebs
authored
4d32cf7
removed unnecessary label
kevinpmcc
committed
a518a26
added css background color to option
kevinpmcc
committed
b336523
seeds now adds more fields
kevinpmcc
committed
38125e6
all merged all tests passing
kevinpmcc
committed
adc7b9d
fix merge conflicts
kevinpmcc
committed
c0c0250
made academic default to false
kevinpmcc
committed
fcdfc19
fixed typos definition_en to definition_ar
kevinpmcc
committed
96a06ae
tidied url_fixer a little
kevinpmcc
committed
4c289da
academics and admins can add answers, normal users cant, removed sign in to add definition as no longer applicable
kevinpmcc
committed
e98aea1
updated answer feature tests so now failing until academic role added
kevinpmcc
committed
5e046df

Commits on Dec 1, 2016