Zmago Devetak d1c3d00c84 Merge pull request #807 from ZmagoD/zd_SCI_1629 ... adds bootstrap and font-awesome in webpacker build fixes the missing …		2017-10-10 14:09:52 +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	removes unneeded comments	2017-08-21 13:34:39 +02:00
helpers	Merge branch 'rails-5.1' into decoupling-settings-page	2017-09-21 08:36:09 +02:00
javascript	Merge pull request #807 from ZmagoD/zd_SCI_1629	2017-10-10 14:09:52 +02:00
mailers
models	fixes user_controller specs, adds user model specs for settings	2017-10-05 15:53:05 +02:00
serializers	Add default settings migration and concern	2017-08-10 11:30:57 +02:00
services	fixes bug with password confirmation	2017-10-06 09:54:17 +02:00
utilities	Added updated_at values and unnecessary migration rollback [fixes SCI-1145]	2017-05-11 11:08:36 +02:00
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