scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-29 03:16:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
8179 commits 69 branches 179 tags 165 MiB
Commit graph

6366 commits

Author SHA1 Message Date
Mojca Lorber 94dc314c73 Hide hamburger menu on login screen 2020-05-25 10:39:35 +02:00
mlorb 384ec40c4e
Merge pull request #2542 from mlorb/ml-sci-4582 
Task details description corrections and some changes of locales [SCI-4582]
 2020-05-25 09:10:37 +02:00
aignatov-bio 9973151278
Merge pull request #2598 from aignatov-bio/ai-sci-4662-fix-new-comment-field 
Fix new comment field [SCI-4662]
 2020-05-25 09:09:33 +02:00
aignatov-bio 100108bd43
Merge pull request #2596 from aignatov-bio/ai-sci-4642-improve-assigned-task-search 
Improve search through assigned tasks [SCI-4642]
 2020-05-25 09:09:19 +02:00
Oleksii Kriuchykhin c98b042585 Improve handling of unassigned inventories with existing snapshots [SCI-4661] 2020-05-22 17:36:04 +02:00
aignatov-bio 230ec487ba Make snapshots versions buttons full size clickable 2020-05-22 17:16:20 +02:00
aignatov-bio ce53235cb9
Merge pull request #2592 from aignatov-bio/ai-sci-4621-fix-order-icon-position-in-simple-view 
Fix ordering in simple table view [SCI-4621]
 2020-05-22 16:52:45 +02:00
aignatov-bio 8161bbb31c Fix new comment field 2020-05-22 16:51:11 +02:00
Alex Kriuchykhin b5e0e4649c
Merge pull request #2597 from urbanrotnik/4663-fix-button-visibility 
Fix for snapshot creation [SCI-4672]
 2020-05-22 16:38:29 +02:00
Urban Rotnik a407bf857f Fix for show and create 2020-05-22 16:19:21 +02:00
Urban Rotnik a754e5765d
Merge pull request #2595 from urbanrotnik/ur-sci-4670-missing-button 
New step missing button [SCI-4670]
 2020-05-22 15:33:58 +02:00
aignatov-bio cbc578f84b Fix snapshot name column id 2020-05-22 15:10:21 +02:00
aignatov-bio 3287070df7 Improve search through assigned tasks 2020-05-22 14:36:28 +02:00
Urban Rotnik 9d3874e343 Add margin to keywords container 2020-05-22 14:23:03 +02:00
Miha Mencin a4cd014682
Merge pull request #2591 from okriuchykhin/ok_SCI_4656 
Make a snapshot name synced with the inventory name if changed [SCI-4656]
 2020-05-22 12:57:08 +02:00
Urban Rotnik 55f77cfe00
Merge pull request #2594 from urbanrotnik/4663-fix-button-visibility 
Fix button visibility [SCI-4663]
 2020-05-22 12:55:16 +02:00
Urban Rotnik 1c2883414b Bring newStep top button back 2020-05-22 12:29:14 +02:00
Urban Rotnik a1fa0b4e05 Add check for button visibility 2020-05-22 12:02:38 +02:00
Urban Rotnik a9bed41ff5 Remove obsolete html message 2020-05-22 10:33:13 +02:00
Mojca Lorber 92861fdd32 Expand assigned inventory after updating assigned items on task 2020-05-21 22:36:09 +02:00
aignatov-bio 0aa1c32813 Fix ordering in simple table view 2020-05-21 16:51:07 +02:00
aignatov-bio d3781a7048
Merge pull request #2588 from aignatov-bio/ai-sci-4660-change-assigned-private-task-view 
Add private tasks to assigned task list [SCI-4660]
 2020-05-21 12:57:59 +02:00
Oleksii Kriuchykhin 388f52a064 Make a snapshot name synced with the inventory name if changed [SCI-4656] 2020-05-21 11:51:37 +02:00
Alex Kriuchykhin bc70ceb120
Merge pull request #2590 from biosistemika/SCI-4628-schedule-snapshots-for-locked-tasks 
[SCI-4628] moving snapshot provisioning logic into repository model, ma…
 2020-05-21 09:53:04 +02:00
Mojca Lorber 12982260b7 Fix css hover effects 2020-05-21 08:37:40 +02:00
Miha Mencin 7de12990a9 SCI-4628 moving snapshot provisioning logic into repository model, making snapshot unique selection validation conditional 2020-05-21 00:36:24 +02:00
Oleksii Kriuchykhin f2043f111b Change display of the live version for a deleted inventory [SCI-4659] 2020-05-20 21:50:39 +02:00
aignatov-bio d16930e987 Add private tasks to assigned task list 2020-05-20 17:23:48 +02:00
Urban Rotnik a5b1f1cfd5
Merge pull request #2587 from urbanrotnik/ur-sci-4634-v2 
Inventory import fix [SCI-4634] v2
 2020-05-20 14:45:57 +02:00
Mojca Lorber e2959fec32 Merge branch 'develop' into ml-sci-4582 2020-05-20 10:37:33 +02:00
Urban Rotnik 32df6f2568 Skip cell import if value is nil 2020-05-20 09:56:08 +02:00
mlorb 29370cf82e
Merge pull request #2586 from mlorb/ml-sci-4615 
Fix missing creator in task details [SCI-4615]
 2020-05-20 09:47:08 +02:00
aignatov-bio 51d9f054ee
Merge pull request #2584 from aignatov-bio/ai-sci-4654-clear-fullview-modal-before-open 
Clear full view repository modal before open [SCI-4654]
 2020-05-20 09:45:26 +02:00
aignatov-bio 4e7a26bdd0
Merge pull request #2583 from aignatov-bio/ai-sci-4651-fix-repository-ordering 
Fix repositories order in dropdown [SCI-4651]
 2020-05-20 09:45:13 +02:00
Urban Rotnik 2283491629 Conver to string if not importing into Number column 2020-05-20 09:09:14 +02:00
Mojca Lorber 40a3ee82d5 Add creator to task 2020-05-20 08:59:07 +02:00
aignatov-bio 40b266ee0d Clear full view repository modal before open 2020-05-19 16:44:47 +02:00
aignatov-bio d714b4b7bf
Merge pull request #2579 from aignatov-bio/ai-sci-4635-fix-checklist-appearance-in-fullview 
Fix checklist render in full view [SCI-4635]
 2020-05-19 16:18:45 +02:00
aignatov-bio f8b246eb2a Fix repositories order in dropdown 2020-05-19 16:18:01 +02:00
Urban Rotnik 431bd0c53b
Merge pull request #2582 from urbanrotnik/ur-sci-4650-font-size-fix 
Fonts size update [SCI-4650]
 2020-05-19 14:55:22 +02:00
