scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-27 10:26:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
8853 commits 69 branches 179 tags 166 MiB
Commit graph

6886 commits

Author SHA1 Message Date
Oleksii Kriuchykhin 8eec4e4b59 Add browser notification for unsaved data when navigating away for tables on Task [SCI-5047] 2020-11-02 22:19:33 +01:00
aignatov-bio 0f80786433 Merge branch 'features/office-file-previews' of https://github.com/biosistemika/scinote-web into ai-sci-5101-add-attachments-dropdown-to-step 2020-11-02 18:52:46 +01:00
aignatov-bio 84a7d49023 Fix markup 2020-11-02 18:51:21 +01:00
aignatov-bio f85a3493cd
Merge pull request #2925 from aignatov-bio/ai-sci-5110-add-file-previews-to-reports 
Add filer previews to reports [SCI-5110]
 2020-11-02 18:48:45 +01:00
aignatov-bio eca39a00b5 Add attachments dropdown to step 2020-11-02 18:47:08 +01:00
Mojca Lorber 8aed48d1ae Merge branch 'develop' into features/office-file-previews 2020-11-02 13:45:06 +01:00
Oleksii Kriuchykhin 258c57870f Implement the toolbar on the Team Projects page [SCI-5129] 2020-11-02 13:28:37 +01:00
Alex Kriuchykhin 8566d56b68
Merge pull request #2928 from okriuchykhin/ok_SCI_5126 
Create database structure for project folders [SCI-5126]
 2020-11-02 11:46:15 +01:00
Urban Rotnik 2549d9deeb
Merge pull request #2929 from urbanrotnik/ur-sci-5147-generate-word-with-included-smart 
Fix SA in protocol description [SCI-5147]
 2020-11-02 09:55:40 +01:00
Mojca Lorber 04e3b67968 Change the way buttons are toggled 2020-10-30 18:47:01 +01:00
Urban Rotnik 042231469c Fix syntax 2020-10-30 13:37:59 +01:00
Urban Rotnik 1295299370 Fix SA in protocol description 2020-10-30 12:55:30 +01:00
Mojca Lorber a52315fc79 Merge branch 'develop' into ml-sci-5033 2020-10-29 18:28:25 +01:00
aignatov-bio 6193f91192 Update view mode switcher logic 2020-10-29 16:42:05 +01:00
aignatov-bio 12991e8fd3 Commit add asset preview mode switcher to step 2020-10-29 16:42:05 +01:00
Oleksii Kriuchykhin e87407bbd3 Create database structure for project folders [SCI-5126] 2020-10-29 15:44:21 +01:00
aignatov-bio f51416d83a Update permission markup 2020-10-29 14:59:14 +01:00
Urban Rotnik e923128c0e
Merge pull request #2927 from biosistemika/features/signature-requests 
Features/signature requests into develop
 2020-10-29 14:48:25 +01:00
aignatov-bio b0fe68553a Fix tests 2020-10-29 14:30:26 +01:00
aignatov-bio 21f584a2c4 Fix markup 2020-10-29 14:30:26 +01:00
aignatov-bio 131d487e69 Add file preview to list view 2020-10-29 14:30:26 +01:00
aignatov-bio d99e279ecc Add gallery to file preview 2020-10-29 14:30:26 +01:00
aignatov-bio c56f7912ef Update file preview 2020-10-29 14:23:32 +01:00
Urban Rotnik bb5c703696
Merge pull request #2878 from urbanrotnik/ur-sci-5040 
Support multiple file upload in TinyMCE fields [SCI-5040]
 2020-10-29 14:14:38 +01:00
Urban Rotnik f5118e5461
Merge pull request #2901 from okriuchykhin/ok_SCI_5063 
Refactor experiment workflow image generation [SCI-5063]
 2020-10-29 13:55:23 +01:00
Urban Rotnik c6a891bcea
Merge pull request #2912 from urbanrotnik/ur-sci-5091 
Add current team to smart annotations permission check [SCI-5091]
 2020-10-29 13:32:29 +01:00
Oleksii Kriuchykhin 13fcfedf41 Refactor experiment workflow image generation [SCI-5063] 2020-10-29 13:16:09 +01:00
Urban Rotnik 25d050cec4 Add current team to smar annotations permission check 2020-10-29 12:17:40 +01:00
aignatov-bio 23f9fb212d
Merge pull request #2915 from aignatov-bio/ai-sci-5105-update-image-edit-modal 
Update image edit modal [SCI-5105]
 2020-10-29 09:15:32 +01:00
