In the middle of speeding up ods files. Commiting to collect data on how slow it was
Merge branch 'master' of git://github.com/isenseDev/rSENSE into speedup
Fixing horrendous upload times for ods files.
Fixing whitespace that rubocop forgot to tell me about locally
tavis doesnt know about unoconv
Travis still not installing unoconv
One more try to make unoconv work on travis, looking at its issuetracker
Not using unoconv, hopefully just using libreoffice headless
only libreoffice-common
Thats the second time today a cop has pulled me over...
fixing merge problem
Trying anything to get libreoffice to run on travis
new textfield for contributor_name
starting to implement contributor names, you can enter a name and it shows up at this point
Merge remote-tracking branch 'upstream/master' into bd1622
contributer name works but fails tests
works as intended with a key but now is broken when logged in
contributor keys now work and all the rake tests pass, however there are a few errors
merge conflict
down to three errors