mlorb 7cbbcff86a
Merge pull request #2576 from mlorb/ml-sci-4619 
Fix manage permissions on views [SCI-4619]
 2020-05-19 14:29:11 +02:00
Urban Rotnik ac4532eea3 Update fonts 2020-05-19 14:14:58 +02:00
aignatov-bio 2dcada4bc5
Merge pull request #2580 from aignatov-bio/ai-sci-4647-add-custom-tinymce-plugins-to-asset-pipeline 
Add custom tinymce plugins to assets pipeline [SCI-4647]
 2020-05-19 10:31:51 +02:00
aignatov-bio c00b96ff7e
Merge pull request #2577 from aignatov-bio/ai-sci-4646-fix-task-sections-collapse-animation 
Fix collapse animation for task sections [SCI-4646]
 2020-05-19 10:31:36 +02:00
Urban Rotnik 1dc0e2b40b
Merge pull request #2581 from urbanrotnik/ur-sci-4640-wrong-snapshot-displayed 
Hide sidebar Versions by default [SCI-4640]
 2020-05-19 10:27:57 +02:00
Alex Kriuchykhin 49a35f43c5
Merge pull request #2578 from okriuchykhin/ok_SCI_4645 
Fix error message for file upload limit on steps [SCI-4645]
 2020-05-19 10:27:12 +02:00
Alex Kriuchykhin afdd6fd149
Merge pull request #2572 from okriuchykhin/ok_SCI_4629 
Prevent the inventory items editing while snapshot is being created [SCI-4629]
 2020-05-19 10:10:34 +02:00
Urban Rotnik ea0e97d046 Hide sidebar on modal close 2020-05-19 09:46:38 +02:00
aignatov-bio 3047af759f Add custom tinymce plugins to assets pipeline 2020-05-18 18:06:52 +02:00
aignatov-bio 9db19603dc Fix checklist render in fullview 2020-05-18 16:32:27 +02:00
Oleksii Kriuchykhin bc1ee1bd8d Fix error message for file upload limit on steps [SCI-4645] 2020-05-18 16:16:39 +02:00
aignatov-bio 9f4457642d Fix collapse animation for task sections 2020-05-18 16:01:26 +02:00
Mojca Lorber 6b6fba591e Fix manage permissions on views 2020-05-18 15:54:32 +02:00
Urban Rotnik 7e009ab8ee
Merge pull request #2574 from urbanrotnik/ur-sci-4634 
Fix excel header parsing [SCI-4634]
 2020-05-18 14:56:22 +02:00
Alex Kriuchykhin e9a05d2e3d
Merge pull request #2575 from okriuchykhin/ok_SCI_4637 
Fix selection of the default snapshot on tasks [SCI-4637]
 2020-05-18 14:25:26 +02:00
Oleksii Kriuchykhin d77930af61 Fix failing tests for repository rows controller [SCI-4629] 2020-05-18 14:12:06 +02:00
Urban Rotnik 3b08241b0b Fix excel header parsing 2020-05-18 11:39:19 +02:00
aignatov-bio 1f24adddf9
Merge pull request #2562 from aignatov-bio/ai-sci-4627-remove-search-word-from-task-table-state 
Remove search from state load in task repository [SCI-4627]
 2020-05-18 11:16:27 +02:00
aignatov-bio acb1b392fc
Merge pull request #2564 from aignatov-bio/ai-sci-4632-remove-task-inventory-tab 
Remove inventory tab from task and routes to inventory page [SCI-4632]
 2020-05-18 11:16:17 +02:00
aignatov-bio 343356cab7
Merge pull request #2571 from aignatov-bio/ai-sci-4639-select-correct-button-for-assign-modal 
Select correct button name for assign modal [SCI-4639]
 2020-05-18 11:16:07 +02:00
aignatov-bio f2d81cb199
Merge pull request #2570 from aignatov-bio/ai-sci-4617-make-snapshot-creation-text-switchable 
Make snapshot creation info text switchable [SCI-4617]
 2020-05-18 11:15:46 +02:00
aignatov-bio 2b3dda8ce0
Merge pull request #2569 from aignatov-bio/ai-sci-4613-add-title-for-assign-modal 
Add a title for full view assign modal [SCI-4613]
 2020-05-18 11:15:36 +02:00
Oleksii Kriuchykhin 8b968f6f67 Fix selection of the default snapshot on tasks [SCI-4637] 2020-05-18 11:06:42 +02:00
aignatov-bio 820514789d Update tinymce gem version 2020-05-17 17:36:26 +02:00
Oleksii Kriuchykhin c0521c3ca7 Prevent the inventory items editing while snapshot is being created [SCI-4629] 2020-05-15 17:46:59 +02:00
aignatov-bio f921ac75d8 Select correct button name for assign modal 2020-05-15 15:37:48 +02:00
aignatov-bio bc81a48b00 Make snapshot creation info text switchable 2020-05-15 14:44:26 +02:00
Urban Rotnik a2ade6e0ec Merge branch 'develop' into features/new-task-layout 2020-05-15 14:27:56 +02:00
aignatov-bio 69abccbbd6 Add title for full view assign modal 2020-05-15 14:22:20 +02:00
aignatov-bio dc2caca4f3 Small css fixes and test fix 2020-05-15 11:04:17 +02:00
mlorb dbd03a09ef
Merge pull request #2565 from mlorb/ml-sci-4511 
Add New Task layout Collapsed/Expanded States saving [SCI-4511]
 2020-05-15 09:23:05 +02:00
Urban Rotnik e290f555f4
Merge pull request #2561 from urbanrotnik/ur-sci-4625-import-fix 
Fix for empty status cell [SCI-4625]
 2020-05-15 08:44:30 +02:00
Mojca Lorber 4c15c89cf5 Add New Task layout Collapsed/Expanded States saving 2020-05-15 00:49:23 +02:00
aignatov-bio 51e3c70a4d
Merge pull request #2563 from aignatov-bio/ai-sci-4638-fix-step-content-aligment 
Fix align for step content [SCI-4638]
 2020-05-14 22:10:50 +02:00
aignatov-bio bac98bdbdc Remove inventory tab from task and routes to inventory page 2020-05-14 22:10:13 +02:00
aignatov-bio 443c301ca1 Fix align for step content 2020-05-14 21:53:00 +02:00
aignatov-bio c9a9cd2e75 Remove search from state load in task repository 2020-05-14 21:49:01 +02:00
Urban Rotnik ba68eef044 Fix for empty status cell 2020-05-14 17:59:25 +02:00
mlorb 1e0fed75d1
Merge pull request #2551 from mlorb/ml-sci-4620 
Fix missing corner on opened task inventory [SCI-4620]
 2020-05-14 17:25:39 +02:00
aignatov-bio e49d2dfbae
Merge pull request #2546 from aignatov-bio/ai-sci-4605-some-inventories-task-corrections 
Small task inventories corrections [SCI-4605]
 2020-05-14 16:45:45 +02:00