Urban Rotnik bf4062b7cb Refactor rescue block 2020-10-29 09:12:12 +01:00
Urban Rotnik 54f38c8ded Move validation before request 2020-10-29 08:45:55 +01:00
aignatov-bio 16249201f3 Fix markup 2020-10-28 16:44:28 +01:00
aignatov-bio 2f1217688c Add filer previews to reports 2020-10-28 16:32:22 +01:00
Miha Mencin 235f87e0d9
Merge pull request #2924 from biosistemika/release/1.20.2 
Release/1.20.2
 2020-10-28 13:58:25 +01:00
Alex Kriuchykhin 8ef5bafc1a
Revert "Init user session for devise controllers after token auth [SCI-5123]" 2020-10-27 13:20:14 +01:00
aignatov-bio bb983af42f
Merge pull request #2911 from aignatov-bio/ai-sci-4579-update-checkbox-style 
Update checkbox style at repository and protocol datatable [SCI-4579]
 2020-10-27 10:22:56 +01:00
Urban Rotnik cb9db57645
Merge pull request #2909 from urbanrotnik/ur-sci-5006 
Add lock icon to current task section on dashboard [SCI-5006]
 2020-10-27 08:20:55 +01:00
Alex Kriuchykhin 792edb62d6
Merge pull request #2919 from okriuchykhin/ok_SCI_5123 
Init user session for devise controllers after token auth [SCI-5123]
 2020-10-26 17:21:56 +01:00
Oleksii Kriuchykhin 00a2f5f41b Init user session for devise controllers after token auth [SCI-5123] 2020-10-26 16:35:49 +01:00
Urban Rotnik b94a3a6cb8 Clean up controller 2020-10-26 16:17:39 +01:00
aignatov-bio 6edcf4b099 Add size label 2020-10-26 15:10:06 +01:00
Miha Mencin 840b84aa9a
Merge pull request #2916 from okriuchykhin/ok_SCI_5139 
Add activities for step completion and checklist toggling through API [SCI-5139]
 2020-10-26 14:19:31 +01:00
mlorb b941c8c9d4
Merge pull request #2917 from mlorb/ml-sci-5119 
Move open mobile app button to main navigation [SCI-5119]
 2020-10-26 14:02:57 +01:00
Alex Kriuchykhin 050e1e0973
Merge pull request #2913 from okriuchykhin/ok_SCI_5123 
Add token authentication to Active Storage controllers [SCI-5123]
 2020-10-26 13:46:03 +01:00
Urban Rotnik 1ffc3449bf Clean up index view 2020-10-26 13:42:32 +01:00
aignatov-bio bddd1956ab Fix font size and font weight for status label 2020-10-26 12:35:40 +01:00
Urban Rotnik 431b9161b6 Code cleanup 2020-10-26 11:03:43 +01:00
Mojca Lorber ec41bdd414 Move open mobile app button to main navigation 2020-10-26 09:28:44 +01:00
Oleksii Kriuchykhin 4d64883963 Add activities for step completion and checklist toggling through API [SCI-5139] 2020-10-25 22:33:50 +01:00
aignatov-bio aefaf4d0c1 Update image edit modal 2020-10-25 16:57:50 +01:00
Urban Rotnik b23f110184
Merge pull request #2905 from urbanrotnik/ur-sci-5085-active-filters 
Add mark for active filters [SCI-5085]
 2020-10-25 16:06:59 +01:00
Oleksii Kriuchykhin 5f70984919 Add token authentication to Active Storage controllers [SCI-5123] 2020-10-23 19:22:31 +02:00
Urban Rotnik c5a1d34c36
Merge pull request #1967 from jbargu/jg_sci_2228 
[SCI-2228] Remove samples, sample types, sample groups, custom sample columns from the codebase
 2020-10-23 15:33:22 +02:00
Urban Rotnik 75351a3aed px to em 2020-10-23 14:11:56 +02:00
Urban Rotnik 6ccd34291d
Merge pull request #2904 from urbanrotnik/ur-sci-5093 
Fix smart annotation in checklist title [SCI-5093]
 2020-10-23 13:36:22 +02:00
aignatov-bio d6f8e156c1 Update checkbox style at repository and protocol datatable 2020-10-22 16:42:12 +02:00
aignatov-bio f4bf2ab75f Remove empty children from extents 2020-10-22 14:29:35 +02:00
Urban Rotnik aa1520bfb8 Merge branch 'develop' into jg_sci_2228 2020-10-22 14:21:39 +02:00
Miha Mencin 9f2b7f962b
Merge pull request #2908 from mlorb/ml-sci-5120 
Fix pwa url and change when banner is displayed [SCI-5120]
 2020-10-22 13:41:12 +02:00
