zmagod 06b1992e94 Merge branch 'zd_SCI_436' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_436		2016-09-21 19:20:55 +02:00
..
activities
canvas	fixes merge again	2016-08-30 12:54:08 +02:00
comments	Add edit project comments functionality	2016-08-25 13:51:30 +02:00
custom_fields
experiments	Merge pull request #140 from ZmagoD/zd_SCI_341	2016-09-13 11:59:01 +02:00
layouts
my_module_comments	Add individual permission checks in dropdowns	2016-08-25 13:51:50 +02:00
my_module_tags
my_modules	Merge branch 'zd_SCI_436' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_436	2016-09-21 19:20:55 +02:00
organizations
project_activities
project_comments	Add individual permission checks in dropdowns	2016-08-25 13:51:50 +02:00
projects	Merge pull request #135 from Ducz0r/lm-sci-397	2016-09-07 11:14:53 +02:00
protocols	Add e-notation preprocessing to formulas	2016-09-13 09:46:22 +02:00
reports	Add e-notation preprocessing to formulas	2016-09-13 09:46:22 +02: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	first working version	2016-09-20 17:06:07 +02: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	removes comment tab and add comment in the info tab [fixes SCI-436]	2016-09-20 18:53:51 +02:00
results	Merge branch 'master' into mz_file_upload_and_client_side_upgrade	2016-08-26 11:13:40 +02:00
sample_groups
sample_my_modules
sample_types
samples
search	fixes links and missing experiment level in search results	2016-09-13 17:13:58 +02:00
shared	Merge pull request #152 from mlorb/ml_sci_428	2016-09-15 12:11:48 +02:00
step_comments	styled step comments	2016-09-20 14:13:40 +02:00
steps	removes comment tab and add comment in the info tab [fixes SCI-436]	2016-09-20 18:53:51 +02:00
user_my_modules
user_projects
users	Remove warning info when removing pending user from organization	2016-09-01 13:23:53 +02:00