aignatov-bio ce1540aaa9 Small task inventories corrections 2020-05-14 16:41:02 +02:00
aignatov-bio af4ac7c53b Add const to dropdown library 2020-05-14 16:29:50 +02:00
aignatov-bio 309f8c1a3d Small snapshots CSS corrections 2020-05-14 16:29:50 +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
Mojca Lorber 009dce110b Css fix 2020-05-14 12:18:45 +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
Mojca Lorber 9c4d07f0dd Fix missing corner on opened task inventory 2020-05-11 13:04:31 +02:00
Urban Rotnik a96d19d5ea Add table name attribute to export schema 2020-05-11 11:25:41 +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 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 dad5ac7a27 Fix snapshot button place 2020-05-07 19:36:30 +02:00
Mojca Lorber b3bce933e5 Task details description corrections and some changes of locales 2020-05-07 16:11:22 +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
Urban Rotnik a38b850601
Merge pull request #2520 from urbanrotnik/ur-sci-4522-activity-links 
Activities links [SCI-4522] &  [SCI-4514]
 2020-05-06 22:11:58 +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
Urban Rotnik 715d6ab8fa
Merge pull request #2537 from urbanrotnik/ur-sci-4587-activities-start-date-fix 
Fix activity message for start date [SCI-4587]
 2020-05-06 14:18:52 +02:00
aignatov-bio 5972c3fdf6 Fix css for comments and fix modal title size 2020-05-06 13:54:39 +02:00
aignatov-bio b74b717d03 Fix office button position 2020-05-06 13:42:30 +02:00
Urban Rotnik 8ff7c33431 Fix start date activity message 2020-05-06 12:34:45 +02:00
aignatov-bio 4e5ebd01b5 Fix I18n 2020-05-06 12:20:20 +02:00
Urban Rotnik 4c4d0a2403 Hide icon if there is no users 2020-05-06 09:47:39 +02:00
aignatov-bio a29db548f8 Update CSS for full view assigned rows modal 2020-05-05 18:17:14 +02:00
Mojca Lorber 8b4110c0af Css fixes for avatars for assigned users on tasks 2020-05-05 16:11:11 +02:00
Alex Kriuchykhin 7e9054e6d2
Merge pull request #2519 from aignatov-bio/ai-sci-4523-add-assign-items-to-task 
Add assign items modal and update modal for task inventories [SCI-4523][SCI-4524]
 2020-05-05 13:20:01 +02:00
aignatov-bio 85dae268fe
Merge pull request #2498 from aignatov-bio/ai-sci-4481-fix-notification-when-search-field-active 
Fix notification when search field active [SCI-4481]
 2020-05-05 12:59:32 +02:00
aignatov-bio c556fd2478
Merge pull request #2530 from aignatov-bio/ai-sci-4574-fix-css-for-results-page 
Fix CSS for results [SCI-4574]
 2020-05-05 12:58:35 +02:00
aignatov-bio f3046c8515
Merge pull request #2529 from aignatov-bio/ai-sci-4584-fix-handsone-table 
Fix Handson table for collapsed protocol section [SCI-4584]
 2020-05-05 12:58:04 +02:00
aignatov-bio cf2508c5d0
Merge pull request #2522 from aignatov-bio/ai-sci-4508-small-protocol-layout-fixes 
Small layout changes for protocol [SCI-4508]
 2020-05-05 12:57:40 +02:00
Urban Rotnik 429519e930
Merge pull request #2521 from urbanrotnik/ur-sci-4513-counter-fix 
Fix items count validation [SCI-4513]
 2020-05-05 12:31:00 +02:00
Urban Rotnik 4947255015
Merge pull request #2528 from urbanrotnik/ur-sci-4542-user-filter 
Fix for user filter in task activity page [SCI-4542]
 2020-05-05 10:25:26 +02:00
aignatov-bio 1b57040c37 Fix deepscan issues 2020-05-05 09:44:38 +02:00
aignatov-bio 8c57ed3109 Fix css for results 2020-05-02 22:37:02 +02:00
aignatov-bio 9d006aac9e Fix handson table for colapsed protocol section 2020-05-02 22:15:38 +02:00
aignatov-bio 1ed62c4a49 Fix I18n and save to repository button 2020-05-01 20:45:09 +02:00
Urban Rotnik 760c2fba8f
Merge pull request #2523 from urbanrotnik/ur-sci-4549-sidebar-fix 
Fix icon position and hover effect in repositories sidebar [SCI-4549]
 2020-04-30 09:32:20 +02:00
Urban Rotnik 1fe1b782f1 Fix for user filter in task activity page 2020-04-30 09:20:29 +02:00
aignatov-bio 938f00484b Fix markup 2020-04-29 15:17:15 +02:00
aignatov-bio 19d30e2019 Merge branch 'features/new-task-layout' into ai-sci-4523-add-assign-items-to-task 2020-04-29 15:13:38 +02:00
Alex Kriuchykhin 0e865f8e45
Merge pull request #2525 from okriuchykhin/ok_SCI_4552 
Implement background processing of repository snapshots [SCI-4552]
 2020-04-29 12:03:23 +02:00
aignatov-bio 046c9662d1 Fix markup 2020-04-28 19:16:04 +02:00
aignatov-bio 61bbca6bcf Fix path names and markup 2020-04-28 19:12:17 +02:00
Urban Rotnik 276351bbed Remove Tooltips JS code 2020-04-28 12:51:59 +02:00
aignatov-bio be8ef5a310 Add I18n 2020-04-28 12:49:19 +02:00
Urban Rotnik 5c72200801 Remove tooltips settings for user 2020-04-28 12:44:47 +02:00
aignatov-bio b9c5089c2b Add search to assigned tasks dropdown 2020-04-28 12:41:59 +02:00
Urban Rotnik 8fa024ed10 Remove all tooltips from HTML 2020-04-28 12:30:43 +02:00
Oleksii Kriuchykhin e6ad5047e0 Implement background processing of repository snapshots [SCI-4552] 2020-04-28 12:09:36 +02:00
Urban Rotnik 9c3fb063c0 Fix counter and error showing for CheckList column type 2020-04-24 16:09:54 +02:00
aignatov-bio 0a87bd3dcf Fix markup 2020-04-24 15:48:40 +02:00
aignatov-bio ad705a740c Add new protocol template dropdown 2020-04-24 15:48:40 +02:00
aignatov-bio 0604815c00 Add assigned task dropdown to repository 2020-04-24 15:43:10 +02:00
Mojca Lorber 008ab8ab86 Remove redundant data-hook from protocol options dropdown 2020-04-24 15:10:42 +02:00
Urban Rotnik 73e5168db6 Fix icon position and hover efect in repositories sidebar 2020-04-24 14:51:32 +02:00
aignatov-bio 4f941610b2 Small layout changes for protocol 2020-04-24 11:50:03 +02:00
Urban Rotnik 6c5be802ba Fix items count validation 2020-04-24 08:45:34 +02:00
mlorb 1cea6116b5
Merge pull request #2515 from mlorb/ml-sci-4493 
Add protocol options dropdown [SCI-4493]
 2020-04-23 17:21:26 +02:00