Mojca Lorber 2639810e1a Fix no step bug 2020-10-22 13:21:05 +02:00
Urban Rotnik 58013e215d Add lock icon to current task section on dashboard 2020-10-22 08:09:51 +02:00
Mojca Lorber 6d7b55301f Fix pwa url and change when banner is displayed 2020-10-21 14:56:20 +02:00
Urban Rotnik 2f99e3a464 Remove border, update copy 2020-10-21 09:58:35 +02:00
Urban Rotnik a87302a183 Include styled text in list items elements 2020-10-21 08:27:10 +02:00
Urban Rotnik e7d2d78935 Add mark for active filters 2020-10-20 16:45:54 +02:00
Urban Rotnik a728ba2f2d Fix smart annotation in checklist title 2020-10-20 13:02:49 +02:00
aignatov-bio 2968e677b8 Update image for doorkeeper auth 2020-10-19 16:23:20 +02:00
Miha Mencin c31a7373fb
Merge pull request #2902 from mlorb/ml-sci-5089 
Add 'Open in APP' button to the task
 2020-10-19 12:28:35 +02:00
Mojca Lorber 23f01ac6a9 Add 'Open in APP' button to the task 2020-10-19 12:17:03 +02:00
aignatov-bio bdcc7939ad Update export all generator 2020-10-16 18:25:01 +02:00
aignatov-bio 3fe3c2087f Fix hound issues 2020-10-16 11:27:23 +02:00
aignatov-bio 566ef7aef7 Add list view to atachments 2020-10-16 11:00:57 +02:00
aignatov-bio 016fc8a632 Merge branch 'features/office-file-previews' of https://github.com/biosistemika/scinote-web into features/office-file-previews 2020-10-15 15:25:54 +02:00
Urban Rotnik d88040fd1b Move snapshot default selection to core from addon 2020-10-15 15:21:44 +02:00
aignatov-bio 0a4b89cf39 Merge branch 'develop' into features/office-file-previews 2020-10-15 15:19:56 +02:00
aignatov-bio a2bfb1cfeb Merge branch 'develop' of https://github.com/biosistemika/scinote-web into develop 2020-10-15 15:09:05 +02:00
Urban Rotnik e1e7496307
Merge pull request #2884 from urbanrotnik/ur-sci-5043 
DOCX lists [SCI-5043]
 2020-10-15 11:53:58 +02:00
aignatov-bio cc70d42193 Merge branch 'ur-sci-5043' of https://github.com/urbanrotnik/scinote-web into develop 2020-10-15 11:21:03 +02:00
aignatov-bio f1a5811d5f
Merge pull request #2809 from biosistemika/ai-sci-4960-render-wopi-preview-only-in-view-port 
Render wopi preview only in view port
 2020-10-14 21:29:56 +02:00
Urban Rotnik e748e1eff3 Fix smart annotations and links styling 2020-10-14 17:58:07 +02:00
mlorb 83ba40d135
Merge pull request #2870 from mlorb/ml-sci-4841 
Fix at long inventory name snapshot in title is not visible [SCI-4841]
 2020-10-14 14:38:04 +02:00
Mojca Lorber 5013f224ee Fix ems 2020-10-14 13:16:38 +02:00
aignatov-bio e240b629c4 Fix rubocop issues 2020-10-14 12:12:32 +02:00
aignatov-bio 36bab10de7 Update export all to tree structure 2020-10-14 12:08:04 +02:00
Urban Rotnik a19e0ef846 Refactor 2020-10-13 14:23:39 +02:00
Urban Rotnik 1b860afe30 Move TinyMCE parser to separate class 2020-10-13 09:45:13 +02:00
Urban Rotnik ae8b2cbf8f Add text to I18n 2020-10-13 08:37:32 +02:00
Mojca Lorber a944525d25 Change px to em 2020-10-12 16:59:33 +02:00
aignatov-bio a7da7b0de3 Refactor export all my module generator 2020-10-12 15:55:06 +02:00
Mojca Lorber cf367baefa Merge branch 'develop' into ml-sci-4841 2020-10-12 14:43:03 +02:00
Oleksii Kriuchykhin caa2098550 Improve handling of empty cells in inventory imports [SCI-5094] 2020-10-12 14:42:47 +02:00
Urban Rotnik 274293348e Clean up 2020-10-09 09:53:27 +02:00
Urban Rotnik dfca798e2d Refactored tiny_mce_table parser and renderer 2020-10-09 09:43:36 +02:00
Urban Rotnik 92b4d95c72 Implement lists in DOCX 2020-10-09 09:43:00 +02:00
aignatov-bio 5d6c9e78fd Refactor dashboard layout 2020-10-06 16:09:26 +02:00
Oleksii Kriuchykhin 7cd12bfb07 Fix protocol repository save/load timestamps [SCI-5067] 2020-10-06 15:30:04 +02:00
Miha Mencin 3a4a166856
Merge pull request #2888 from okriuchykhin/ok_SCI_5082 
Fix index page for users without a team [SCI-5082]
 2020-10-05 10:16:04 +02:00
