Luka Murn 8254153bb9 Merge branch 'master' into rails-5.1 ... Conflicts: Gemfile Gemfile.lock app/models/connection.rb app/models/experiment.rb app/models/my_module.rb		2017-10-23 08:57:57 +02:00
..
activities
assets
canvas	Optimize update canvas SQL and remove module group name [SCI-1642]	2017-10-05 16:19:25 +02:00
comments
experiments	Further canvas optimizations [SCI-1642]	2017-10-06 12:43:27 +02:00
layouts	Revert "Td sci 1492"	2017-08-07 11:47:21 +02:00
my_module_comments
my_module_tags
my_modules	refactor repositories js files [fixes SCI-1485]	2017-07-17 15:05:28 +02:00
project_activities
project_comments	fix edit comments	2017-06-29 13:33:59 +02:00
projects	Merge branch 'master' into rails-5.1	2017-07-06 15:12:15 +02:00
protocols	adds label under protocols keywords input [fixes SCI-1560]	2017-10-17 14:10:56 +02:00
reports	Improve memory utulization in PDF report generator [SCI-1482]	2017-10-02 11:29:22 +02:00
repositories	Optimize memory usage in samples/repositories import [SCI-1665]	2017-10-12 14:43:25 +02:00
result_assets	Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551]	2017-10-19 11:38:23 +02:00
result_comments
result_tables
result_texts
results
sample_groups
sample_my_modules
sample_types
samples	fix bugs with importing samples	2017-09-06 14:41:14 +02:00
search	Optimize update canvas SQL and remove module group name [SCI-1642]	2017-10-05 16:19:25 +02:00
shared	Merge branch 'master' into rails-5.1	2017-08-07 08:45:53 +02:00
step_comments
steps
teams
user_my_modules
user_notifications
user_projects	add user variable	2017-06-29 12:56:14 +02:00
users	Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]"	2017-10-17 13:10:02 +02:00
zip_exports