mlorb 7ca29b50a2 Merge pull request #816 from mlorb/ml-sci-1636 ... Fixes style errors on one team page [SCI-1636]		2017-10-10 16:23:50 +02:00
..
assets	Merge branch 'master' into rails-5.1	2017-09-21 08:27:38 +02:00
controllers	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1566	2017-10-09 09:30:06 +02:00
datatables
helpers	Merge branch 'rails-5.1' into decoupling-settings-page	2017-09-21 08:36:09 +02:00
javascript	Merge pull request #816 from mlorb/ml-sci-1636	2017-10-10 16:23:50 +02:00
mailers
models	fixes user_controller specs, adds user model specs for settings	2017-10-05 15:53:05 +02:00
serializers
services	fixes bug with password confirmation	2017-10-06 09:54:17 +02:00
utilities
views	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1629	2017-10-09 09:43:29 +02:00