Mojca Lorber c1138f1d26 fix font 2020-04-23 16:56:09 +02:00
Mojca Lorber ac709be364 Small fixes 2020-04-23 16:50:16 +02:00
aignatov-bio 2f7adffcb0 Fix markup 2020-04-23 16:40:14 +02:00
aignatov-bio f65b50c6ff Fix rebase conflicts 2020-04-23 16:36:22 +02:00
Urban Rotnik de4e4ca967 Add before_action for team switch 2020-04-23 16:20:01 +02:00
aignatov-bio c2e456aa27 Fix activities and specs 2020-04-23 15:25:28 +02:00
aignatov-bio d48997464d Fix markup 2020-04-23 15:25:28 +02:00
aignatov-bio 5b375168c0 Add I18n 2020-04-23 15:24:40 +02:00
aignatov-bio 34d6e903a4 Add assign items modal and update modal for task inventories 2020-04-23 15:24:40 +02:00
aignatov-bio 10fdd0c1c7 Merge branch 'develop' into features/new-task-layout 2020-04-23 14:07:40 +02:00
Alex Kriuchykhin 027e6d3db0
Merge pull request #2518 from okriuchykhin/ok_SCI_4544_v2 
Fix Azure AD user creation on sign in [SCI-4544]
 2020-04-23 13:18:36 +02:00
Alex Kriuchykhin 1802d7cb59
Merge pull request #2516 from okriuchykhin/ok_SCI_4525 
Add versions sidebar to assigned repository rows full view modal [SCI-4525]
 2020-04-23 13:18:23 +02:00
Urban Rotnik 38c198705c Change current_team to target team, add id param to link 2020-04-23 12:40:43 +02:00
Oleksii Kriuchykhin 06b6907d13 Handle situation when task creator or modifier is not present [SCI-4503] 2020-04-23 12:40:27 +02:00
Urban Rotnik 89b848d21d Fix value rounding for General excel type 2020-04-23 07:19:24 +02:00
Oleksii Kriuchykhin 943285d4a0 Fix Azure AD user creation on sign in [SCI-4544] 2020-04-22 16:47:06 +02:00
Oleksii Kriuchykhin e0d397ba77 Improve code style in repository_datatable_helper.rb [SCI-4525] 2020-04-22 15:21:04 +02:00
Oleksii Kriuchykhin 608ee23ec4 Add task details popover [SCI-4503] 2020-04-21 15:11:57 +02:00
Oleksii Kriuchykhin f811d11c59 Add versions sidebar to assigned repository rows full view modal [SCI-4525] 2020-04-21 14:49:36 +02:00
Mojca Lorber 6fecee8c0c Add protocol options dropdown 2020-04-21 10:03:53 +02:00
aignatov-bio be47efce74
Merge pull request #2509 from aignatov-bio/ai-sci-4506-add-repositories-dropdown-list 
Add repositories dropdown list [SCI-4506]
 2020-04-16 14:17:17 +02:00
mlorb 9584b11d45
Merge pull request #2507 from mlorb/ml-sci-4505 
Add the user management section of to the Details section of task layout [SCI-4505]
 2020-04-16 13:47:31 +02:00
Alex Kriuchykhin 436f0bf63d
Merge pull request #2506 from okriuchykhin/ok_SCI_4516 
Add repository snapshots with service, refactor item assigning [SCI-4516]
 2020-04-15 17:32:25 +02:00
Oleksii Kriuchykhin b85c192b68 Remove duplicate method from repository [SCI-4516] 2020-04-15 14:48:26 +02:00
aignatov-bio 0d1dd74f02 Fix typo 2020-04-14 18:17:54 +02:00
Mojca Lorber e9959747d6 small refactor 2020-04-14 17:25:36 +02:00
Oleksii Kriuchykhin 1ca3c875a6 Add option for storing Azure app configs in settings using JSON format [SCI-4544] 2020-04-14 15:56:41 +02:00
aignatov-bio f00561cc22 Fix markup 2020-04-14 13:10:13 +02:00
aignatov-bio 338f3a0192 Fix css 2020-04-14 13:08:07 +02:00
aignatov-bio 15b291347b Fix I18n 2020-04-14 12:10:17 +02:00
aignatov-bio c1cac01b28 Add repositories dropdown list 2020-04-14 12:10:16 +02:00
aignatov-bio b53ad2850a Remove old code 2020-04-09 17:31:28 +02:00
aignatov-bio fe718349da Add recent protocol tab to load protocal from repository 2020-04-09 17:29:39 +02:00
Oleksii Kriuchykhin 837437309e Fix failing tests [SCI-4516] 2020-04-09 17:11:58 +02:00
Oleksii Kriuchykhin 3a67c99982 Switch to STI for repositories, fix cell values snapshotting [SCI-4516] 2020-04-09 12:33:04 +02:00
Mojca Lorber f22f076e6c Add the user management secion of to the Details section of task layout 2020-04-08 16:24:59 +02:00
aignatov-bio c9b59f96a8 Hide checkbox column for full view 2020-04-08 15:58:22 +02:00
aignatov-bio e4b65aaf6f Finish full view repository 2020-04-08 15:13:21 +02:00
aignatov-bio 087f71a82f Add full view for my-module repository 2020-04-07 21:02:16 +02:00
Oleksii Kriuchykhin a9c3102835 Add repository snapshots with service, refactor item assigning [SCI-4516] 2020-04-07 18:26:39 +02:00
aignatov-bio 9dfc652580 Fix markup 2020-04-07 12:50:58 +02:00
aignatov-bio 845e8c3d6d Fix loading process 2020-04-07 12:36:01 +02:00
aignatov-bio 7fdc169ba2 Add simple view to repository table 2020-04-06 19:52:41 +02:00
aignatov-bio 2f0fd438a6
Merge pull request #2504 from aignatov-bio/ai-sci-4519-add-dashboard-mobile-view 
Add mobile view for dashboard [SCI-4519]
 2020-04-06 15:36:11 +02:00
Alex Kriuchykhin 80bf5123ec
Merge pull request #2497 from aignatov-bio/ai-sci-4472-change-due-date-wording-on-dashboard 
Change i18n for due date on current task widget [SCI-4472]
 2020-04-06 10:27:21 +02:00
