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 |
|
Zmago Devetak
|
2224c6511d
|
Merge pull request #630 from ZmagoD/zd_SCI_1240_v2
fix label [fixes SCI-1240]
|
2017-05-29 09:01:30 +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 |
|
okriuchykhin
|
2bea3c71c0
|
Merge pull request #641 from okriuchykhin/ok_SCI_1309
Add missing include for sinitize_input [SCI-1309]
|
2017-05-25 16:33:52 +02:00 |
|
Oleksii Kriuchykhin
|
157b1630b9
|
Add missing include for sinitize_input [SCI-1309]
|
2017-05-25 16:28:06 +02:00 |
|
mlorb
|
2b624e9a92
|
Merge pull request #639 from mlorb/ml_sci_1266_v2
Add global repositories screen - tab control [SCI-1266]
|
2017-05-25 11:08:20 +02:00 |
|
Mojca Lorber
|
c3051421b2
|
change truncate function
|
2017-05-25 11:01:24 +02:00 |
|
okriuchykhin
|
f5575af19d
|
Merge pull request #640 from okriuchykhin/ok_SCI_1306
Add missing include [SCI-1306]
|
2017-05-25 10:56:26 +02:00 |
|
Mojca Lorber
|
8540f88b7e
|
small fix - renaming of ids and hrefs
|
2017-05-25 10:06:48 +02:00 |
|
Oleksii Kriuchykhin
|
7310763184
|
Add missing include [SCI-1306]
|
2017-05-25 08:57:50 +02:00 |
|
mlorb
|
58ac457d38
|
fix merge bug
|
2017-05-23 11:32:02 +02:00 |
|
mlorb
|
872f712be8
|
Merge branch 'custom-repositories' into ml_sci_1266_v2
|
2017-05-23 11:05:25 +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 |
|
okriuchykhin
|
670494be80
|
Merge pull request #637 from okriuchykhin/ok_SCI_1273
Add repositories dropdown to task navigation [SCI-1273]
|
2017-05-23 08:56:20 +02:00 |
|
Oleksii Kriuchykhin
|
b223646f07
|
Small improvements [SCI-1273]
|
2017-05-23 08:53:53 +02:00 |
|
Mojca Lorber
|
a716a0b1db
|
change breadcrumbs on protocol managements page
|
2017-05-22 17:58:42 +02:00 |
|
Mojca Lorber
|
9ae615264d
|
add global repositories screen - tab control
|
2017-05-22 17:54:30 +02:00 |
|
Luka Murn
|
bed486e747
|
Merge pull request #636 from biosistemika/release-1.11.0
Release 1.11.0
|
2017-05-18 14:22:03 +02:00 |
|
Oleksii Kriuchykhin
|
e99e3edb7b
|
Add repositories dropdown to task navigation [SCI-1273]
|
2017-05-18 14:21:00 +02:00 |
|
Luka Murn
|
4c5d7267ac
|
Version bump to 1.11.0
|
2017-05-18 13:48:02 +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 |
|
okriuchykhin
|
31e41fd8ae
|
Merge pull request #635 from okriuchykhin/ok_SCI_1288
Fix error handling in result_assets [SCI-1288]
|
2017-05-17 15:17:42 +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 |
|
okriuchykhin
|
76eccafaed
|
Merge pull request #631 from okriuchykhin/ok_SCI_1267
Add migrations and models for custom repositories [SCI-1267]
|
2017-05-17 10:44:29 +02:00 |
|
Oleksii Kriuchykhin
|
85e81e9ea2
|
Improve repository models and migration [SCI-1267]
|
2017-05-17 10:04:07 +02:00 |
|
okriuchykhin
|
7ec53d493b
|
Merge pull request #632 from okriuchykhin/ok_SCI_1284
Fix bug in counting search results for assets [SCI-1284]
|
2017-05-17 09:54:09 +02:00 |
|
Oleksii Kriuchykhin
|
f28df506f9
|
Fix bug in counting search results for assets [SCI-1284]
|
2017-05-17 09:08:40 +02:00 |
|
zmagod
|
b8b47542a6
|
fix label [fixes SCI-1240]
|
2017-05-16 16:08:29 +02:00 |
|
Zmago Devetak
|
7c2ca854ab
|
Merge pull request #628 from ZmagoD/zd_SCI_1285
fix search label [fixes SCI-1285]
|
2017-05-16 16:02:36 +02:00 |
|
Oleksii Kriuchykhin
|
0dc0c7d096
|
Add validation of text_value length [SCI-1267]
|
2017-05-16 15:57:21 +02:00 |
|
Oleksii Kriuchykhin
|
72a651c7de
|
Add migrations and models for custom repositories [SCI-1267]
|
2017-05-16 15:27:36 +02:00 |
|
zmagod
|
e0397f8a54
|
fix search label [fixes SCI-1285]
|
2017-05-16 14:58:39 +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
|
5e5ee26c5e
|
Merge pull request #624 from ZmagoD/zd_SCI_1240
changes load protocol label [fixes SCI-1240]
|
2017-05-15 16:26:41 +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 |
|