Oleksii Kriuchykhin dd64206b25 Fix index page for users without a team [SCI-5082] 2020-10-02 16:57:46 +02:00
Mojca Lorber 4e4a4a2c4e Change Complete step button on task step 2020-10-02 15:02:42 +02:00
Oleksii Kriuchykhin 6c367428a1 Fix team switcher [SCI-5080] 2020-10-02 14:25:44 +02:00
Oleksii Kriuchykhin aeba25cf09 Fix Hound warning 2020-10-01 11:56:33 +02:00
Oleksii Kriuchykhin 21fab4198c Merge branch 'develop' into features/local 2020-10-01 11:52:59 +02:00
Urban Rotnik fc8704b520 Add fileUtils for sizeCheck, add url to textarea data attribute 2020-09-30 13:20:11 +02:00
aignatov-bio 9010f9c1db
Merge pull request #2876 from aignatov-bio/ai-sci-5066-fix-switch-team 
Fix switch team on link for object from other team [SCI-5066]
 2020-09-30 10:09:19 +02:00
Urban Rotnik e9ac999645
Merge pull request #2880 from urbanrotnik/ur-sci-5067-protocols-sync 
Fix updating updated_at on protocol while load/sync with repository [SCI-5067]
 2020-09-29 16:54:42 +02:00
Urban Rotnik 7c312a844f Fix updating updated_at on protocol while load/sync with repository 2020-09-29 15:37:40 +02:00
aignatov-bio d21aee1843 Remove complete step button from protocol managment 2020-09-29 15:08:01 +02:00
Alex Kriuchykhin 939c0096de
Merge pull request #2881 from biosistemika/features/yomu 
Switch to a new version of Yomu gem
 2020-09-29 14:41:36 +02:00
Oleksii Kriuchykhin 1603ec6d1a Switch to a new version of Yomu gem 2020-09-29 13:11:50 +02:00
aignatov-bio 9d64121577 Refactor WOPI discovery 2020-09-29 12:58:05 +02:00
Urban Rotnik dc0072e707 Support multiple file upload in TinyMCE fields 2020-09-29 08:21:31 +02:00
Oleksii Kriuchykhin 25a9f5c685 Add typeface-lato for shipping Lato fonts 2020-09-28 18:02:47 +02:00
aignatov-bio 16fe11f0f7 Fix smitch team on link for object from other team 2020-09-28 17:16:18 +02:00
aignatov-bio 7c3a3e4490 Small smart annotation fixes 2020-09-28 12:03:01 +02:00
aignatov-bio cd9b143bc5 Fix markup 2020-09-25 15:08:20 +02:00
aignatov-bio 1ed65eddfa Move ordering to front-end 2020-09-25 15:06:09 +02:00
Alex Kriuchykhin fb28fa557b
Merge pull request #2872 from okriuchykhin/ok_SCI_5062 
Improve performance of fetching of statuses [SCI-5062]
 2020-09-25 15:00:30 +02:00
Alex Kriuchykhin 3eb448c39b
Merge pull request #2862 from okriuchykhin/ok_SCI_5001 
Add Endpoins for Project Membership manipulation [SCI-5001]
 2020-09-25 14:25:20 +02:00
Oleksii Kriuchykhin 134e549ed5 Improve performance of fetching of statuses [SCI-5062] 2020-09-25 10:14:57 +02:00
Urban Rotnik f4f0bc706a Fix step deletion 2020-09-25 08:43:03 +02:00
Mojca Lorber 94fea75fda Fix at long inventory name snapshot in title is not visible 2020-09-24 17:19:41 +02:00
aignatov-bio 70a0da17b2 Fix markup 2020-09-24 17:12:53 +02:00
aignatov-bio 780db9d134 Add assets view switcher 2020-09-24 17:10:36 +02:00
Alex Kriuchykhin d02d48f10f
Merge pull request #2869 from aignatov-bio/ai-sci-5038-fix-smart-annotaion-link-for-inventory-items 
Improve smart annotation in TinyMCE fields [SCI-5038]
 2020-09-24 14:11:59 +02:00
mlorb acda21f357
Merge pull request #2867 from mlorb/ml-sci-4578-v2 
Some protocol repository CSS corrections [SCI-4578]
 2020-09-24 13:44:06 +02:00
