Commit Graph

1975 Commits

Author SHA1 Message Date
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
Philipp Bayer
69d46aa206 Testing whether deleting the ruby line from .travis.yml will pick up from Gemfile 2017-06-02 16:52:30 +08:00
Bastian Greshake
c5c3152a89 Update Gemfile 2017-06-02 10:52:19 +02:00
Philipp Bayer
19a4ec6f29 Sets ruby version to 2.3.3 in Gemfile 2017-06-02 16:48:08 +08:00
Philipp Bayer
9c6f165971 Adds news item on redesign and survey study (#374)
* Adds news item on redesign and survey study

* Adds links feat. repositive article

* fixes typo
2017-06-02 09:47:11 +02:00
Philipp Bayer
a4b3fdea58 Merge pull request #372 from openSNP/schedules
schedule statistics dump
2017-06-01 21:33:32 +08:00
Bastian Greshake
801d123e28 schedule statistics dump 2017-06-01 15:29:37 +02:00
Philipp Bayer
04677e283e Merge pull request #370 from openSNP/dump_filenames
added filenames to phenotypes.csv, closes #357
2017-06-01 20:53:42 +08:00
Philipp Bayer
cf25d77185 Mateus' PR (#365), closes #264 #333
* Renaming '.env.example' to '.env'

* Removing bootstrap gem

* Adding newest version of Bootstrap(3.3.6) and setting it up

* Renamed 'database.yml.example' to 'database.yml'

* Deleted common.css.scss

* Deleting active_admin/application requirement

* Adding style file that import all style partials and adding javascript file

* Updating application.html.erb and includes(footer and navbar)

* Removing from news all the updates(new users, new pheno...) and putting on updates page

* Updating user views

* Updating phenotype views

* Updating index page

* Updating FAQ and Stats pages

* Updating genotype views

* Updating messages views

* Updating snps views and signin page

* Updating fitbit and picture_phenotype views

* Updating warning

* Adding base style and variable of style

* Adding style of index, faq and stats page

* Adding style for user views

* Adding style for footer and navbar

* Adding modules of style

* Adding style for fitbit, genotype, phenotype and message views

* Adding style for snps and updates views

* Updating serverscript

* Adding new logo and RSS new image

* Adding style files for: comments, password reset, picture phenotypes, achievements and search results

* Removing !important and updating some styles

* Updating view from achievements

* Updating views from fitbit profiles

* Updating genotypes views

* Updating navbar view

* Updating password reset view

* Updating phenotype comments views

* Updating phenotypes views

* Updating views: search result, snps, user phenotypes and users

* Updating views: updates and picture phenotypes

* Adding updates page's routes

* Modify flash messages and change number of fitbit profiles and genotypes per page(20 -> 15)

* Replace will_paginate to a version that works with bootstraps

* Change serverscript to make Sidekiq work propely

* Updates user's views

* Updates script to run only when page is fully loaded

* Moves script tags to head and updates flash messages' views

* Updates and add style for: picture_phenotypes, snps, userpages, press, warnings

* Updates views for: genotypes, messages, fitbit_profiles, phenotype comments, phenotypes

* Updates views for: picture phenotype, picture phenotype comments, warnings and errors, snps, snps comments

* Updates views for: press, picture phenotype user, user session and snps user

* Updates views from: user, updates, press and stats

* Updates views from: snps, picture phenotypes, phenotypes, genotypes

* Updates views from: fitbit profiles, navbar, application, messages and news

* Updates script file

* Updates style files

* Changes modal views

* Renaming '.env.example' to '.env'

* Removing bootstrap gem

* Adding newest version of Bootstrap(3.3.6) and setting it up

* Renamed 'database.yml.example' to 'database.yml'

* Deleted common.css.scss

* Deleting active_admin/application requirement

* Adding style file that import all style partials and adding javascript file

* Updating application.html.erb and includes(footer and navbar)

* Removing from news all the updates(new users, new pheno...) and putting on updates page

* Updating user views

* Updating phenotype views

* Updating index page

* Updating FAQ and Stats pages

* Updating genotype views

* Updating messages views

* Updating snps views and signin page

* Updating fitbit and picture_phenotype views

* Updating warning

* Adding base style and variable of style

* Adding style of index, faq and stats page

* Adding style for user views

* Adding style for footer and navbar

* Adding modules of style

* Adding style for fitbit, genotype, phenotype and message views

* Adding style for snps and updates views

* Updating serverscript

* Adding new logo and RSS new image

* Adding style files for: comments, password reset, picture phenotypes, achievements and search results

* Removing !important and updating some styles

* Updating view from achievements

* Updating views from fitbit profiles

* Updating genotypes views

* Updating navbar view

* Updating password reset view

* Updating phenotype comments views

* Updating phenotypes views

* Updating views: search result, snps, user phenotypes and users

* Updating views: updates and picture phenotypes

* Adding updates page's routes

* Modify flash messages and change number of fitbit profiles and genotypes per page(20 -> 15)

* Replace will_paginate to a version that works with bootstraps

* Change serverscript to make Sidekiq work propely

* Updates user's views

* Updates script to run only when page is fully loaded

* Moves script tags to head and updates flash messages' views

* Updates and add style for: picture_phenotypes, snps, userpages, press, warnings

* Updates views for: genotypes, messages, fitbit_profiles, phenotype comments, phenotypes

* Updates views for: picture phenotype, picture phenotype comments, warnings and errors, snps, snps comments

* Updates views for: press, picture phenotype user, user session and snps user

* Updates views from: user, updates, press and stats

* Updates views from: snps, picture phenotypes, phenotypes, genotypes

* Updates views from: fitbit profiles, navbar, application, messages and news

* Updates script file

* Updates style files

* Changes modal views

* Updates script file

* Add style file for modal

* Updates views from: snp comments, user phenotypes, modal and picture phenotypes

* Removes empty style files

* Moves comments style to modules directory

* Creates a more general class for containers and titles

* Removing more specific classes for containers and titles

* Changes load order, now variables are loaded before base styles

* Replaces all containers and titles classes with the more general class for them

* Corrects styles order and organization

* Updates minimum height for content container

* Organizes and refactors script file

* Updates views for fitbit and user

* Removes 'test-' from all classes and updates some views

* Updates settings view

* Updates gitignore

* Changes config files

* Removes some file from .gitignore

* Readds the example files

* Changes all unnecessary double-quotes to single-quotes

* Corrects script file

* Updates hound file to ignore JS files

* Hopefully merged both

* fixes typos, gem installation

* Adds missing pagination gem

* Deletes Vagrantfile

* Automatically replaced all pre Ruby 1.9 hashes with new style to satisfy Hound

* More changes for Hound, triggered by me automatically changing the hash syntax

* More hound changes

* Fully satisfy the hound

* Fix some more style issues, delete some old Vagrant stuff

* Fix usermailer complaints

* Changed some stuff in fitbit notification worker - prob. needs bigger refactor, long lines, cannot change

* Two more borked tests

* Get rid of useless asset pipeline errors

* Skipping search test for now.

* added about us here

* disclaimer now also for genotypes

* working a bit on the hound

* fixed FAQ language
2017-06-01 14:47:00 +02:00
Bastian Greshake
e584201f57 made hound happy #2 2017-06-01 14:32:34 +02:00
Bastian Greshake
f931a7fd38 whops, needed string inter. here 2017-06-01 14:31:32 +02:00
Bastian Greshake
1d73188866 made hound happy 2017-06-01 14:28:30 +02:00
Bastian Greshake
9fa5ba223d fixed test to adhere to changes in files 2017-06-01 14:15:33 +02:00
Bastian Greshake
e90c022674 added filenames to phenotypes.csv 2017-06-01 14:10:26 +02:00
Bastian Greshake
37a449778e Update README.md
fixed the readme-parts that @amiefairs suggested.
2017-06-01 13:01:54 +02:00