Anton Ignatov 6be227b2d3 Merge branch 'master' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration		2019-06-28 10:47:38 +02:00
..
controllers	Merge pull request #1839 from aignatov-bio/ai-sci-3369-activity-for-edited-image-annotation	2019-06-24 10:31:39 +02:00
factories	Merge branch 'master' into features/marvinjs-integration	2019-06-21 14:51:45 +02:00
fixtures/files	New Protocols actions logging	2019-03-12 09:14:53 +01:00
lib/tasks	fix failing spec	2018-03-13 15:03:48 +01:00
models	Small fixes for factories	2019-06-10 12:24:05 +02:00
requests/api/v1	Update Result API for new tiny mce image format (#1674)	2019-04-19 14:44:16 +02:00
services	Fix failing permission_eval_spec test	2019-05-31 10:33:55 +02:00
support	Rename user_id to sub in JWT [SCI-2814]	2018-10-28 14:34:51 +01:00
utilities/repository_import_parser	fixes import limit	2018-04-10 15:45:51 +02:00
rails_helper.rb	Rename CORE_API_V1_PREVIEW env. variable to CORE_API_V1_ENABLED [SCI-2888]	2019-01-04 10:44:38 +01:00
spec_helper.rb	Add service for sync system notifications	2019-02-13 15:48:15 +01:00