aignatov-bio 4f7814cff4 Fix markup 2020-09-24 13:32:43 +02:00
aignatov-bio 9da27956d3
Merge pull request #2857 from aignatov-bio/ai-sci-4987-fix-smart-annotation-for-archived-projects 
Show smart annotation for archived projects/experiments [SCI-4987]
 2020-09-24 13:29:49 +02:00
aignatov-bio ff33cb45e0 Improve smart annotation in TinyMCE fields 2020-09-24 13:29:20 +02:00
aignatov-bio 653fe6fb1d Fix markup 2020-09-24 11:56:17 +02:00
Urban Rotnik 3bda6a987d Fix smart annotation for RepositoryItem 2020-09-24 11:45:03 +02:00
Mojca Lorber f0a07acaf4 Some protocol repository CSS corrections 2020-09-23 20:54:49 +02:00
aignatov-bio b6f038ff09
Merge pull request #2863 from aignatov-bio/ai-sci-5037-update-regexp-for-smart-annotation 
Update regexp for smart annotation [SCI-5037]
 2020-09-23 16:39:24 +02:00
Urban Rotnik 3de2aee921
Merge pull request #2864 from urbanrotnik/ur-sci-4993 
Assign user to cloned experiment [SCI-4993]
 2020-09-23 13:37:07 +02:00
Urban Rotnik 33d53c958d
Merge pull request #2866 from urbanrotnik/ur-sci-5053 
Fix protocol import modal [SCI-5053]
 2020-09-23 13:19:23 +02:00
aignatov-bio 0865802255
Merge pull request #2853 from aignatov-bio/ai-sci-5024-disable-autostrip-on-status-change 
Disable autostrip attrbiutes on status change [SCI-5024]
 2020-09-23 13:18:07 +02:00
Urban Rotnik 7bc31905b5 Fix protocol import modal 2020-09-23 12:54:16 +02:00
aignatov-bio e4b94b582a Add dynamic render of wopi files in viewport 2020-09-23 12:32:46 +02:00
aignatov-bio d719c26b6c Add error handling for MarvinJS 2020-09-23 12:26:26 +02:00
Urban Rotnik 5be7a1b32d Assign user to cloned experiment 2020-09-23 11:31:18 +02:00
aignatov-bio 21dcf1157c Update regexp for smart annotation 2020-09-23 11:13:59 +02:00
Oleksii Kriuchykhin 2cda80dc5f Add Endpoins for Project Membership manipulation [SCI-5001] 2020-09-23 11:03:29 +02:00
mlorb feda5622d8
Merge pull request #2860 from mlorb/ml-sci-5007 
Add info of the locked task to the View status flow modal [SCI-5007]
 2020-09-23 10:19:48 +02:00
aignatov-bio 7fa98de1da
Merge pull request #2859 from aignatov-bio/ai-sci-5036-fix-smart-annotation-cursor-position 
Fix smart annotation cursor position [SCI-5036]
 2020-09-23 10:11:13 +02:00
Mojca Lorber affae15ccf Simplification 2020-09-22 17:19:15 +02:00
mlorb 547af538b3
Merge pull request #2856 from mlorb/ml-sci-5009 
Update empty states for smart annotation results and dismiss button [SCI-5009]
 2020-09-22 15:31:22 +02:00
aignatov-bio bbfd4b1c02 Run autostrip when related field changed 2020-09-22 12:48:52 +02:00
aignatov-bio e288a1f911
Merge pull request #2861 from aignatov-bio/ai-sci-5038-prevent-tinymce-edit-mode-when-link-click 
Prevent tinymce edit mode when link click [SCI-5038]
 2020-09-22 11:41:50 +02:00
Mojca Lorber 8b3fce9656 Move it again 2020-09-22 11:38:32 +02:00
Mojca Lorber 0ad93d1288 Move close modal function to global event 2020-09-22 11:30:05 +02:00
aignatov-bio 2d667acdd1 Prevent tinymce edit mode when link click 2020-09-22 10:56:40 +02:00
Mojca Lorber fe779f9146 Add info of the locked task to the View status flow modal 2020-09-22 10:21:55 +02:00
aignatov-bio b540f90514
Merge pull request #2858 from aignatov-bio/ai-sci-5035-fix-smart-annotation-for-shared-inventories 
Add shared inventories to smart annotation [SCI-5035]
 2020-09-22 10:20:20 +02:00
Alex Kriuchykhin 136ce06022
Merge pull request #2851 from okriuchykhin/ok_SCI_4999 
Add Create and Update endpoints for experiments [SCI-4999]
 2020-09-22 10:20:00 +02:00
