Mojca Lorber 0e3526c9ad Merge branch 'mlorb-ml-sci-696' into improved-sample-table ... Conflicts: app/assets/javascripts/samples/sample_datatable.js		2016-12-08 15:44:50 +01:00
..
experiments
my_modules	Added additional checks for tutorial steps [SCI-703]	2016-11-22 13:55:23 +01:00
projects	Added additional checks for tutorial steps [SCI-703]	2016-11-22 13:55:23 +01:00
protocols	Merge pull request #311 from ZmagoD/zd_SCI_716	2016-11-23 09:14:57 +01:00
reports	Added additional checks for tutorial steps [SCI-703]	2016-11-22 13:55:23 +01:00
results	Remove unused assets & helpers	2016-11-18 11:30:03 +01:00
samples	Merge branch 'mlorb-ml-sci-696' into improved-sample-table	2016-12-08 15:44:50 +01:00
sitewide	Minor refactoring.	2016-11-23 10:48:43 +01:00
users	Reload whole page after user is invited from team invite users modal	2016-11-15 16:21:32 +01:00
application.js.erb	Merge branch 'rich-text-formatting' into 'master'	2016-11-17 16:39:33 +01:00
assets.js
comments.js.erb	Make all comment edit fields textareas	2016-11-08 11:29:55 +01:00
direct-upload.js
my_modules.js
navigation.js	fixes padding on mobile, added separator on team switch dropdown, focus search input	2016-10-21 11:46:59 +02:00
notifications.js
sidebar.js.erb