Luka Murn 9bf8b5d864 Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860 ... Conflicts: Makefile app/assets/javascripts/projects/index.js.erb app/assets/stylesheets/themes/scinote.scss config/locales/en.yml		2018-04-12 13:16:46 +02:00
..
environments	Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860	2018-04-12 13:16:46 +02:00
initializers	Merge pull request #1081 from mlorb/ml-sci-2123	2018-04-09 13:21:16 +02:00
locales	Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860	2018-04-12 13:16:46 +02:00
routes	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1731	2017-11-09 09:05:22 +01:00
webpack
application.rb	Add team & project role-related helper functions to User model	2017-11-16 15:50:30 +01:00
boot.rb
cable.yml
cucumber.yml
database.yml
environment.rb
newrelic.yml
puma.rb
routes.rb	Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860	2018-04-12 13:16:46 +02:00
secrets.yml	Allow setting of SMTP auth method through ENV variable	2018-02-14 17:02:28 +01:00
spring.rb
webpacker.yml
whacamole.rb	add whacamole configuration [fixes SCI-1683]	2017-10-25 09:47:26 +02:00