aignatov-bio fd7773a3dc Fix smart annotation cursor position 2020-09-22 10:15:01 +02:00
Mojca Lorber 23d6d93074 Fix css 2020-09-21 17:13:42 +02:00
aignatov-bio fde33e6e63 Fix tests 2020-09-21 14:41:51 +02:00
aignatov-bio f8a28f378e Add shared inventories to smart annotation 2020-09-21 14:36:34 +02:00
aignatov-bio 545e13304a Show smart annotation for archived projects/experiments 2020-09-21 14:09:11 +02:00
Alex Kriuchykhin e19efe3975
Merge pull request #2850 from okriuchykhin/ok_SCI_4997 
Add Create and Update endpoints for projects [SCI-4997]
 2020-09-21 13:22:12 +02:00
Alex Kriuchykhin 9fda2dd97e
Merge pull request #2855 from okriuchykhin/ok_SCI_5030 
Fix task archiving and moving [SCI-5030]
 2020-09-21 10:49:37 +02:00
Mojca Lorber d9a78d20d7 Update empty states for smart annotation results and dismiss button 2020-09-18 08:50:01 +02:00
Oleksii Kriuchykhin e456661a98 Fix task archiving and moving [SCI-5030] 2020-09-17 17:15:41 +02:00
aignatov-bio 644f30fb10 Fix syntax for uglifier 2020-09-17 15:35:12 +02:00
aignatov-bio ec9446d0cb Disable autostrip attrbiutes on status change 2020-09-17 15:26:48 +02:00
aignatov-bio e5d3fac112 Merge branch 'features/smart-annotation-improvements' into develop 2020-09-17 14:52:51 +02:00
aignatov-bio 6ed8757eb1 Merge branch 'features/task-flows' into develop 2020-09-17 14:52:05 +02:00
aignatov-bio d560470df2
Merge pull request #2844 from aignatov-bio/ai-sci-4950-implement-remember-selection-of-smart-annotation 
Add remembered state for smart annotation [SCI-4950]
 2020-09-17 14:49:35 +02:00
aignatov-bio 8dbc69aa31 Remove console.log 2020-09-17 14:48:26 +02:00
Urban Rotnik 462fb12a41 Update SQL query 2020-09-17 13:30:27 +02:00
Urban Rotnik 777afd0e9b Add improved search for smart annotations 2020-09-17 13:19:52 +02:00
aignatov-bio f11f54db33 Small fixes 2020-09-17 13:11:54 +02:00
aignatov-bio b4102f3cfd Add try/cath for JSON.parse 2020-09-17 11:43:08 +02:00
aignatov-bio 9cb26a1cb9 Fix markup 2020-09-17 11:43:08 +02:00
aignatov-bio 3691d21215 Fix multiple smart annotation selected 2020-09-17 11:43:08 +02:00
aignatov-bio 86667feb6b Add remembered state for smart annotation 2020-09-17 11:43:07 +02:00
mlorb 4acd0c4cb9
Merge pull request #2841 from mlorb/ml-sci-4984 
Add saving state for filters on dashboard [SCI-4984]
 2020-09-17 09:53:16 +02:00
Oleksii Kriuchykhin 0147e1aee1 Add Create and Update endpoints for experiments [SCI-4999] 2020-09-16 23:15:36 +02:00
Oleksii Kriuchykhin dd4a62bb45 Add Create and Update endpoints for projects [SCI-4997] 2020-09-16 17:03:39 +02:00
aignatov-bio c26f8e7193 Add before send condition for status change 2020-09-16 15:23:53 +02:00
Alex Kriuchykhin aadc0bebff
Merge pull request #2847 from okriuchykhin/ok_SCI_5004_v2 
Fix status consequences execution order [SCI-5004]
 2020-09-16 15:21:47 +02:00
Oleksii Kriuchykhin ff1476d46a Fix status consequences execution order [SCI-5004] 2020-09-16 13:45:58 +02:00
Urban Rotnik c9de9e857f Fix constant initialization 2020-09-16 12:15:23 +02:00
Mojca Lorber 9cd8e3b7ac Change default status values, add project and experiment to saved state and fix parsing error handeling 2020-09-16 09:48:06 +02:00
aignatov-bio 14acf2b624 Add i18n 2020-09-15 14:47:57 +02:00
Mojca Lorber 3c30ee904e Merge branch 'features/task-flows' into ml-sci-4984 2020-09-15 13:27:34 +02:00
mlorb bf707a11a9
Merge branch 'features/task-flows' into ml-sci-4976 2020-09-15 12:59:49 +02:00
Alex Kriuchykhin 04686d4ffc
Merge pull request #2842 from okriuchykhin/ok_SCI_5004 
Add Completion and Uncompletion consequences [SCI-5004]
 2020-09-15 12:56:27 +02:00
