Luka Murn cf291bf887 Merge branch 'gilson-iot-rails4' ... Conflicts: Gemfile.lock		2017-12-19 10:56:39 +01: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
my_module_comments
my_module_tags
my_modules
project_activities
project_comments
projects
protocols	Merge pull request #806 from ZmagoD/disable_tiny_mce_asset_unless_step	2017-12-12 09:53:24 +01:00
reports	Merge branch 'master' of https://github.com/biosistemika/scinote-web into disable_tiny_mce_asset_unless_step	2017-11-24 16:29:32 +01:00
repositories	add explanation when copying custom repositories	2017-11-13 16:30:42 +01: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	fixes bug with embedded images [fixes SCI.1624]	2017-10-02 18:06:42 +02:00
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
step_comments
steps	Merge pull request #806 from ZmagoD/disable_tiny_mce_asset_unless_step	2017-12-12 09:53:24 +01:00
teams
user_my_modules
user_notifications	Backport API to Rails-4 [SCI-1579]	2017-08-30 13:30:41 +02:00
user_projects
users	Pull latest master into gilson-iot-rails4	2017-11-15 15:15:26 +01:00
zip_exports