Alex Kriuchykhin f92d68d192
Merge pull request #2496 from aignatov-bio/ai-sci-4471-assign-user-after-task-create 
Assign user after task created [SCI-4471]
 2020-04-06 10:25:19 +02:00
Alex Kriuchykhin 967c072dbd
Merge pull request #2500 from aignatov-bio/ai-sci-4517-fix-sidebar-when-caching 
Fix caching issue for sidebar [SCI-4517]
 2020-04-06 10:21:59 +02:00
aignatov-bio fc810b5524
Merge pull request #2503 from aignatov-bio/ai-sci-4507-add-assigned-repositories-list 
Add assigned repositories list [SCI-4507]
 2020-04-03 13:59:26 +02:00
aignatov-bio 9a64ebdfd0 Update sql and add accordion effect 2020-04-03 13:15:56 +02:00
aignatov-bio dd3f2cb219 Update my_module assigned repository method 2020-04-03 12:33:42 +02:00
Alex Kriuchykhin 3e20efcc8e
Merge pull request #2501 from aignatov-bio/ai-sci-4474-add-decimals-to-repository-api 
Add decimals to repository column API [SCI-4474]
 2020-04-03 11:45:55 +02:00
aignatov-bio f313b6ff01
Merge pull request #2492 from aignatov-bio/ai-sci-4339-refactor-login-screen 
Update css for login screen [SCI-4339]
 2020-04-02 15:47:17 +02:00
aignatov-bio 158966cc01 Add mobile view for dashboard 2020-04-02 14:58:10 +02:00
aignatov-bio 9678372dd5 Add assigned repositories list 2020-04-02 12:05:07 +02:00
aignatov-bio af02201b43 Add decimals to repository column API 2020-04-01 13:29:21 +02:00
Mojca Lorber cb554e815a Add new task layout details section 2020-04-01 13:05:35 +02:00
Oleksii Kriuchykhin 3c8a149cf4 Fix task start date placement on report element [SCI-4504] 2020-04-01 11:06:27 +02:00
aignatov-bio 5705bd8497 Fix caching issue for sidebar 2020-03-31 22:12:38 +02:00
Oleksii Kriuchykhin 15a793a343 Fix start date interpolation in reports [SCI-4504] 2020-03-31 18:44:43 +02:00
Oleksii Kriuchykhin 3c53be1f9a Add start date to the task [SCI-4504] 2020-03-31 14:17:14 +02:00
Mojca Lorber bd177f4f2f Renaming fixes 2020-03-31 11:22:53 +02:00
aignatov-bio 5eebf3b46b Fix notification when search field active 2020-03-30 15:46:35 +02:00
aignatov-bio 230099ac82 Change i18n for due date on current task widget 2020-03-30 15:30:52 +02:00
aignatov-bio 4c33abff05 Assign user after task created 2020-03-30 15:16:14 +02:00
mlorb ea6eb0cace
Merge branch 'features/new-task-layout' into ml-sci-4483-sci-4486 2020-03-30 14:27:35 +02:00
aignatov-bio 10bd1d425d Fix placeholder for tinymce description fields 2020-03-30 13:22:34 +02:00
Mojca Lorber 7006036626 Add new task general layout and add notes section 2020-03-30 12:51:35 +02:00
aignatov-bio d48e8dfeac Fix markup 2020-03-30 12:05:30 +02:00
Alex Kriuchykhin 92279d07ad
Merge pull request #2437 from aignatov-bio/ai-sci-4380-saving-navigation-state 
Refactor sidebar [SCI-4380]
 2020-03-30 09:56:51 +02:00
Alex Kriuchykhin 4fe3d9f3a7
Merge pull request #2414 from aignatov-bio/ai-sci-4134-auto-open-tiny-mce-if-unsaved-data 
Open unsaved TinyMce editor [SCI-4134]
 2020-03-30 09:50:32 +02:00
aignatov-bio 1551197c06 Move constants to separate file 2020-03-27 11:12:38 +01:00
aignatov-bio b9e81f208d Fix i18n 2020-03-27 10:34:06 +01:00
aignatov-bio 8ff4b540e2 Update css for login screen 2020-03-27 09:43:49 +01:00
aignatov-bio ab6001c068 Fix scroll 2020-03-25 12:56:01 +01:00
aignatov-bio a7e4083ef1 Fix team dropdown 2020-03-25 12:31:47 +01:00
aignatov-bio 948034e3d4
Merge pull request #2488 from aignatov-bio/ai-sci-4494-fix-calendar-safari-issue 
Calendar CSS safari fix [SCI-4494]
 2020-03-24 21:55:40 +01:00
Miha Mencin be8e18110d
Merge pull request #2481 from mlorb/ml-sci-4344 
Fix tooltips appear wrongly [SCI-4344]
 2020-03-24 19:43:34 +01:00
Miha Mencin 89e4a73fbb
Merge pull request #2487 from aignatov-bio/ai-sci-4464-fix-timezone-when-import-datetime 
Fix timezone when import datetime [SCI-4464]
 2020-03-24 19:42:48 +01:00
Alex Kriuchykhin 08b53e7735
Merge pull request #2484 from biosistemika/ai-sci-4424-teams-dropdown-appears-everytime 
Teams dropdown appears every time [SCI-4424]
 2020-03-24 19:19:15 +01:00
aignatov-bio 4052ec1c67 Calendar CSS safari fix 2020-03-24 18:44:09 +01:00
aignatov-bio 6bdd45e7b7 Fix timezone when import datetime 2020-03-24 17:45:09 +01:00
aignatov-bio d62ec81472
Merge pull request #2478 from aignatov-bio/ai-sci-4449-fix-new-protocol-report-dashboard 
Fix protocol and report create modals after dashboard redirect [SCI-4449]
 2020-03-24 16:38:08 +01:00
Alex Kriuchykhin bdb57fd803
Merge pull request #2486 from okriuchykhin/ok_SCI_4487 
Fix due dates on task cards in the canvas [SCI-4487]
 2020-03-24 11:39:29 +01:00
Alex Kriuchykhin 54097a26ae
Merge pull request #2479 from mlorb/ml-sci-4473 
Fix new task modal css error [SCI-4473]
 2020-03-24 10:40:36 +01:00
Oleksii Kriuchykhin f9a7d58157 Fix due dates on task cards in the canvas [SCI-4487] 2020-03-24 10:30:29 +01:00
aignatov-bio 39be0d5109
Merge pull request #2480 from aignatov-bio/ai-sci-4457-fix-padding-dashboard-current-list 
Fix padding for current tasks widget [SCI-4457]
 2020-03-24 09:52:58 +01:00
Alex Kriuchykhin 1ae2e93a85
Merge pull request #2485 from mlorb/ml-sci-4478 
Disable selecting range at update column [SCI-4478]
 2020-03-24 09:28:45 +01:00