Alex Kriuchykhin 6269802be4
Merge pull request #2843 from okriuchykhin/ok_SCI_4881 
Change subject to task for activities for exporting assigned items (live & snapshots) [SCI-4881]
 2020-09-15 12:53:01 +02:00
aignatov-bio 67d3a1ad12 Fix markup 2020-09-15 12:06:20 +02:00
Oleksii Kriuchykhin db3de835f8 Change subject to task for activities for exporting assigned items (live & snapshots) [SCI-4881] 2020-09-15 11:58:35 +02:00
aignatov-bio 6dc4422d82 Fix markup 2020-09-15 11:56:44 +02:00
Oleksii Kriuchykhin 57716fd89c Fix API and tests for new task completion logic [SCI-5004] 2020-09-15 11:19:25 +02:00
Mojca Lorber fe7d922cc5 Refactor complete step button 2020-09-15 11:18:15 +02:00
Oleksii Kriuchykhin 73cf620960 Add Completion and Uncompletion consequences [SCI-5004] 2020-09-14 20:06:48 +02:00
Mojca Lorber 13f719a9e1 Add saving state for filters on dashboard 2020-09-14 18:15:57 +02:00
aignatov-bio c10e2d231e Update frontend permission check 2020-09-14 15:59:09 +02:00
Oleksii Kriuchykhin a7c6ab9d89 Move some consequence executon into background process [SCI-4978] 2020-09-11 16:18:39 +02:00
aignatov-bio 008563a7f4 Update user smart annotation 2020-09-11 13:00:13 +02:00
aignatov-bio 5a063f070d Clone module before condition validation 2020-09-10 16:53:07 +02:00
aignatov-bio 18426b90be Disable button when condition not fullfield 2020-09-10 13:40:52 +02:00
mlorb 3d2aaed791
Merge pull request #2820 from mlorb/ml-sci-4580 
Fix buttons visability on reports page according to new styleguide [SCI-4580]
 2020-09-10 09:32:16 +02:00
Mojca Lorber d055d6e241 Fix quotes again 2020-09-09 14:43:12 +02:00
Urban Rotnik 78c9394b1f Fix aligment due date and status on canvas card 2020-09-09 14:33:25 +02:00
Mojca Lorber eeb8f4a97a Disable 'complete step' button on locked task 2020-09-09 14:32:37 +02:00
aignatov-bio 7a86bb47c5 Add styling and highligh 2020-09-09 14:17:19 +02:00
Urban Rotnik 0ae39678d4
Merge pull request #2832 from urbanrotnik/ur-sci-4982-lock-state 
Add error message for locked task, update some permission checks[SCI-4982]
 2020-09-09 14:04:08 +02:00
Urban Rotnik 8b10cde6b4 Fix DeepScan error 2020-09-09 13:51:11 +02:00
aignatov-bio 946b961b1a
Merge pull request #2819 from aignatov-bio/ai-sci-4975-add-permission-checks-for-statuses 
Add front-end checks for statuses [SCI-4975]
 2020-09-09 13:21:04 +02:00
Urban Rotnik 45a09e5a3c Fix tests 2020-09-09 13:17:07 +02:00
aignatov-bio 661220890f Update error handling 2020-09-09 12:25:34 +02:00
aignatov-bio f4a13a73cb Refactor smart annotation front-end 2020-09-09 12:25:34 +02:00
aignatov-bio 5d9d7d6a12
Merge pull request #2829 from aignatov-bio/ai-sci-4983-add-descriptions-for-conditions 
Add description for conditions [SCI-4983]
 2020-09-09 11:33:48 +02:00
Urban Rotnik 9419a16df5
Merge pull request #2833 from urbanrotnik/ur-sci-4988-notes-duplication 
Remove notes duplication [SCI-4988]
 2020-09-09 11:29:10 +02:00
Urban Rotnik aa88b6bdb4 Move redirect to controller 2020-09-09 11:26:43 +02:00
aignatov-bio 7763d11634 Fix markup 2020-09-09 11:24:54 +02:00
Urban Rotnik 9066586149 Fix duedate for PDF and DOCX 2020-09-09 10:48:42 +02:00
Mojca Lorber ea1510bcdd Fix quotes 2020-09-09 10:27:32 +02:00
aignatov-bio 84682c6346
Merge pull request #2823 from mlorb/ml-sci-4575 
Replace old arrow with new one [SCI-4575]
 2020-09-09 09:05:39 +02:00
