Luka Murn 26d04b1f3c Merge branch 'rich-text-formatting' into 'master' ... Conflicts: Gemfile.lock app/assets/stylesheets/themes/scinote.scss		2016-11-17 16:39:33 +01:00
..
concerns	fixes search	2016-11-16 14:50:06 +01:00
.keep
activity.rb	Merge pull request #260 from mlorb/ml_sci_614	2016-11-08 11:30:49 +01:00
asset.rb	Fixed Hound alerts.	2016-10-17 11:57:46 +02:00
asset_text_datum.rb
checklist.rb	Ruby constants are now automatically available in JS. Refactoring was needed.	2016-10-17 11:57:37 +02:00
checklist_item.rb	Ruby constants are now automatically available in JS. Refactoring was needed.	2016-10-17 11:57:37 +02:00
comment.rb	Fixed Hound alerts.	2016-10-17 11:57:46 +02:00
connection.rb
custom_field.rb	Ruby constants are now automatically available in JS. Refactoring was needed.	2016-10-17 11:57:37 +02:00
experiment.rb	Removed unneeded ERB tags, which caused error. Minor refactoring.	2016-10-17 11:57:47 +02:00
log.rb
my_module.rb	Replaced hardcoded infinity values with constants. Added quotation marks to Ruby string constants in JS.	2016-10-17 11:57:47 +02:00
my_module_comment.rb
my_module_group.rb	Ruby constants are now automatically available in JS. Refactoring was needed.	2016-10-17 11:57:37 +02:00
my_module_tag.rb
notification.rb	Fix destroying of users in relation to notifications	2016-11-15 15:56:32 +01:00
organization.rb	Ruby constants are now automatically available in JS. Refactoring was needed.	2016-10-17 11:57:37 +02:00
project.rb	Replaced hardcoded infinity values with constants. Added quotation marks to Ruby string constants in JS.	2016-10-17 11:57:47 +02:00
project_comment.rb
protocol.rb	Ruby constants are now automatically available in JS. Refactoring was needed.	2016-10-17 11:57:37 +02:00
protocol_keyword.rb	Ruby constants are now automatically available in JS. Refactoring was needed.	2016-10-17 11:57:37 +02:00
protocol_protocol_keyword.rb
report.rb	Ruby constants are now automatically available in JS. Refactoring was needed.	2016-10-17 11:57:37 +02:00
report_element.rb
result.rb	Replaced hardcoded infinity values with constants. Added quotation marks to Ruby string constants in JS.	2016-10-17 11:57:47 +02:00
result_asset.rb
result_comment.rb
result_table.rb
result_text.rb	fix validation logic	2016-11-11 11:42:16 +01:00
sample.rb	Fixed Hound alerts.	2016-10-17 11:57:46 +02:00
sample_comment.rb
sample_custom_field.rb	Ruby constants are now automatically available in JS. Refactoring was needed.	2016-10-17 11:57:37 +02:00
sample_group.rb	Ruby constants are now automatically available in JS. Refactoring was needed.	2016-10-17 11:57:37 +02:00
sample_my_module.rb
sample_type.rb	Ruby constants are now automatically available in JS. Refactoring was needed.	2016-10-17 11:57:37 +02:00
step.rb	fix validation logic	2016-11-11 11:42:16 +01:00
step_asset.rb
step_comment.rb
step_table.rb
table.rb	Ruby constants are now automatically available in JS. Refactoring was needed.	2016-10-17 11:57:37 +02:00
tag.rb	Ruby constants are now automatically available in JS. Refactoring was needed.	2016-10-17 11:57:37 +02:00
temp_file.rb
user.rb	Merge branch 'gamification' into 'master'	2016-11-17 16:30:18 +01:00
user_my_module.rb
user_notification.rb	Replaced hardcoded infinity values with constants. Added quotation marks to Ruby string constants in JS.	2016-10-17 11:57:47 +02:00
user_organization.rb	Fix a bug where user could be assigned to same project twice	2016-11-15 10:44:32 +01:00
user_project.rb