Mojca Lorber 3a58bd3cd6 Disable selecting range at update column 2020-03-23 20:02:57 +01:00
aignatov-bio 5004270c22 Teams dropdown apears everytime 2020-03-23 19:42:36 +01:00
Oleksii Kriuchykhin c5dd572e8e Fix annotation notifications for inventory rows [SCI-4469] 2020-03-23 18:45:36 +01:00
Oleksii Kriuchykhin 4db810c18f Fix taken space display for teams [SCI-4479] 2020-03-23 16:32:05 +01:00
Mojca Lorber 9045d1a8de Fix tooltips appear wrongly 2020-03-22 17:47:13 +01:00
aignatov-bio a5bdef07a2 Fix padding for current tasks widget 2020-03-20 17:01:54 +01:00
Mojca Lorber b4d5fb524b Fix new task modal css error 2020-03-20 10:21:56 +01:00
aignatov-bio da4b55ceea Fix protocol and report create modals after dashboard redirect 2020-03-19 19:43:20 +01:00
aignatov-bio 37304df878 Fix markup 2020-03-19 15:48:45 +01:00
aignatov-bio b188b0511b Refactor TinyMCE autosave check 2020-03-19 15:45:14 +01:00
aignatov-bio 1d02ba5ebf Open unsaved TinyMce editor 2020-03-18 16:03:36 +01:00
Alex Kriuchykhin 1c8750cae1
Merge pull request #2477 from mlorb/ml-sci-4462 
Add data hook [SCI-4462]
 2020-03-18 11:27:37 +01:00
Mojca Lorber 94d5dcf4a9 Add data hook 2020-03-18 10:50:09 +01:00
Miha Mencin fd8462b008 codstyle 2020-03-18 10:35:31 +01:00
Miha Mencin ecd49cb1e7 fix format and export_format mess 2020-03-18 09:57:57 +01:00
Miha Mencin 24b979aa6f fix CR comments 2020-03-18 09:53:47 +01:00
Miha Mencin c89503f691 SCI-4464 fix the import of the dates, some tests 2020-03-17 21:20:50 +01:00
Alex Kriuchykhin 749c1dda69
Merge pull request #2475 from okriuchykhin/ok_SCI_4459 
Add used space calculation method to the team model [SCI-4459]
 2020-03-17 16:58:37 +01:00
Oleksii Kriuchykhin 675b578272 Add used space calculation method to the team model [SCI-4459] 2020-03-17 16:56:55 +01:00
mlorb 6f0e2fc541
Merge pull request #2474 from mlorb/ml-sci-4450-v2 
Change default date in preferences [SCI-4450]
 2020-03-17 16:17:21 +01:00
mlorb 54f7499988
Merge pull request #2473 from mlorb/ml-sci-4452 
Small support dropdown fixes [SCI-4452]
 2020-03-17 16:17:06 +01:00
aignatov-bio e550d49012
Merge pull request #2472 from biosistemika/ai-sci-add-class-to-no-inventories-placeholder 
Add class to no-inventories placeholder
 2020-03-17 16:12:55 +01:00
Mojca Lorber ea755eaea7 Change default date in preferences 2020-03-17 15:52:57 +01:00
Mojca Lorber 7e36a4e357 Small support dropdown fixes 2020-03-17 15:44:57 +01:00
aignatov-bio c39c3e852c Add class to no-inventories placeholder 2020-03-17 14:38:11 +01:00
Alex Kriuchykhin 2a2e479cd3
Merge pull request #2470 from okriuchykhin/ok_SCI_4408 
Enable time fraction for task due date [SCI-4408]
 2020-03-16 18:55:10 +01:00
Oleksii Kriuchykhin a518bfe023 Enable time fraction for task due date [SCI-4408] 2020-03-16 17:55:35 +01:00
Alex Kriuchykhin 35755ab152
Merge pull request #2467 from aignatov-bio/ai-sci-4436-change-placeholders-for-dashboards 
Change placeholders for dashboard [SCI-4436]
 2020-03-16 15:22:54 +01:00
Alex Kriuchykhin c17d3f472e
Merge pull request #2468 from mlorb/ml-sci-4422 
Add hook [4422]
 2020-03-13 15:20:50 +01:00
mlorb 41ef35d378
Merge pull request #2466 from mlorb/ml-sci-4450 
Fix bug with date format when importing to inventory [SCI-4450]
 2020-03-13 15:18:11 +01:00
Mojca Lorber 24c345721c Add hook 2020-03-13 15:04:56 +01:00
Mojca Lorber 8dac5effbe Another fix 2020-03-13 14:57:26 +01:00
aignatov-bio 87a097b0e1 Fix markup 2020-03-12 15:08:29 +01:00
aignatov-bio 8164b0d0c6 Change placeholders for dashboards 2020-03-12 15:00:14 +01:00
aignatov-bio a1ea71e512
Merge pull request #2463 from aignatov-bio/ai-sci-4345-fix-add-button-status-in-file-results 
Add total size validation check to result files [SCI-4345]
 2020-03-12 13:31:21 +01:00
Mojca Lorber c716a52aae Fix bug with date format when importing to inventory 2020-03-12 12:19:25 +01:00
Oleksii Kriuchykhin 2e2e6be31c Fix file view permission check in inventories [SCI-4440] 2020-03-12 11:52:46 +01:00
aignatov-bio b9a0fb47de Add total size validation check to result files 2020-03-12 11:50:31 +01:00
aignatov-bio d924faaafd
Merge pull request #2455 from aignatov-bio/ai-sci-4403-recent-work-layout 
Add recent work widget [SCI-4400][SCI-4401][SCI-4402][SCI-4403]
 2020-03-12 11:26:23 +01:00
aignatov-bio b898f03767 Add user check to project filter in quick start widget 2020-03-11 14:51:21 +01:00
aignatov-bio a32a3db8e5 Split joins scope 2020-03-11 14:30:41 +01:00
aignatov-bio bfaf5a1786 Fix markup 2020-03-11 11:39:17 +01:00
aignatov-bio c13721f842 Fix recent work service and move templates to html 2020-03-11 11:34:59 +01:00
Miha Mencin 26b687f2e6
Merge pull request #2460 from biosistemika/features/dashboard 
Features/dashboard
 2020-03-10 18:06:23 +01:00
Miha Mencin aeeb0b79a4
Merge pull request #2459 from aignatov-bio/ai-sci-4445-add-error-handling-new-task-modal 
Add error handling to create task modal [SCI-4445]
 2020-03-10 17:39:56 +01:00
mlorb bea7a6172b
Merge pull request #2456 from mlorb/ml-sci-4412 
Remove academy link from navigation and move about modal to support menu [SCI-4412]
 2020-03-10 17:08:22 +01:00
