Commit graph

7587 commits

Author SHA1 Message Date
aignatov-bio
c9a9cd2e75 Remove search from state load in task repository 2020-05-14 21:49:01 +02:00
aignatov-bio
78b4067c50
Merge pull request #2549 from aignatov-bio/ai-sci-4604-small-snapshot-corrections
Small snapshot css corrections [SCI-4604]
2020-05-14 15:18:13 +02:00
aignatov-bio
8f946c45c3
Merge pull request #2553 from aignatov-bio/ai-sci-4518-optimize-task-mobile-view
Small CSS improvments for mobile [SCI-4518]
2020-05-14 14:20:40 +02:00
aignatov-bio
9b685fdaa6
Merge pull request #2554 from aignatov-bio/ai-sci-4613-add-icon-to-cancel-button
Add icon to cancel button [SCI-4613]
2020-05-14 13:19:20 +02:00
aignatov-bio
445f55acc7
Merge pull request #2555 from aignatov-bio/ai-sci-4598-change-task-details-to-onclick
Replace bootstrap popover with bootstrap dropdown [SCI-4598]
2020-05-14 13:19:08 +02:00
aignatov-bio
99e1affa73
Merge pull request #2556 from aignatov-bio/ai-sci-4515-fix-smart-annotation-position
Fix smart annotation position for horizontal scroll [SCI-4515]
2020-05-14 13:18:57 +02:00
aignatov-bio
5bdf1ff586
Merge pull request #2558 from aignatov-bio/ai-sci-4608-fix-pdf-report-time-position
Prevent time to go newline in reports [SCI-4608]
2020-05-14 13:18:31 +02:00
Alex Kriuchykhin
384b107c6c
Merge pull request #2560 from biosistemika/SCI-4601-fix-snapshot-bugs
SCI-4601 fix the associations, renaming variable
2020-05-14 13:09:10 +02:00
Miha Mencin
15508a5065 codestyle fix 2020-05-14 12:57:16 +02:00
Miha Mencin
26caeed04f
increase pooling interval to 10s 2020-05-14 12:39:13 +02:00
Miha Mencin
0e5ce1054e decrease pooling time for snapshots 2020-05-14 12:03:07 +02:00
Miha Mencin
2e4655f9ee
Merge pull request #2548 from urbanrotnik/ur-sci-4609-task-card-due-date
Task card due date fix [SCI-4609]
2020-05-14 11:52:44 +02:00
Miha Mencin
76232f0298 SCI-4601 fix the associations, minor styling changes 2020-05-14 11:47:19 +02:00
Alex Kriuchykhin
f089e4abc8
Merge pull request #2559 from okriuchykhin/ok_SCI_4596
Restore deleted method after rebase [SCI-4596]
2020-05-14 11:20:08 +02:00
Oleksii Kriuchykhin
ea740eb2a4 Restore deleted method after rebase [SCI-4596] 2020-05-14 10:57:43 +02:00
Alex Kriuchykhin
a341bd533b
Merge pull request #2557 from okriuchykhin/ok_SCI_4596
Make snapshots selectable [SCI-4596]
2020-05-14 10:15:44 +02:00
Urban Rotnik
fbd44a4e23
Merge pull request #2547 from urbanrotnik/ur-sci-4557-update-permissions
Update permissions and automatic snapshots [SCI-4557] [SCI-4624]
2020-05-14 10:04:56 +02:00
aignatov-bio
9076fab12f Prevent time to go newline in reports 2020-05-13 18:46:58 +02:00
Oleksii Kriuchykhin
9c70fa1990 Fix code style [SCI-4596] 2020-05-13 18:00:58 +02:00
Oleksii Kriuchykhin
ba1661b40f Fix handling of deleted repositories for snapshots [SCI-4596] 2020-05-13 18:00:56 +02:00
Oleksii Kriuchykhin
c74fa3c244 Make snapshots selectable [SCI-4596] 2020-05-13 17:58:05 +02:00
Alex Kriuchykhin
76d1196724
Merge pull request #2544 from okriuchykhin/ok_SCI_4597
Refactor Repository permissions and implement deduplication for files in snapshots [SCI-4597]
2020-05-13 16:42:47 +02:00
aignatov-bio
cbaaa7413c Fix smart annotation position for horizontal scroll 2020-05-13 12:45:22 +02:00
aignatov-bio
8447a13afd Replace bootstrap popover with bootstrap dropdown 2020-05-13 12:20:25 +02:00
aignatov-bio
f6b239c144 Add icon to cancel button 2020-05-13 11:09:19 +02:00
aignatov-bio
bd742d388d Small CSS improvments for mobile 2020-05-13 10:58:40 +02:00
Urban Rotnik
334da7c3ec Fix for assign view 2020-05-12 19:38:45 +02:00
aignatov-bio
f94ea51ecb Small snapshot css corrections 2020-05-10 13:08:19 +02:00
Urban Rotnik
8174d63734 Include BoostrapFormHelper in FormBuilder 2020-05-08 20:36:45 +02:00
aignatov-bio
8e20dccc66
Merge pull request #2510 from aignatov-bio/ai-sci-4509-add-recent-protocols-tab
Add recent protocol tab to load protocal from repository [SCI-4509]
2020-05-08 13:17:26 +02:00
aignatov-bio
50423ecb0b Remove unused constant 2020-05-08 13:16:24 +02:00
aignatov-bio
6997586357
Merge pull request #2541 from aignatov-bio/ai-sci-4591-merge-assign-unassign-service
Merge assign and unassign service [SCI-4591]
2020-05-08 13:15:06 +02:00
aignatov-bio
d2a479c2e8
Merge pull request #2526 from aignatov-bio/ai-sci-4559-add-assigned-tasks-dropdown-to-inventory
Add assigned task dropdown to repository and task page [SCI-4559][SCI-4565]
2020-05-08 12:39:28 +02:00
aignatov-bio
d3faec1070 Rename service 2020-05-08 12:28:37 +02:00
aignatov-bio
e9c54f10fb Fix markup 2020-05-08 11:58:40 +02:00
aignatov-bio
2728df5bac Move helper method to my_module_helper 2020-05-08 11:56:29 +02:00
Oleksii Kriuchykhin
17cd991868 Update Canaid and Rails [SCI-4597] 2020-05-08 10:58:36 +02:00
aignatov-bio
c9545ddb19 Merge branch 'features/new-task-layout' into ai-sci-4509-add-recent-protocols-tab 2020-05-08 10:28:33 +02:00
aignatov-bio
0a3b6a7d3e
Merge pull request #2543 from aignatov-bio/ai-sci-fix-snapshot-button-position
Fix snapshot button place
2020-05-07 19:48:27 +02:00
aignatov-bio
dad5ac7a27 Fix snapshot button place 2020-05-07 19:36:30 +02:00
aignatov-bio
fe658a9b23
Merge pull request #2534 from aignatov-bio/ai-sci-4594-refactor-css-for-full-view-repository-view
Update CSS for full view assigned rows modal [SCI-4594]
2020-05-07 15:22:06 +02:00
aignatov-bio
c3ca0156fb Fix error handling 2020-05-07 13:58:25 +02:00
aignatov-bio
30ce49b731
Merge pull request #2538 from aignatov-bio/ai-sci-4574-result-office-button-position
Fix office button position [SCI-4574]
2020-05-07 13:55:15 +02:00
aignatov-bio
29903f570d Merge assign and unassign service 2020-05-07 13:51:07 +02:00
aignatov-bio
8ec7a4b7b4 Merge branch 'features/new-task-layout' into ai-sci-4559-add-assigned-tasks-dropdown-to-inventory 2020-05-07 13:03:00 +02:00
aignatov-bio
912b01d34b
Merge pull request #2539 from aignatov-bio/ai-sci-4573-small-css-fixes-for-protocols
Fix css for comments and fix modal title size [SCI-4573]
2020-05-07 12:59:56 +02:00
aignatov-bio
8076d8f464 Create helper for partial 2020-05-07 12:51:18 +02:00
aignatov-bio
8b5872347a
Merge pull request #2514 from aignatov-bio/ai-sci-4538-new-protocol-template-dropdown
Add new protocol template dropdown [SCI-4538]
2020-05-07 08:32:54 +02:00
Oleksii Kriuchykhin
25f9c5bc7d Refactor Repository permissions and implement deduplication for files in snapshots [SCI-4597] 2020-05-06 15:17:54 +02:00
Urban Rotnik
a6ab14de99
Merge pull request #2536 from urbanrotnik/ur-sci-4586-hide-icon-if-there-is-no-users-for-assign
Hide icon [SCI-4586]
2020-05-06 14:19:18 +02:00