okriuchykhin
|
c88fc84538
|
Merge pull request #633 from okriuchykhin/ok_SCI_960_v2
Add smart annotations in sample info modal [SCI-960]
|
2017-05-31 11:31:14 +02:00 |
|
mz3944
|
689587c4fc
|
Merge pull request #643 from mz3944/mz-SCI-1305
Handled user removal from the team for user smart annotation [fixes SCI-1305]
|
2017-05-29 12:52:19 +02:00 |
|
Zmago Devetak
|
1df6265326
|
Merge pull request #627 from ZmagoD/zd_SCI_1280
prevent to duplicate new step [fixes SCI-1280]
|
2017-05-29 09:55:22 +02:00 |
|
mz3944
|
d83dcac894
|
Merge pull request #642 from mz3944/mz-SCI-1291
Fixed permission error while cloning workflows. [fixes SCI-1291]
|
2017-05-29 09:53:33 +02:00 |
|
zmagod
|
5806cb8e67
|
removes unneeded animateSpinner call
|
2017-05-29 09:10:11 +02:00 |
|
Matej Zrimšek
|
19ffd77d32
|
Requests failed if smart annotation referenced a user who was no longer in the team. [fixes SCI-1305]
|
2017-05-26 18:14:15 +02:00 |
|
Matej Zrimšek
|
853096634d
|
Fixed permission error while cloning workflows. [fixes SCI-1291]
|
2017-05-26 11:14:50 +02:00 |
|
Oleksii Kriuchykhin
|
157b1630b9
|
Add missing include for sinitize_input [SCI-1309]
|
2017-05-25 16:28:06 +02:00 |
|
Oleksii Kriuchykhin
|
7310763184
|
Add missing include [SCI-1306]
|
2017-05-25 08:57:50 +02:00 |
|
mz3944
|
6b8c8deb16
|
Merge pull request #634 from mz3944/mz-SCI-414
Uncompleted steps not added to Reports
|
2017-05-23 09:58:05 +02:00 |
|
mz3944
|
9fe3b717c8
|
Merge pull request #626 from mz3944/mz-SCI-487
Simplify "Add contents to report" popup
|
2017-05-23 09:57:39 +02:00 |
|
ajugo
|
1abaefce4f
|
At importing large sample file, error flash message appears [fixes SCI-903] (#625)
* At importing large sample file, error flash message appears [fixes SCI-903]
* Changing double quotes to single
* Adding animatedSpinner
|
2017-05-18 09:19:44 +02:00 |
|
Matej Zrimšek
|
20265ddd69
|
Readded result content modal for report creation and updated checkbox hierarchy logic accordingly. [fixes SCI-487]
|
2017-05-17 18:18:57 +02:00 |
|
Oleksii Kriuchykhin
|
bbf6d38c50
|
Fix error handling in result_assets [SCI-1288]
|
2017-05-17 15:14:35 +02:00 |
|
Matej Zrimšek
|
f78c80b148
|
Added possibility to add uncompleted steps to report. [closes SCI-414]
|
2017-05-17 13:25:21 +02:00 |
|
Oleksii Kriuchykhin
|
7f713b4293
|
Add smart annotations in sample info modal [SCI-960]
|
2017-05-17 13:06:21 +02:00 |
|
Oleksii Kriuchykhin
|
f28df506f9
|
Fix bug in counting search results for assets [SCI-1284]
|
2017-05-17 09:08:40 +02:00 |
|
zmagod
|
b21923cf98
|
prevent to duplicate new step [fixes SCI-1280]
|
2017-05-16 11:52:07 +02:00 |
|
gazvoda
|
f6bd39ec70
|
Merge pull request #604 from gazvoda/lg-SCI-1145
Added migration to remove updated_at from Activity [fixes SCI-1145]
|
2017-05-16 08:49:10 +01:00 |
|
Matej Zrimšek
|
2c6f888cbc
|
Replace present? with more efficient exitst? for report content adding modal. [fixes SCI-487]
|
2017-05-15 18:56:41 +02:00 |
|
Matej Zrimšek
|
79ec3b5e4c
|
Selected all checkboxes by default for result content adding modal and added disabling logic for dependent checkboxes. [fixes SCI-487]
|
2017-05-15 18:20:42 +02:00 |
|
Matej Zrimšek
|
901558c733
|
Made checkbox logic sitewide available and applied it to other content adding modals in report aswell. [fixes SCI-487]
|
2017-05-15 18:20:42 +02:00 |
|
Matej Zrimšek
|
ba693c65a8
|
Fixed adding contents to report logic and removed unneeded code. [fixes SCI-487]
|
2017-05-15 18:20:42 +02:00 |
|
Matej Zrimšek
|
dbb79ebab1
|
Refactoring of specific modals for adding content to report and fixing their inconsistencies. [fixes SCI-487]
|
2017-05-15 17:43:12 +02:00 |
|
Matej Zrimšek
|
b97cb91840
|
Refactoring of modal for adding content to report. [fixes SCI-487]
|
2017-05-15 17:43:12 +02:00 |
|
Matej Zrimšek
|
27cfd55ea5
|
Simplified popup modal for adding contents to report. [fixes SCI-487]
|
2017-05-15 17:43:12 +02:00 |
|
Zmago Devetak
|
18e11fde59
|
Merge pull request #616 from ZmagoD/zd_SCI_1248
Prevent double input fields (results)
|
2017-05-15 16:27:03 +02:00 |
|
Zmago Devetak
|
39203a16f4
|
Merge pull request #622 from ZmagoD/zd_SCI_1261
fixes remove user action on project [fixes SCI-1261]
|
2017-05-15 15:28:39 +02:00 |
|
Zmago Devetak
|
a151bbdd7d
|
Merge pull request #623 from ZmagoD/zd_SCI_974
adds persistence to experiments order in project overview [fixes SCI-…
|
2017-05-15 15:28:18 +02:00 |
|
zmagod
|
9bec7dd96e
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1248
|
2017-05-15 14:49:37 +02:00 |
|
okriuchykhin
|
16325db1c6
|
Merge pull request #621 from okriuchykhin/ok_SCI_1263
Fix sorting in reports [SCI-1263]
|
2017-05-15 09:57:35 +02:00 |
|
zmagod
|
c35e2a4860
|
adds persistence to experiments order in project overview [fixes SCI-974]
|
2017-05-15 09:54:37 +02:00 |
|
okriuchykhin
|
9f9691de59
|
Merge pull request #620 from okriuchykhin/ok_SCI_452
Disable turbolinks on search links to fix JS errors [SCI-452]
|
2017-05-12 17:02:29 +02:00 |
|
okriuchykhin
|
8e523782d9
|
Merge pull request #619 from okriuchykhin/ok_SCI_617
Fixes error when cloning experiments with long names [SCI-617]
|
2017-05-12 16:53:38 +02:00 |
|
okriuchykhin
|
a8bbc3c3ba
|
Merge pull request #615 from okriuchykhin/ok_SCI_1008
Fix task and step ordering in reports [SCI-1008]
|
2017-05-12 16:44:57 +02:00 |
|
zmagod
|
b6367981c7
|
fixes remove user action on project [fixes SCI-1261]
|
2017-05-12 16:18:53 +02:00 |
|
Oleksii Kriuchykhin
|
5a2d618b1d
|
Fix sorting in reports [SCI-1263]
|
2017-05-12 16:04:19 +02:00 |
|
zmagod
|
d34b2520b5
|
refactor results javascript, fixes bug with results archive [fixes SCI-1262] prevents duplicate request [fixes SCI-1248]
|
2017-05-12 15:59:58 +02:00 |
|
Oleksii Kriuchykhin
|
ad39d09a53
|
Disable turbolinks on search links to fix JS errors [SCI-452]
|
2017-05-12 13:23:29 +02:00 |
|
Oleksii Kriuchykhin
|
79efb34191
|
Fixes error when clonning experiments with long names [SCI-617]
|
2017-05-12 11:07:11 +02:00 |
|
Zmago Devetak
|
0dc4addd6c
|
fix typo
|
2017-05-12 10:10:50 +02:00 |
|
zmagod
|
070a829c49
|
change new results hendlers
|
2017-05-12 10:02:33 +02:00 |
|
Oleksii Kriuchykhin
|
bb8c7c342c
|
Add additional info to samples info modal [SCI-960]
|
2017-05-11 22:20:06 +02:00 |
|
zmagod
|
81a3cb0a41
|
adds results js code in modules
|
2017-05-11 16:54:28 +02:00 |
|
Oleksii Kriuchykhin
|
5d55720aad
|
Fix steps ordering in reports [SCI-1008]
|
2017-05-11 15:56:33 +02:00 |
|
Oleksii Kriuchykhin
|
0ef9c7eff6
|
Fix task ordering in reports [SCI-1008]
|
2017-05-11 15:30:19 +02:00 |
|
okriuchykhin
|
ab0d882be1
|
Merge pull request #614 from okriuchykhin/ok_SCI_1254
Fix step actions in reports [SCI-1254]
|
2017-05-11 14:44:36 +02:00 |
|
Zmago Devetak
|
9911c0d148
|
Merge pull request #613 from ZmagoD/zd_SCI_1241_v3
replace all ActionController::Base.helpers.sanitize calls with custom…
|
2017-05-11 14:30:26 +02:00 |
|
Oleksii Kriuchykhin
|
fe134419a3
|
Fix step actions in reports [SCI-1254]
|
2017-05-11 13:51:43 +02:00 |
|
mlorb
|
219921ee33
|
Merge pull request #612 from mlorb/ml_sci_1250
Fix sample page bugs when editing column name [SCI-1250]
|
2017-05-11 13:48:20 +02:00 |
|