aignatov-bio 63a5459d21 Add error handling to create task modal 2020-03-10 13:16:56 +01:00
Miha Mencin 25211dd70b
Merge pull request #2458 from aignatov-bio/ai-sci-4441-remove-uneditable-projects-in-create-task-widget 
Remove uneditable projects from create task widget [SCI-4441]
 2020-03-10 12:35:32 +01:00
Miha Mencin 9836a8b5a2
Merge pull request #2434 from aignatov-bio/ai-sci-4352-inventory-item-is-not-saved-in-case-of-empty-dropdown 
Prevent create empty dropdown in inventories [SCI-4352]
 2020-03-10 12:35:00 +01:00
Alex Kriuchykhin 769ba76afa
Merge pull request #2445 from okriuchykhin/ok_SCI_4379 
Improve file upload checks [SCI-4382]
 2020-03-10 09:47:23 +01:00
aignatov-bio 180b736769 Refactor recent work service 2020-03-09 15:10:51 +01:00
aignatov-bio 4328634e78 Remove uneditable projects from create task widget 2020-03-09 13:38:38 +01:00
Alex Kriuchykhin 4bea0781da
Merge pull request #2418 from okriuchykhin/ok_SCI_4276 
Add API endpoints for new column types [SCI-4276]
 2020-03-09 12:58:54 +01:00
aignatov-bio 49afb5631d
Merge pull request #2457 from aignatov-bio/ai-sci-4442-fix-missing-progress-bar 
Fix progress bar [SCI-4442]
 2020-03-09 10:43:15 +01:00
Miha Mencin 62b934f012 Merge branch 'develop' into features/dashboard 2020-03-09 09:56:32 +01:00
aignatov-bio 77a399e457 Fix progress bar 2020-03-09 09:54:02 +01:00
aignatov-bio 5ee406606a Add checks for archived projects and experiments 2020-03-06 15:48:54 +01:00
Alex Kriuchykhin de0d389b96
Merge pull request #2454 from okriuchykhin/ok_SCI_4434 
Refactor inventory limit checks [SCI-4434]
 2020-03-06 15:33:01 +01:00
aignatov-bio 193c4974d2 Add user time zone 2020-03-06 15:24:57 +01:00
aignatov-bio b89cc1745a Add users scope 2020-03-06 15:12:40 +01:00
aignatov-bio bbda7b23bb
Merge pull request #2453 from aignatov-bio/ai-sci-4415-fix-team-description-white-space 
Fix team description white space [SCI-4415]
 2020-03-06 14:55:18 +01:00
Mojca Lorber 6bf191d124 Remove academy link from navigation and move about modal to support menu 2020-03-06 14:36:22 +01:00
aignatov-bio e729aa043e Add recent work widget 2020-03-06 13:51:18 +01:00
Oleksii Kriuchykhin 02817a5a1e Refactor inventory limit checks [SCI-4434] 2020-03-05 15:26:25 +01:00
aignatov-bio d940c0a122
Merge pull request #2451 from aignatov-bio/ai-sci-4427-not-rounded-progress-bar 
Add rounded corners to porgress bar [SCI-4427]
 2020-03-05 14:53:12 +01:00
aignatov-bio 6f395b8e36
Merge pull request #2450 from aignatov-bio/ai-sci-4421-sorting-task-without-due-date 
Add alphabetical order for tasks without due date [SCI-4421]
 2020-03-05 14:52:58 +01:00
aignatov-bio d886a42c8e Fix team description white space 2020-03-05 14:47:48 +01:00
aignatov-bio 3494d1071e
Merge pull request #2448 from aignatov-bio/ai-sci-4416-add-yellow-due-dates 
Refactor current task widget [SCI-4416]
 2020-03-05 14:46:16 +01:00
aignatov-bio 79560e517d Fix markup 2020-03-05 14:40:46 +01:00
aignatov-bio 4af992ef35 Fix date import for repository 2020-03-05 14:34:31 +01:00
aignatov-bio 024fc5b421 Add rounded corners to porgress bar 2020-03-05 13:13:54 +01:00
aignatov-bio f9be7a2cb8 Add alphabetical order for tasks without due date 2020-03-05 12:58:25 +01:00
Alex Kriuchykhin f201826eb8
Merge pull request #2426 from okriuchykhin/ok_SCI_4383 
Add global repositories limit [SCI-4383]
 2020-03-05 12:45:02 +01:00
Mojca Lorber 8325ed80f0 Add endpoints for lists of projects and experiments with filtering and finish the frontend for quick start create new task on dashboard 2020-03-04 23:26:01 +01:00
aignatov-bio d830fcec4a Remove locked task css and i18n 2020-03-04 14:56:06 +01:00
aignatov-bio 77d66b65b1 Refactor current task for addons integration 2020-03-04 13:21:52 +01:00
aignatov-bio 30545f5cf4
Merge pull request #2443 from aignatov-bio/ai-sci-4409-fix-visibilty-of-tasks 
Fix task visibility for current task widget [SCI-4409]
 2020-03-03 16:35:22 +01:00
mlorb ba438e7728
Merge branch 'features/dashboard' into ml-sci-4354 2020-03-03 16:29:47 +01:00
Mojca Lorber 4f37260571 Fix controller 2020-03-03 16:17:29 +01:00
aignatov-bio 9fa8818a5d Fix markup 2020-03-03 16:10:52 +01:00
aignatov-bio da4967b3d0 Fix markup 2020-03-03 16:09:19 +01:00
aignatov-bio 7d7cdce91a Add file size limitation to tinyMCE 2020-03-03 15:55:17 +01:00
Oleksii Kriuchykhin 11a5536af5 Improve file upload checks [SCI-4382] 2020-03-03 15:26:40 +01:00
aignatov-bio 3dc94a225d Small visual improvments for current tasks widget 2020-03-03 14:21:16 +01:00
Mojca Lorber 7dfd1d5ba6 Small fixes 2020-03-03 13:52:36 +01:00
aignatov-bio eb4a783337 Fix task visibility for current task widget 2020-03-03 13:13:46 +01:00
mlorb 4d52fc9b45
Merge branch 'features/dashboard' into ml-sci-4354 2020-03-03 13:00:05 +01:00
Mojca Lorber 52493fd834 Add pagination for current tasks on dashboard 2020-03-03 12:07:21 +01:00
aignatov-bio e46e496702 Add user check to invite user modal 2020-03-03 10:30:04 +01:00
aignatov-bio 51c7aa2c7a Remove keydown event 2020-03-03 09:58:53 +01:00
aignatov-bio 50810dc55e Fix markup 2020-03-03 09:53:44 +01:00
aignatov-bio d9bfd8c28e Add search to current task widget 2020-03-03 09:50:44 +01:00
aignatov-bio 1eed4c500d Remove validation for items list 2020-03-02 14:35:47 +01:00
Oleksii Kriuchykhin a819e1b8f4 Merge branch 'hotfix/1.17.11' into develop 2020-03-02 11:58:25 +01:00
Oleksii Kriuchykhin 03f08c4c06 Merge branch 'hotfix/1.18.4' into develop 2020-03-02 11:56:45 +01:00
Oleksii Kriuchykhin 73623da02c Merge branch 'develop' into features/dashboard 2020-02-28 16:46:56 +01:00
Alex Kriuchykhin f9ad438fb5
Merge pull request #2431 from okriuchykhin/ok_SCI_4381 
Add invite users to the team permission check [SCI-4381]
 2020-02-28 16:40:57 +01:00
