Commit Graph

1989 Commits

Author SHA1 Message Date
Bastian Greshake
e553c8b321 fixed issue in mail layout + add survey 2017-06-15 17:05:22 +02:00
Philipp Bayer
fc7fc5646f Merge pull request #402 from openSNP/snp_api_test
[MRG] added further SNP-API tests [closes #401]
2017-06-13 16:59:02 +08:00
Bastian Greshake
64f35c9632 last updates 2017-06-12 16:50:30 +02:00
Bastian Greshake
dcc2aa1a4c remove fixed ids 2017-06-12 16:49:28 +02:00
Bastian Greshake
7ef36edcea 🐶 2017-06-12 16:41:42 +02:00
Bastian Greshake
3542265faa added further SNP tests 2017-06-12 16:34:01 +02:00
Helge Rausch
fcecb4f732 Use new Codeclimate test reporter (#400)
* Use new Codeclimate test reporter

It let's us combine the reports from both, rspec and test/unit.

* Check if coverage drop comes from config change

* Revert "Check if coverage drop comes from config change"

This reverts commit f8f91fe9664a22a8307b3a328aa6510c876b7dff.
2017-06-10 14:40:20 +02:00
Bastian Greshake
d2146542e6 [MRG] new tests: delete foreign messages + search (#397)
* new tests: delete foreign messages + search

* failed again at making the hound happy

* test for logged in user trying log in

* remove accidental edit

* test for uploading genotype form

* 🐶
2017-06-09 15:38:08 +02:00
Bastian Greshake
f29752b550 [MRG] fixed message deleting + added tests, closes #391 (#394)
* fixed message deleting + added tests

* hound, codeclimate, travis…
2017-06-08 10:19:30 +02:00
Bastian Greshake
7011c5ab90 Update ROADMAP.md (#393) 2017-06-07 17:46:56 +02:00
Bastian Greshake
a30c0494ab making rubocop happier about user_mailer 2017-06-06 21:21:46 +02:00
Bastian Greshake
98c1943c1a [MRG] Adding more tests (#390)
* added more tests for snp page

* 🐶  happiness

* tests for changing password

* 🐶  happiness

* helge happiness ;)
2017-06-06 16:16:04 +02:00
Bastian Greshake
9499dfc93e [MRG] Email layouts. Closes #301 (#373)
* started implementing layouts for emails

* first version of email layout

* formatted the emails

* adapting test to new footer

* fixing tests

* the copy and paste strikes back

* the copy and paste strikes back2

* the copy and paste strikes back3

* the copy and paste strikes back3

* Update user_mailer.html.erb

forgot a line break

* included helge's 👍 tip

* Update user_mailer.rb

make the hound happy

* making codeclimate happy (or so i hope)
2017-06-06 12:37:04 +02:00
Helge Rausch
2319919ccd Put back Rails specific config for SimpleCov (#389)
Without the `'rails'`, coverage drops to ~15% for the legacy tests, which probably means, it doesn't find all the tests.
2017-06-06 12:01:11 +02:00
Bastian Greshake
ef83c4b5c0 Added tests (#388)
* work on tests

* snp API test

* making hound happier

* Give the scenarios some space
2017-06-06 11:49:52 +02:00
Bastian Greshake
3d235b8504 Update .travis.yml
full removal of old codeclimate token.
2017-06-05 14:53:32 +02:00
Bastian Greshake
7e2614ee84 Update .travis.yml
removed codeclimate token from travis, generated new one that's now on travis backend again.
2017-06-05 14:45:55 +02:00
Philipp Bayer
c2545e8794 Testwide code coverage fix (#387)
* Testwide code coverage fix

* Flip the gem around

* Flip the gem around, AGAIN
2017-06-05 11:18:59 +02:00
Philipp Bayer
203defdc53 Merge pull request #386 from openSNP/UIfixes2
two more for #375
2017-06-03 15:59:48 +08:00
Bastian Greshake
5fc8a6eb21 two more for #375 2017-06-03 09:50:03 +02:00
Philipp Bayer
47dd2152c2 Merge pull request #385 from openSNP/UIfixes
piecharts work again
2017-06-03 15:44:09 +08:00
Bastian Greshake
fbbec0cb05 piecharts work again 2017-06-03 09:38:36 +02:00
Philipp Bayer
98d5c42b61 Merge pull request #384 from philippbayer/speed_up_updates
Updates: Replaces sorting by created_at by sorting by ID, speed up the associated view
2017-06-03 14:53:11 +08:00
Philipp Bayer
41a8da6912 Get the user # not by counting all users, but by subtracting from the total count once 2017-06-03 14:26:29 +08:00
Philipp Bayer
328da2ab5f Replaces sorting by created_at by sorting by ID, faster 2017-06-03 13:15:45 +08:00
Philipp Bayer
7801834546 Merge pull request #383 from philippbayer/fix_glyphs
Fixes glyphicons in production.
2017-06-03 12:55:59 +08:00
Philipp Bayer
13bbf483f7 Missing ( 2017-06-03 12:53:18 +08:00
Philipp Bayer
1cb5be927b Please hound 2017-06-03 12:48:34 +08:00
Philipp Bayer
386c931fa3 Fixes glyphicons in production. Removes superfluous unminified bootstrap. 2017-06-03 12:47:00 +08:00
Bastian Greshake
8db5497aef [WIP] Update humans.txt (#378)
* Update humans.txt

* Update humans.txt
2017-06-02 18:04:38 +02:00
Philipp Bayer
5d078901a1 Merge pull request #379 from openSNP/UIfixes
pagination w/o page numbers again
2017-06-02 22:33:28 +08:00
Philipp Bayer
2be1b35a7e Merge pull request #382 from philippbayer/master
Reverting changes to application.css
2017-06-02 22:30:29 +08:00
Philipp Bayer
c101d3321f Reverting changes 2017-06-02 22:29:00 +08:00
Philipp Bayer
93fb6ea66d Merge pull request #381 from philippbayer/master
Another try at assets fix
2017-06-02 22:18:42 +08:00
Philipp Bayer
769484b3f4 Merge branch 'master' into master 2017-06-02 22:18:32 +08:00
Philipp Bayer
857cdb9a6c Fix in other file 2017-06-02 22:17:19 +08:00
Philipp Bayer
fe6b8e9721 Yet another try at the assets glyphicon problem 2017-06-02 22:15:02 +08:00
Philipp Bayer
b7fb2a875e Perhaps fixes some assets problems (#380)
:shipit:
2017-06-02 15:37:16 +02:00
Philipp Bayer
cc8a5ea6cb Perhaps fixes some assets problems 2017-06-02 21:35:11 +08:00
Bastian Greshake
3e9a0cdbfc radio buttons appear on modal 2017-06-02 14:28:28 +02:00
Bastian Greshake
43eb3f78cf modals work again 2017-06-02 14:18:52 +02:00
Bastian Greshake
122623d91d 🐶 2017-06-02 13:58:06 +02:00
Bastian Greshake
16ecea2c60 pagination w/o page numbers again 2017-06-02 13:51:51 +02:00
Philipp Bayer
37a7c9d470 Merge pull request #377 from openSNP/UIfixes
poor person's try for a fix
2017-06-02 17:24:07 +08:00
Bastian Greshake
0995f85376 poor person's try for a fix 2017-06-02 11:23:08 +02:00
Bastian Greshake
cedf4b3b2e poor person's try for a fix 2017-06-02 11:21:31 +02:00
Philipp Bayer
abff7b9d17 Merge pull request #376 from philippbayer/fixruby
Sets ruby version to 2.3.3 in Gemfile
2017-06-02 17:05:49 +08:00
Philipp Bayer
054e8e9f4d one more try with the gemfile bigger,equals change 2017-06-02 17:01:13 +08:00
Philipp Bayer
813fb1fa12 Nah that did not, reverting to setting the version 2017-06-02 16:55:04 +08:00
Philipp Bayer
47420e631b Merge branch 'fixruby' of github.com:philippbayer/snpr into fixruby 2017-06-02 16:52:52 +08:00