Commit graph

1692 commits

Author SHA1 Message Date
Zmago Devetak
4873624cec Merge pull request #658 from ZmagoD/zd_SCI_1011
Multiple file upload with drag & drop capability in steps and results
2017-06-09 10:03:33 +02:00
zmagod
33b996ffee refactor 2017-06-09 09:49:57 +02:00
Zmago Devetak
fcec42ae31 Merge pull request #645 from ZmagoD/zd_SCI_1278
generates samples csv file in background job [fixes SCI-1278]
2017-06-07 15:04:24 +02:00
zmagod
353c27da15 rename method 2017-06-07 13:51:16 +02:00
zmagod
c6bb20039b adds drag'n drop feature in task results [fixes SCI-1011], [fixes SCI-1310] and [fixes SCI-285] 2017-06-07 13:29:39 +02:00
ajugo
887d9a4f52 Samples - show all/show assigned [SCI-1277] (#644)
* Samples - show all/show assigned [SCI-1277]

* Some fixes in code

* Some minor fixes in code

* Omit present

* Correct missed present

* Fixing hound warnings
2017-06-06 12:46:56 +02:00
Luka Murn
eb95ec74a3 Merge pull request #654 from Ducz0r/lm-sci-1323
Fix bug with protocol preview modal not working in protocol repo [SCI-1323]
2017-06-06 08:02:33 +02:00
Luka Murn
f382c04f01 Refactor JS code a bit
Closes SCI-1323.
2017-06-06 08:02:01 +02:00
Luka Murn
62d97f6e64 Merge pull request #655 from Ducz0r/lm-sci-1321
Fix bug with TinyMCE not working for steps with nil description [SCI-1321]
2017-06-06 07:59:24 +02:00
Luka Murn
f298ec54e7 Code beautification per @zmagod's request
Closes SCI-1321.
2017-06-06 07:58:46 +02:00
Luka Murn
8c7aebbb88 Fix bug with TinyMCE not working for steps with nil description
Closes SCI-1321.
2017-06-05 17:43:03 +02:00
Luka Murn
1712fc0611 Fix bug with protocol preview modal not working in protocol repo
Closes SCI-1323.
2017-06-05 17:10:13 +02:00
mlorb
3dc83cfe05 Merge pull request #650 from mlorb/ml_sci_1286
Fix bug with titles truncate in activities [SCI-1286]
2017-06-05 16:27:44 +02:00
Mojca Lorber
27d3a5097b fix hound 2017-06-05 16:07:21 +02:00
zmagod
ab4961ddb1 adds overlay partial 2017-06-05 11:31:05 +02:00
zmagod
67d902db52 refactor 2017-06-05 10:43:58 +02:00
zmagod
1c021b11db adds drag and drop files upload to steps [fixes SCI-1310] 2017-06-02 16:34:09 +02:00
ajugo
a9bd86352d Step: wrong last columns of table [fixes SCI-405] (#600)
* Step: wrong last two columns of table after add table results [fixes SCI-405]

* Changing double quotes to single

* Adding empty line back
2017-06-01 15:52:02 +02:00
Mojca Lorber
7c2b657b0e fix bug with special characters when truncating activities titles 2017-06-01 15:10:26 +02:00
Mojca Lorber
d88b21fb5e truncate all titles in activities 2017-06-01 15:09:01 +02:00
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
zmagod
6e1f93dd11 minor fix 2017-05-29 14:47:05 +02:00
zmagod
b527afd12b generates samples csv file in background job [fixes SCI-1278] 2017-05-29 14:42:55 +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