Alex Kriuchykhin b83cbf33a7
Merge pull request #2408 from aignatov-bio/ai-sci-4345-file-results-bug 
Fix files handling in results [SCI-4345]
 2020-02-28 16:40:05 +01:00
Alex Kriuchykhin 409c4b7f65
Merge pull request #2438 from okriuchykhin/ok_SCI_4356 
Improve loading of tasks statistics for dashboard [SCI-4356]
 2020-02-28 16:38:39 +01:00
Oleksii Kriuchykhin 78ceb41a9e Improve loading of tasks statistics for dashboard [SCI-4356] 2020-02-28 16:17:32 +01:00
aignatov-bio c4be9bca2f Fix files handling in results 2020-02-28 14:55:13 +01:00
aignatov-bio 6900d8384b
Merge pull request #2428 from aignatov-bio/ai-sci-4375-end-point-to-task-create 
Service for task creating and quick start end point [SCI-4375]
 2020-02-28 14:38:07 +01:00
aignatov-bio 0ae5e51cb3 Merge branch 'features/dashboard' into ai-sci-4375-end-point-to-task-create 2020-02-28 14:37:27 +01:00
aignatov-bio 95fca105eb Add quickstart layout and create task modal 2020-02-28 14:34:34 +01:00
aignatov-bio 6dcb8be849 Merge branch 'develop' into ai-sci-4380-saving-navigation-state 2020-02-28 14:14:08 +01:00
aignatov-bio 8b273acaca Update all sidebars 2020-02-28 14:03:08 +01:00
aignatov-bio a0015fe184
Merge pull request #2432 from aignatov-bio/ai-sci-4304-fix-assigned-task-position 
Fix assigned tasks position [SCI-4304]
 2020-02-28 13:54:19 +01:00
aignatov-bio 4aaeb2043f
Merge pull request #2433 from aignatov-bio/ai-sci-4390-change-new-inventory-button-design 
Change button style for new inventory [SCI-4390]
 2020-02-28 13:54:07 +01:00
Miha Mencin 1fd876bb40
Merge pull request #2425 from mlorb/ml-sci-4348 
Dashboard current tasks visual layout and backend [SCI-4348] [SCI-4355]
 2020-02-28 12:11:31 +01:00
Mojca Lorber 3c09923d96 Refactoring current tasks backend 2020-02-28 11:51:08 +01:00
Mojca Lorber 415721112a Optimize completed_steps_percentage 2020-02-27 17:12:31 +01:00
Oleksii Kriuchykhin b4a8a7ba72 Switch to serial multiple file uploads for better compatibility [SCI-4404] 2020-02-27 16:58:00 +01:00
aignatov-bio 9e15d1ea42 Refactor experiment sidebar 2020-02-27 16:04:44 +01:00
aignatov-bio ace8613457 Fix z-index for dropdown 2020-02-27 13:16:11 +01:00
aignatov-bio b2580c1704 Prevent create empty dropdown in inventories 2020-02-27 13:10:00 +01:00
aignatov-bio 630412c18a Change button style for new inventory 2020-02-27 12:11:38 +01:00
aignatov-bio d31fc33873 Fic assigned tasks position 2020-02-27 11:47:47 +01:00
Alex Kriuchykhin bf1fac0b10
Merge pull request #2421 from aignatov-bio/ai-sci-4256-transparent-image-for-image-preview 
Add checkboard background for transparent images [SCI-4256]
 2020-02-26 17:46:48 +01:00
Alex Kriuchykhin a41c1c606b
Merge pull request #2419 from aignatov-bio/ai-sci-4328-hide-tooltip-if-object-hide 
Hide tooltip if parent object disabled or hidden [SCI-4328]
 2020-02-26 17:35:34 +01:00
Alex Kriuchykhin 6841cdd6a6
Merge pull request #2415 from aignatov-bio/ai-sci-4365-new-description-to-import-items 
New description to import items modal window [SCI-4365]
 2020-02-26 17:34:57 +01:00
Alex Kriuchykhin 9917a547ce
Merge pull request #2417 from aignatov-bio/ai-sci-4364-add-border-to-add-column-button 
Add border to add column button [SCI-4363]
 2020-02-26 17:33:47 +01:00
Oleksii Kriuchykhin 62c19f7c02 Add invite users to the team permission check [SCI-4381] 2020-02-26 17:25:38 +01:00
Mojca Lorber f29ce66bea Refactor backend, add empty state and fix some small scc changes 2020-02-26 11:07:17 +01:00
aignatov-bio 8e05908753 Small fixes 2020-02-25 17:19:11 +01:00
aignatov-bio 294328887a Fix typo 2020-02-25 13:51:54 +01:00
aignatov-bio 3588fb3445 Fix markup 2020-02-25 13:49:35 +01:00
aignatov-bio 32d6f9a43a Split my_module create service to seperate services 2020-02-25 13:46:44 +01:00
aignatov-bio a28d729aeb Add end point 2020-02-24 17:09:10 +01:00
Oleksii Kriuchykhin 0cb9584a2b Fix empty mime type for ActiveStorage local file service [SCI-4360] 2020-02-24 16:04:35 +01:00
aignatov-bio a92bac19e1 Add service for task creating 2020-02-24 15:57:22 +01:00
aignatov-bio 5385a25665 Merge branch 'features/dashboard' into ai-sci-add-calendar-widget 2020-02-24 13:04:49 +01:00
aignatov-bio 0675b137ad Add team and task status for calendars scope 2020-02-22 18:15:18 +01:00
aignatov-bio b664c88819 Remove clndr from package.json 2020-02-22 13:03:51 +01:00
Oleksii Kriuchykhin 63e557ea9e Add global repositories limit [SCI-4383] 2020-02-21 14:40:17 +01:00
Mojca Lorber 9bd2e8bec4 Dashboard current tasks visual layout and backend 2020-02-21 10:41:42 +01:00
aignatov-bio 3b679bc53d
Merge pull request #2416 from aignatov-bio/ai-sci-4349-progress-bar-research 
Add progress bar for current tasks [SCI-4349]
 2020-02-21 10:01:57 +01:00
aignatov-bio 2cbac634bf Add localization 2020-02-21 10:00:32 +01:00