2170 Commits

Author SHA1 Message Date
Bastian Greshake Tzovaras
52721d878a New Newsletter: OH grants/job + smell/taste genetics workshop (#430)
* new newsletter

* fixed html version
2017-08-25 11:15:14 +02:00
Philipp Bayer
91c233f61f Merge pull request #426 from openSNP/update-name
someone got married
2017-08-22 22:36:41 +08:00
Bastian Greshake
09e67b12b7 someone got married 2017-08-21 22:14:51 +02:00
Philipp Bayer
31840c9d05 Fixes bug in autoupdater. Reschedules update to 60 days. (#424)
* Fixes bug in autoupdater. Reschedules update to 60 days.

* Implements Helges suggestion of a specific release so future updates to dehydrated do not break stuff
2017-08-07 13:55:25 +02:00
Philipp Bayer
a08ec4e2e4 Adds ssl autoupdate scheduler (#423)
* Adds ssl autoupdate scheduler

* Single quotes for the hound
2017-08-05 12:16:10 +02:00
Philipp Bayer
e811ae80c2 Merge pull request #422 from openSNP/gedankenstuecke-patch-3
Update statistics.html.erb
2017-07-29 23:43:38 +08:00
Bastian Greshake Tzovaras
d5df4e92d8 Update statistics.html.erb
Links to raw data were broken, fixed now.
2017-07-28 10:49:21 +02:00
Philipp Bayer
dabea4cb6c Merge pull request #421 from openSNP/gedankenstuecke-patch-1
Update humans.txt
2017-07-27 22:11:40 +08:00
Bastian Greshake Tzovaras
feae3aacde Update humans.txt 2017-07-27 15:52:29 +02:00
alphaCTzo7G
f93d1a84f8 Update robots.txt 2017-07-17 05:54:26 -07:00
Philipp Bayer
7c4d077760 Tell bots not to crawl user snps, should ease some load (#419) 2017-07-11 08:21:02 +02:00
Philipp Bayer
6e9eaec4dc Merge pull request #417 from openSNP/gedankenstuecke-patch-2
Update humans.txt
2017-06-20 17:53:08 +08:00
Bastian Greshake
e40860c906 Update humans.txt
added new contributor!
2017-06-20 11:48:29 +02:00
Philipp Bayer
86de20fcf0 Merge pull request #415 from openSNP/fixTabLinks
Deletes easytab, introduces new way to jump to tabs via links
2017-06-20 17:22:53 +08:00
Philipp Bayer
90cbd4cb4c Merge branch 'master' into fixTabLinks 2017-06-20 17:13:59 +08:00
Philipp Bayer
61310379a8 Merge pull request #413 from openSNP/fix-modal-disappearance
Fix modal disappearance, closes #176
2017-06-20 17:13:43 +08:00
Philipp Bayer
c4f3efcced Delete a superfluous line 2017-06-20 17:04:20 +08:00
Bastian Greshake
ba8e406a98 Merge branch 'master' into fix-modal-disappearance 2017-06-20 11:03:41 +02:00
Bastian Greshake
2c37cde049 added task for updating chromosome names (closes #348) (#412)
* added task for updating chromosome names (closes #348)

* 🌭
2017-06-20 11:03:22 +02:00
Philipp Bayer
9e19c58b9c Deletes easytab, introduces new way to jump to tabs via links 2017-06-20 16:44:21 +08:00
Bastian Greshake
72ffc0e4ed fixes modal behaviour, closes #176 2017-06-20 09:06:17 +02:00
Bastian Greshake
e5f2ae48c6 🌭 2017-06-20 08:39:14 +02:00
Bastian Greshake
18ad862c4a added task for updating chromosome names (closes #348) 2017-06-20 08:33:36 +02:00
Philipp Bayer
b6e35e3056 Merge pull request #411 from openSNP/phenotype_view
fixed modal autocomplete! closes #375
2017-06-20 10:01:19 +08:00
Bastian Greshake
29f23cdcb5 fixed modal autocomplete! closes #375 2017-06-19 19:38:27 +02:00
Bastian Greshake
f742826c2a Fix phenotype entry autocomplete for #375 (#410)
It was missing a few brackets
2017-06-19 18:52:03 +02:00
Bastian Greshake
7fae3e6955 fix newsletter (#407) 2017-06-18 16:16:05 +02:00
Philipp Bayer
6ec79ab8a7 Merge pull request #403 from openSNP/newsletter
Adding Newsletter: Redesign + Diego Gómez
2017-06-16 19:06:56 +08:00
Bastian Greshake
2c9caf424b Update user_mailer.rb 2017-06-16 10:03:45 +02:00
Bastian Greshake
f51cb8b87e Merge branch 'master' into newsletter 2017-06-16 10:02:54 +02:00
Bastian Greshake
4b06c79c2f Send message to user from their page now works (#404) 2017-06-16 09:33:24 +02:00
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