scinote-web/app/views
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
..
activities Removed unneeded ERB tags, which caused error. Minor refactoring. 2016-10-17 11:57:47 +02:00
canvas Removed some unneeded code. 2016-10-17 11:57:46 +02:00
comments Add a smart_text_area tag & implement it throughout application 2016-11-16 17:57:01 +01:00
custom_fields Initial commit. 2016-02-12 16:52:43 +01:00
experiments Merge branch 'rich-text-formatting' into 'master' 2016-11-17 16:39:33 +01:00
layouts added getting started hoot to layout/application.html 2016-10-28 10:36:15 +02:00
my_module_comments Add a smart_text_area tag & implement it throughout application 2016-11-16 17:57:01 +01:00
my_module_tags Removed unneeded ERB tags, which caused error. Minor refactoring. 2016-10-17 11:57:47 +02:00
my_modules Merge branch 'rich-text-formatting' into 'master' 2016-11-17 16:39:33 +01:00
organizations Initial commit. 2016-02-12 16:52:43 +01:00
project_activities Added remaining constants. 2016-10-17 11:30:05 +02:00
project_comments Add a smart_text_area tag & implement it throughout application 2016-11-16 17:57:01 +01:00
projects Merge pull request #228 from ZmagoD/zd_SCI_585 2016-10-21 11:33:01 +02:00
protocols Merge branch 'rich-text-formatting' into 'master' 2016-11-17 16:39:33 +01:00
reports Merge branch 'rich-text-formatting' into 'master' 2016-11-17 16:39:33 +01:00
result_assets removes comment tab and add comment in the info tab [fixes SCI-436] 2016-09-20 18:53:51 +02:00
result_comments Add a smart_text_area tag & implement it throughout application 2016-11-16 17:57:01 +01:00
result_tables removes comment tab and add comment in the info tab [fixes SCI-436] 2016-09-20 18:53:51 +02:00
result_texts add validation for result text field 2016-11-15 12:55:32 +01:00
results fixed bullets 2016-11-16 15:30:14 +01:00
sample_groups Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
sample_my_modules Refactor canvas a lot. 2016-07-28 16:41:10 +02:00
sample_types Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
samples Removed unneeded ERB tags, which caused error. Minor refactoring. 2016-10-17 11:57:47 +02:00
search remove redcarpet gem - markdown 2016-11-10 14:11:32 +01:00
shared Fixed tutorial step numbers and changed getting next page reference on protocols page. 2016-11-17 14:46:04 +01:00
step_comments Add a smart_text_area tag & implement it throughout application 2016-11-16 17:57:01 +01:00
steps Merge pull request #276 from Ducz0r/lm-sci-637 2016-11-17 09:58:36 +01:00
user_my_modules Refactor canvas a lot. 2016-07-28 16:41:10 +02:00
user_notifications added hooks in notifications preview 2016-11-03 14:48:01 +01:00
user_projects Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
users Merge branch 'rich-text-formatting' into 'master' 2016-11-17 16:39:33 +01:00