scinote-web/app
Luka Murn 84df2c81f9 Merge branch 'features/export-all'
Conflicts:
	app/controllers/experiments_controller.rb
	app/controllers/my_modules_controller.rb
	db/schema.rb
2018-11-13 09:14:02 +01:00
..
assets Merge branch 'features/export-all' 2018-11-13 09:14:02 +01:00
controllers Merge branch 'features/export-all' 2018-11-13 09:14:02 +01:00
datatables Made fixes according to review 2018-09-14 13:07:09 +02:00
helpers Merge branch 'features/export-all' 2018-11-13 09:14:02 +01:00
javascript Fix fontawesome package paths [SCI-2253] 2018-07-31 13:52:21 +02:00
mailers Fix according to Houndbot 2018-09-23 18:48:44 +02:00
middlewares
models Merge branch 'features/export-all' 2018-11-13 09:14:02 +01:00
permissions Remove blank line 2018-10-26 11:00:13 +02:00
serializers Add GET teams and team API endpoints [SCI-2611][SCI-2612] 2018-07-31 13:40:27 +02:00
services Merge branch 'features/export-all' 2018-11-13 09:14:02 +01:00
utilities fixes smart annotation serch queries/dropdown item picker [fixes SCI-2511] 2018-07-06 14:26:20 +02:00
views Merge branch 'features/export-all' 2018-11-13 09:14:02 +01:00