aignatov-bio 9a771da7f7
Merge pull request #2821 from mlorb/ml-sci-4578 
Fix buttons visability on protocols page according to new styleguide [SCI-4578]
 2020-09-09 09:05:26 +02:00
aignatov-bio ae1bec2a95
Merge pull request #2818 from mlorb/ml-sci-4572 
Change step checklist and table edit mode [SCI-4572]
 2020-09-09 09:02:56 +02:00
aignatov-bio bdb3caf5cf Add i18n 2020-09-09 08:50:24 +02:00
aignatov-bio 687093e110
Merge pull request #2817 from aignatov-bio/ai-sci-4972-fix-complete-state-for-tasks 
Add completed/uncompleted methods to my_module [SCI-4972]
 2020-09-09 08:20:36 +02:00
Alex Kriuchykhin c413ac21a1
Merge pull request #2798 from aignatov-bio/ai-sci-4831-update-api-for-new-statuses 
Add API endpoints for workflows [SCI-4831]
 2020-09-08 16:23:05 +02:00
Alex Kriuchykhin 7eb43a16d5
Merge pull request #2806 from okriuchykhin/ok_SCI_4859 
Add secondary-navigation-title-name data hook [SCI-4859]
 2020-09-08 16:19:42 +02:00
Urban Rotnik c628fb2598 Remove duplicated notes section in reports 2020-09-08 16:10:24 +02:00
Urban Rotnik d9b691103c Add permission error message 2020-09-08 15:42:30 +02:00
aignatov-bio 4083ed1755 Fix tests 2020-09-08 14:52:23 +02:00
Oleksii Kriuchykhin dd347aa834 Improve step reposition after deletion [SCI-4880] 2020-09-08 11:48:06 +02:00
aignatov-bio e1255bf942 Remove duplicate action 2020-09-08 09:50:26 +02:00
aignatov-bio 0be99c12c2 revert changes 2020-09-08 09:45:42 +02:00
aignatov-bio ee333a982a Revert back state logic 2020-09-08 09:45:42 +02:00
aignatov-bio bd1d6a772b Add completed/uncompleted methods to my_module 2020-09-08 09:45:09 +02:00
Mojca Lorber 7e9ef9496f Update smart annotation appearance in the text 2020-09-07 18:30:54 +02:00
aignatov-bio 492d25f9b3 Add description for conditions 2020-09-07 15:12:09 +02:00
Oleksii Kriuchykhin 3150a36a64 Fix canvas edit mode [SCI-4880] 2020-09-07 14:54:49 +02:00
Oleksii Kriuchykhin ea845040aa Fix missing step edit button [SCI-4880] 2020-09-07 13:49:11 +02:00
aignatov-bio f2ffe17636 Skip implications for my_module canvas position update 2020-09-07 13:05:26 +02:00
Oleksii Kriuchykhin dea75553a3 Fix handling of duplicated step positions [SCI-4880] 2020-09-07 10:44:00 +02:00
Mojca Lorber 9dac4079f8 Replace old arrow with new one and remove redundant javascript for arrow collapsing 2020-09-04 14:43:30 +02:00
Mojca Lorber 24745203e1 Fix buttons visability on protocols page according to new styleguide 2020-09-03 17:05:25 +02:00
Mojca Lorber 1f0d9f3ad7 Fix buttons visability on reports page according to new styleguide 2020-09-03 16:19:02 +02:00
aignatov-bio d85703113a Add front-end checks 2020-09-03 14:34:34 +02:00
aignatov-bio 8b1e11a314 Add conditions_fulfilled? method 2020-09-03 14:20:38 +02:00
aignatov-bio 4c1e120f23
Merge pull request #2810 from aignatov-bio/ai-sci-4968-add-error-handling-for-state-change 
Add error handling for state change [SCI-4968]
 2020-09-03 11:47:48 +02:00
aignatov-bio 5cb497b61d Split params validation to create and update 2020-09-03 09:49:00 +02:00
aignatov-bio 39105a807a
Merge pull request #2816 from aignatov-bio/ai-sci-4960-fix-css-issue-for-status-flow 
Fix css for status flows [SCI-4970]
 2020-09-03 09:46:19 +02:00
Mojca Lorber 06d75fb07e Change step checklist and table edit mode 2020-09-02 18:04:37 +02:00
aignatov-bio 257329ce80 Fix css for status flows 2020-09-02 15:41:07 +02:00
Oleksii Kriuchykhin a508b07275 Add view mode field to the Asset model [SCI-4958] 2020-09-02 15:02:56 +02:00
Mojca Lorber 634dd2ae5e Add css variable 2020-09-02 12:00:52 +02:00