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

3253 commits

Author SHA1 Message Date
Oleksii Kriuchykhin 1553d32c6e Project filters: add text field to the filters [SCI-5204] 2020-11-26 21:29:45 +01:00
aignatov-bio d162fb6d35
Merge pull request #2980 from aignatov-bio/ai-sci-5241-add-confirmation-for-file-delete 
Add delete asset confirmation modal [SCI-5241]
 2020-11-26 15:35:40 +01:00
aignatov-bio c6f4d23a78 Fix protocol preview file background 2020-11-26 15:35:06 +01:00
aignatov-bio 60359b595c Add button disabling 2020-11-26 14:37:12 +01:00
aignatov-bio b0ebdceb08 Fix typo 2020-11-26 14:04:26 +01:00
Urban Rotnik 85b22cd486 Fix syntax 2020-11-26 12:31:45 +01:00
Urban Rotnik efd4f8abde Add members dropdown on project filters flyout 2020-11-26 12:29:43 +01:00
Urban Rotnik 34fbcb8f56 Add clear functionallity to projects filters 2020-11-26 09:23:22 +01:00
aignatov-bio 3078e60867 Small css fixes 2020-11-25 16:25:17 +01:00
aignatov-bio c212d514d5 Fix delete asset in protocol repository 2020-11-25 13:13:06 +01:00
aignatov-bio 1979883004 Add delete asset confirmation modal 2020-11-25 12:50:34 +01:00
mlorb e4001dd406
Merge pull request #2977 from mlorb/ml-sci-5048 
Implement ESC button to exit full-screen modals [SCI-5048]
 2020-11-25 09:55:16 +01:00
Mojca Lorber 2a8c98b7ec Implement ESC button to exit full-screen modals 2020-11-24 23:20:53 +01:00
aignatov-bio f2ca55dbf8 Add new icons for assets 2020-11-24 15:37:45 +01:00
aignatov-bio dc62e2780a
Merge pull request #2963 from aignatov-bio/ai-sci-5186-add-new-comments-layout 
Add comments sidebar layout [SCI-5186][SCI-5188][SCI-5189]
 2020-11-24 11:25:36 +01:00
aignatov-bio 966bb7c9ed
Merge pull request #2972 from aignatov-bio/ai-sci-5229-replce-loading-spinner-with-new 
Replace loading spinner [SCI-5229]
 2020-11-23 16:32:49 +01:00
aignatov-bio ba39d8d31b Fix markup 2020-11-23 15:02:50 +01:00
aignatov-bio 624e9b1f82 Small fixes on current task dashboard 2020-11-23 14:29:04 +01:00
aignatov-bio 84d681ecce Replace loading spinner 2020-11-23 14:14:54 +01:00
aignatov-bio 833c327e3a Fix empty state during loading 2020-11-23 12:44:23 +01:00
Mojca Lorber c57da3380f Remove complete step button from protocol step and fix step number in Firefox 2020-11-23 10:18:27 +01:00
aignatov-bio 2449f2b500 Fix smart annotation for comments 2020-11-21 12:34:36 +01:00
aignatov-bio 77b7b1b231 Add errors handling and i18n 2020-11-21 12:31:49 +01:00
aignatov-bio 60ce51149d Add CRUD to comments 2020-11-20 20:25:28 +01:00
aignatov-bio da4b8aaf2f Add comments list 2020-11-20 12:29:40 +01:00
Alex Kriuchykhin f5860397f5
Merge pull request #2953 from okriuchykhin/ok_SCI_5183 
Make folders selectable for 'Export all' functionality [SCI-5183]
 2020-11-20 09:54:53 +01:00
Oleksii Kriuchykhin 4dc3473c5e Fix showing/hiding export button on folder selection [SCI-5183] 2020-11-19 15:50:43 +01:00
aignatov-bio 96bf3dcea2
Merge pull request #2958 from aignatov-bio/ai-sci-5224-update-title-font-color-for-asset-dropdown 
Update title font color for asset dropdown [SCI-5224]
 2020-11-19 12:20:20 +01:00
aignatov-bio 483ff8f1f2
Merge pull request #2964 from biosistemika/features/office-file-previews 
Features/office file previews merge branch
 2020-11-19 11:11:39 +01:00
Urban Rotnik aba0034854 Convert some values to ems 2020-11-19 09:25:26 +01:00
Urban Rotnik e893d40eea Add filters flyout for projects 2020-11-19 09:23:35 +01:00
aignatov-bio 2294d396f9 Add comments sidebar layout 2020-11-18 16:26:01 +01:00
aignatov-bio 14ccb5c6a6 Update title font color for asset dropdown 2020-11-17 12:47:45 +01:00
Mojca Lorber ceb0923ce6 Fix tooltip display when editing inventory row 2020-11-16 16:16:47 +01:00
Oleksii Kriuchykhin 6dfeae2283 Make folders selectable for 'Export all' functionality [SCI-5183] 2020-11-13 14:39:10 +01:00
aignatov-bio 6c305011ca Update dashboard placeholders 2020-11-12 12:49:00 +01:00
aignatov-bio 7fd7c2de6a Add download link to reports 2020-11-11 15:48:00 +01:00
Mojca Lorber aadbff94ae Fix double init 2020-11-11 11:07:43 +01:00
Mojca Lorber 1618d79144 Merge branch 'develop' into ml-sci-5152 2020-11-11 10:47:43 +01:00
Miha Mencin 1cfb205df7
Merge pull request #2939 from aignatov-bio/ai-sci-5122-fix-navigation-on-small-screens 
Fix navigation on small screens [SCI-5122]
 2020-11-11 10:22:12 +01:00
aignatov-bio 71ddf680b2 Add highlight to report table 2020-11-10 15:15:18 +01:00
mlorb a71e8ef9cf
Merge pull request #2940 from mlorb/ml-sci-5034 
Expose the new step button on task [SCI-5034]
 2020-11-10 13:10:55 +01:00
Urban Rotnik 0f5bf45cf6 Rebase, add toolbar, minor fixes css and JS 2020-11-06 13:56:21 +01:00
Urban Rotnik 9f12c5f343 New cards and list layout 2020-11-06 13:01:52 +01:00
Mojca Lorber 9893e8d5c8 Add 403 error handling to current tasks dashboard widget 2020-11-06 10:39:04 +01:00
Urban Rotnik d6eef4699b
Merge pull request #2938 from aignatov-bio/ai-sci-5153-fix-dashboard-widget-overlap 
Fix dashboard small screen overlap [SCI-5153]
 2020-11-06 09:59:52 +01:00
Mojca Lorber 8ee8f7b4d2 Expose the new step button on task 2020-11-05 16:14:40 +01:00
aignatov-bio 2c64481cda Fix navigation on small screens 2020-11-05 15:20:34 +01:00
aignatov-bio 5b22f7d301 Fix dashboard small screen overlap 2020-11-05 14:47:19 +01:00
aignatov-bio 99b52e5d80 Fix markup 2020-11-05 08:44:48 +01:00
Oleksii Kriuchykhin 40ab03c38d Fix cucumber tests for table results [SCI-5047] 2020-11-04 16:46:18 +01:00
Oleksii Kriuchykhin 327baafcd7 Improve CSS structure for project toolbar [SCI-5129] 2020-11-04 16:10:40 +01:00
aignatov-bio 12fdea8d89 Add context menu to attahcments 2020-11-04 13:08:40 +01:00
aignatov-bio e8e9244d96 Fix I18n and double loading 2020-11-03 09:07:49 +01:00
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
Mojca Lorber 04e3b67968 Change the way buttons are toggled 2020-10-30 18:47:01 +01:00
Mojca Lorber a52315fc79 Merge branch 'develop' into ml-sci-5033 2020-10-29 18:28:25 +01:00
aignatov-bio 12991e8fd3 Commit add asset preview mode switcher to step 2020-10-29 16:42:05 +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 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
Oleksii Kriuchykhin 13fcfedf41 Refactor experiment workflow image generation [SCI-5063] 2020-10-29 13:16:09 +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 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
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
aignatov-bio bddd1956ab Fix font size and font weight for status label 2020-10-26 12:35:40 +01:00
Mojca Lorber ec41bdd414 Move open mobile app button to main navigation 2020-10-26 09:28:44 +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
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
aignatov-bio d6f8e156c1 Update checkbox style at repository and protocol datatable 2020-10-22 16:42:12 +02:00
Urban Rotnik aa1520bfb8 Merge branch 'develop' into jg_sci_2228 2020-10-22 14:21:39 +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 e7d2d78935 Add mark for active filters 2020-10-20 16:45:54 +02:00
aignatov-bio 2968e677b8 Update image for doorkeeper auth 2020-10-19 16:23:20 +02:00
Mojca Lorber 23f01ac6a9 Add 'Open in APP' button to the task 2020-10-19 12:17:03 +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
aignatov-bio 0a4b89cf39 Merge branch 'develop' into features/office-file-previews 2020-10-15 15:19:56 +02:00
Mojca Lorber 5013f224ee Fix ems 2020-10-14 13:16:38 +02:00
Mojca Lorber a944525d25 Change px to em 2020-10-12 16:59:33 +02:00
Mojca Lorber cf367baefa Merge branch 'develop' into ml-sci-4841 2020-10-12 14:43:03 +02:00
aignatov-bio 5d6c9e78fd Refactor dashboard layout 2020-10-06 16:09:26 +02:00
Mojca Lorber 4e4a4a2c4e Change Complete step button on task step 2020-10-02 15:02:42 +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
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 7c3a3e4490 Small smart annotation fixes 2020-09-28 12:03:01 +02:00
aignatov-bio 1ed65eddfa Move ordering to front-end 2020-09-25 15:06:09 +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 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
aignatov-bio 4f7814cff4 Fix markup 2020-09-24 13:32:43 +02:00
aignatov-bio ff33cb45e0 Improve smart annotation in TinyMCE fields 2020-09-24 13:29:20 +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
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
aignatov-bio 21dcf1157c Update regexp for smart annotation 2020-09-23 11:13:59 +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
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
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
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
Mojca Lorber d9a78d20d7 Update empty states for smart annotation results and dismiss button 2020-09-18 08:50:01 +02:00
aignatov-bio 644f30fb10 Fix syntax for uglifier 2020-09-17 15:35:12 +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 8dbc69aa31 Remove console.log 2020-09-17 14:48:26 +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
aignatov-bio c26f8e7193 Add before send condition for status change 2020-09-16 15:23:53 +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
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
aignatov-bio 67d3a1ad12 Fix markup 2020-09-15 12:06:20 +02:00
aignatov-bio 6dc4422d82 Fix markup 2020-09-15 11:56:44 +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 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
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
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 aa88b6bdb4 Move redirect to controller 2020-09-09 11:26:43 +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
Urban Rotnik d9b691103c Add permission error message 2020-09-08 15:42:30 +02:00
Mojca Lorber 7e9ef9496f Update smart annotation appearance in the text 2020-09-07 18:30:54 +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 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 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
Mojca Lorber 634dd2ae5e Add css variable 2020-09-02 12:00:52 +02:00
Mojca Lorber d57eb68f93 Fix tables header corners 2020-09-01 16:25:30 +02:00
Urban Rotnik ed5869ff8e Show status on task card 2020-09-01 14:56:48 +02:00
aignatov-bio 9ff5e8bd7d Add task state change error handling and validation 2020-09-01 12:41:00 +02:00
Urban Rotnik a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +02:00
Urban Rotnik 4eebfa5461 Controller action for card inline preview 2020-08-28 11:05:52 +02:00
aignatov-bio c07ebe90fa Add migration for task states 2020-08-27 11:34:59 +02:00
Oleksii Kriuchykhin ed2eb81c68 Switch to position swapping when updating step position [SCI-4880] 2020-08-25 15:46:23 +02:00
Oleksii Kriuchykhin a206890a8c Fix step position adjusting on move and destroy [SCI-4880] 2020-08-25 15:46:21 +02:00
Urban Rotnik 5923a4c014 Merge branch 'develop' into features/task-flows 2020-08-25 15:30:22 +02:00
aignatov-bio c3ddfd5bed
Merge pull request #2786 from aignatov-bio/ai-sci-4899-add-new-statuses-filters-on-dashboard 
Fix dropdrown selector [SCI-4899]
 2020-08-25 14:51:55 +02:00
aignatov-bio 21e4dcd96a Add wopi preview for office files 2020-08-25 13:22:36 +02:00
Urban Rotnik b6495becdb Set stateDuration to 0 2020-08-24 15:51:35 +02:00
Alex Kriuchykhin 5006173d59
Merge pull request #2780 from aignatov-bio/ai-sci-4856-add-new-statuses-to-dashboard 
Add new statuses to dashboard [SCI-4856]
 2020-08-24 11:09:57 +02:00
Mojca Lorber 059c8c88d9 Fix css for modal-body 2020-08-20 14:12:45 +02:00
aignatov-bio 19a0d05467 Fix for checklist ordering 2020-08-14 12:32:39 +02:00
Mojca Lorber a91aa6ce46 Fix Collapse and expand buttons position 2020-08-13 13:18:50 +02:00
aignatov-bio 5360db76be Fix dropdrown selector 2020-08-12 14:00:10 +02:00
aignatov-bio 56ff4e7702 Add new statuses to dashboard 2020-08-10 09:10:56 +02:00
Urban Rotnik 073979534c
Merge branch 'features/task-flows' into develop_to_task_flows 2020-08-04 16:43:05 +02:00
Urban Rotnik e221d960e7 Revert "Merge pull request #2767 from aignatov-bio/ai-sci-4899-add-new-statuses-filters-on-dashboard" 
This reverts commit 8b6d57058c, reversing
changes made to 957ac92669.
 2020-08-04 15:07:22 +02:00
Urban Rotnik 7c14da70d9
Merge branch 'features/task-flows' into develop_to_task_flows 2020-08-04 14:50:46 +02:00
Urban Rotnik 6853caa0c8
Merge pull request #2760 from aignatov-bio/ai-sci-4894-small-2fa-fixes 
Small 2fa fixes [SCI-4894]
 2020-08-04 11:23:08 +02:00
Urban Rotnik cce76f6f0f
Merge pull request #2763 from aignatov-bio/ai-sci-4895-add-sorting-to-reults 
Add ordering for result page [SCI-4895]
 2020-08-04 11:17:43 +02:00
Alex Kriuchykhin e965844a9e
Merge pull request #2755 from aignatov-bio/ai-sci-4837-implement-new-statuses-in-preports 
Add new statuses to reports [SCI-4837]
 2020-08-04 09:49:55 +02:00
Alex Kriuchykhin a9bc5b664a
Merge pull request #2750 from aignatov-bio/ai-sci-4835-add-status-flow-modal 
Add modal for status flow [SCI-4835]
 2020-08-04 09:47:40 +02:00
Urban Rotnik aaae33e603
Merge pull request #2764 from aignatov-bio/ai-sci-4766-add-start-date-filter-to-dashboard 
Add start date to current task dashboard filter [SCI-4766]
 2020-08-03 11:56:24 +02:00
Urban Rotnik 868f2e8242
Merge pull request #2765 from aignatov-bio/ai-sci-4878-fix-activities-on-task-tab 
Fix CSS for activities on task page [SCI-4878]
 2020-08-03 11:31:47 +02:00
Urban Rotnik ac3c06d882
Merge pull request #2741 from aignatov-bio/ai-sci-4748-add-export-for-assinged-items 
Add export for assigned items [SCI-4748]
 2020-08-03 11:30:31 +02:00
aignatov-bio 536367362c Add statuses to dashboard filters 2020-07-31 10:59:10 +02:00
aignatov-bio 73911cf7ce Fix CSS for activities on task page 2020-07-30 13:30:23 +02:00
aignatov-bio 2f5231e832 Add start date to current task dashboard filter 2020-07-29 16:09:23 +02:00
aignatov-bio 15b5f9bb68 Add ordering for result page 2020-07-28 15:39:29 +02:00
aignatov-bio 68fc6ec58a Add sorting my module statuses 2020-07-27 16:36:21 +02:00
aignatov-bio 6bd12e0397 Add modal for status flow 2020-07-27 13:48:21 +02:00
aignatov-bio 33e3e3d301 Small 2fa fixes 2020-07-27 13:42:51 +02:00
Urban Rotnik 025378cd0e Fix translations and JS 2020-07-23 15:53:46 +02:00
Alex Kriuchykhin d4408f6af7
Merge pull request #2738 from aignatov-bio/ai-sci-4732-add-pagination-to-results 
Add pagination to results page [SCI-4732]
 2020-07-23 14:45:10 +02:00
aignatov-bio a0d19b5d98 Add new statuses to reports 2020-07-23 14:24:30 +02:00
Urban Rotnik 077f5eefdb
Merge pull request #2753 from urbanrotnik/ur-sci-4890-inventory-empty-text-value 
Fix undefined text cell [SCI-4890]
 2020-07-23 12:56:43 +02:00
Alex Kriuchykhin cb9fe04584
Merge pull request #2745 from aignatov-bio/ai-sci-4785-fix-inventories-activity-filters 
Fix global activities filters [SCI-4785]
 2020-07-23 10:09:36 +02:00
aignatov-bio b214d2df77
Merge pull request #2746 from aignatov-bio/ai-sci-4815-fix-margins-on-view-switch 
Fix switch view margins [SCI-4815]
 2020-07-23 08:57:20 +02:00
Urban Rotnik 51ca828399 Fix undefined text cell 2020-07-22 17:27:36 +02:00
Urban Rotnik 512d6f3229 Add actions for update status, clean old complete actions 2020-07-22 16:12:34 +02:00
Urban Rotnik aacee14fc6 Add Status button 2020-07-22 15:30:47 +02:00
aignatov-bio 1d3055011f Merge branch 'features/tinymce-tables' into develop 2020-07-22 13:41:43 +02:00
aignatov-bio ddfe8231d8 Merge branch 'features/2fa' into develop 2020-07-22 11:56:36 +02:00
Urban Rotnik 7019e42736
Merge pull request #2743 from urbanrotnik/ur-sci-4816-change-font-size-email 
Fix font size in dropdown [SCI-4816]
 2020-07-20 15:50:10 +02:00
aignatov-bio 691b8ec327 Fix switch view margins 2020-07-20 15:17:24 +02:00
aignatov-bio 75930b99c3 Fix global activities filters 2020-07-20 15:01:00 +02:00
Urban Rotnik 748dd7912b Fix font size in dropdown 2020-07-20 11:36:25 +02:00
aignatov-bio e69e3ea8d3 Add export for assigned items 2020-07-17 15:17:09 +02:00
Mojca Lorber 10e607c281 Implement Status labels on a Task card 2020-07-17 14:48:45 +02:00
aignatov-bio 7c4bfad09b Add pagination to results page 2020-07-16 15:47:19 +02:00
Mojca Lorber 9464d2753d Fix naming of filter field for repositories tables 2020-07-15 10:52:47 +02:00
Alex Kriuchykhin 8dd478ad61
Merge pull request #2730 from aignatov-bio/ai-sci-4874-improve-pdf-reports 
Improve pdf reports [SCI-4874]
 2020-07-13 17:02:10 +02:00
Mojca Lorber 212ba76c16 Fix Settings pages titles 2020-07-13 14:51:51 +02:00
aignatov-bio a7fac38fcb Improve pdf reports 2020-07-13 14:29:59 +02:00
Mojca Lorber cea9e6f956 Add check for search state 2020-07-10 15:39:01 +02:00
Alex Kriuchykhin 594d8031ce
Merge pull request #2726 from mlorb/ml-sci-4855 
Remove search state load from repositories table [SCI-4855]
 2020-07-10 13:07:44 +02:00
Mojca Lorber 39ae1ed25e Fix search status 2020-07-10 12:52:07 +02:00
aignatov-bio 50714eb59d Disable inventories table initialization on turbolinks preview 2020-07-10 11:05:27 +02:00
Mojca Lorber 21f0d431b0 Remove search state load from repositories table 2020-07-10 11:05:22 +02:00
aignatov-bio fef6e5f1db Add recovery strategy for 2fa 2020-07-09 17:01:00 +02:00
Urban Rotnik 7aa40a284e
Merge pull request #2724 from urbanrotnik/ur-sci-4771-improve-report-layout 
Text wrap for page numbers [SCI-4771]
 2020-07-09 16:52:41 +02:00
Urban Rotnik 1f220f70ee Text wrap for page numbers 2020-07-09 16:24:14 +02:00
mlorb 0f43f6a479
Merge pull request #2721 from mlorb/ml-sci-4788-v2 
Fix bug with not hidden navigation on inventory page [SCI-4788]
 2020-07-09 15:12:44 +02:00
mlorb 3f44f44cbe
Merge pull request #2711 from mlorb/ml-sci-4810 
Hide inventory buttons and fix css of disabled button [SCI-4810]
 2020-07-09 15:11:02 +02:00
Miha Mencin 2cb3720602
Merge pull request #2720 from aignatov-bio/ai-sci-4842-snapshot-archived-label-wrong-position 
Add archived label to correct column [SCI-4842]
 2020-07-09 14:49:54 +02:00
Mojca Lorber cb8070c012 Fix pointer event 2020-07-09 14:25:54 +02:00
Mojca Lorber 1a2b321523 Fix bug with not hidden navigation on inventory page 2020-07-09 14:09:55 +02:00
aignatov-bio c240474f76 Add archived label to correct column 2020-07-09 13:39:26 +02:00
aignatov-bio 6245e19069
Merge pull request #2718 from biosistemika/master 
Merge master to develop
 2020-07-09 12:56:31 +02:00
mlorb 73e2654d78
Merge pull request #2701 from mlorb/ml-sci-4793 
Add empty states to inventories datatable and fix filtering bug [SCI-4793]
 2020-07-09 11:49:16 +02:00
Urban Rotnik 950f65b90e
Merge pull request #2715 from urbanrotnik/ur-sci-4771-improve-report-layout 
Improve report layout [SCI-4771]
 2020-07-09 11:48:33 +02:00
mlorb d9038e6f7f
Merge branch 'develop' into ml-sci-4810 2020-07-09 11:46:54 +02:00
Mojca Lorber 19c5b7e5a2 Remove redundant css class 2020-07-09 11:44:36 +02:00
Miha Mencin c68aa5c875
Merge pull request #2716 from mlorb/ml-sci-4567 
Change title size to h1 [SCI-4567]
 2020-07-09 11:19:02 +02:00
Mojca Lorber f64172f787 Revert repository archived items title 2020-07-09 09:17:02 +02:00
aignatov-bio b2a42c182b
Merge pull request #2717 from aignatov-bio/ai-sci-4844-fix-dropdown-options-for-active-repository 
Small archived repositories fixes [SCI-4844]
 2020-07-09 08:56:21 +02:00
aignatov-bio 135ac487d0 Small archived repositories fixes 2020-07-08 13:42:27 +02:00
Mojca Lorber 00b668a4ba Change title size to h1 2020-07-08 13:02:47 +02:00
Urban Rotnik d6f37ce28e
Merge pull request #2710 from urbanrotnik/ur-sci-4568-remove-flash-message 
Remove flash message for redirects from root url [SCI-4568]
 2020-07-08 11:42:05 +02:00
Urban Rotnik 33aa1d3641
Merge pull request #2709 from urbanrotnik/ur-sci-4804 
Fix Repository rows count & table header adjustmen [SCI-4804]
 2020-07-08 11:39:44 +02:00
Urban Rotnik 5d067077b1 Add logo and timestamp to PDF and Doc reports 2020-07-08 10:48:29 +02:00
aignatov-bio 8c91181abc
Merge pull request #2702 from aignatov-bio/ai-sci-4800-keep-table-page-after-item-update 
Keep table page after repository item update [SCI-4800]
 2020-07-08 09:30:26 +02:00
aignatov-bio a994c75885
Merge pull request #2700 from aignatov-bio/ai-sci-4801-inventory-list-sorting-date-issue 
Fix date columns sorting in repositories list [SCI-4801]
 2020-07-08 09:30:10 +02:00
aignatov-bio 65c28d641f
Merge pull request #2698 from aignatov-bio/ai-sci-4807-disable-column-reordering-repositories-list 
Disable column reordering in repositories list [SCI-4807]
 2020-07-08 09:29:51 +02:00
aignatov-bio 716319354b
Merge pull request #2706 from aignatov-bio/ai-sci-4820-fix-sidebar-inventory-refresh 
Improve active/archive switcher [SCI-4820]
 2020-07-08 09:29:16 +02:00
aignatov-bio 004a7e3943
Merge pull request #2705 from aignatov-bio/ai-sci-4808-update-css-for-inventory-modals 
Update inventory modals CSS [SCI-4808]
 2020-07-08 09:29:02 +02:00
aignatov-bio 88c092dc98 Add i18n and constants 2020-07-07 15:59:02 +02:00
Mojca Lorber 9642e92fdc Hide inventory buttons and fix css of disabled button 2020-07-07 13:53:31 +02:00
aignatov-bio 7a9a25e6a9 Add 2fa wizzard tabs 2020-07-07 13:17:17 +02:00
aignatov-bio be3a1994f8 Add basic UX to 2FA 2020-07-07 13:09:48 +02:00
aignatov-bio 13f7653667 Merge branch 'develop' into features/2fa 2020-07-07 13:05:45 +02:00
Urban Rotnik ceddfdd978 Remove flash message for redirects from root url 2020-07-07 11:13:36 +02:00
Urban Rotnik d16a2ed9c9 Fix Datatable header adjustments on repositories index 2020-07-07 09:49:05 +02:00
aignatov-bio b127d8c754 Improve active/archive switcher 2020-07-06 14:03:55 +02:00
aignatov-bio 6352a4ba9b Update inventory modals 2020-07-06 12:47:42 +02:00
aignatov-bio cc1b75644d Keep table page after repository item update 2020-07-03 13:45:02 +02:00
Mojca Lorber db8c7cd97c Add empty states to inventories datatable and fix filtering bug 2020-07-02 15:51:07 +02:00
aignatov-bio d226bb5622 Fix date columns sorting in repositories list 2020-07-02 14:35:48 +02:00
Urban Rotnik 1bf8198129 Hide checkbox column when user is not admin 2020-07-02 14:29:18 +02:00
aignatov-bio 9340148b41 Disable column reordering in repositories list 2020-07-02 11:50:40 +02:00
aignatov-bio 4b9881e31e Add 2fa to user settings page 2020-07-01 13:25:06 +02:00
aignatov-bio 630bef1adf Add special characters to smart annotation 2020-06-29 14:47:35 +02:00
aignatov-bio 6fa97d3639 Add enable 2fa button to user settings 2020-06-29 10:56:06 +02:00
Oleksii Kriuchykhin 405d5b31bb Remove spinner in repository table after error caused by provisioning snapshot [SCI-4665] 2020-06-29 10:04:31 +02:00
Miha Mencin 76c2e032dc
Merge pull request #2666 from aignatov-bio/ai-sci-4747-fix-long-inventory-name 
Fix long inventory name issue on task page  [SCI-4747]
 2020-06-29 09:44:21 +02:00
Miha Mencin 6db1401759
Merge pull request #2670 from aignatov-bio/ai-sci-4745-fix-manage-column-dropdown-position 
Fix dropdown position for full-screen modals [SCI-4745]
 2020-06-29 09:43:13 +02:00
Alex Kriuchykhin faa76a6442
Merge pull request #2660 from okriuchykhin/ok_SCI_4707_v2 
Improve user input filtering on user settings page and for task tags [SCI-4707]
 2020-06-29 09:30:45 +02:00
Oleksii Kriuchykhin 64b66f0d73 Remove obsolete attribute in repository_datatable.js after feature branch merge 2020-06-24 16:25:42 +02:00
aignatov-bio 6a41290d9d Add tables to TinyMce and small table improvments 2020-06-24 15:51:59 +02:00
aignatov-bio 4f8a612106 add new line 2020-06-24 15:25:34 +02:00
aignatov-bio a3ea0927c9 Revert helper JS to es5 2020-06-24 15:12:13 +02:00
aignatov-bio 80970b6448 Remove hashes from datatable helper 2020-06-24 14:39:33 +02:00
Oleksii Kriuchykhin 7ea577d8d4 Merge branch 'features/inventory-archiving' into develop 2020-06-24 14:04:54 +02:00
Urban Rotnik 193375818e Disable checkboxes for shared inventories 2020-06-24 13:41:00 +02:00
Alex Kriuchykhin 2a315ac106
Merge pull request #2681 from biosistemika/SCI-4780-replace-delete-button 
SCI-4780 replace delete button with archive button
 2020-06-24 13:16:11 +02:00
Oleksii Kriuchykhin 29f62419bd Improve repository archive/restore actions [SCI-4780] 2020-06-24 11:32:20 +02:00
aignatov-bio 5fc3146174 Update my module repositories dropdown list 2020-06-24 11:23:17 +02:00
miha 41bb825f33 SCI-4780 Added archive and restore items to repository actions dropdown, minor refactoring of controller 2020-06-23 22:59:21 +02:00
Urban Rotnik efbc05e00e
Merge pull request #2675 from urbanrotnik/ur-sci-4782 
Include archived columns to inventories export [SCI-4782]
 2020-06-23 16:51:50 +02:00
aignatov-bio 414429afcd
Merge pull request #2674 from aignatov-bio/ai-sci-4784-update-manage-columns-for-archived-repository 
Add archived_by and archived_on column to columns manage modal [SCI-4784]
 2020-06-23 09:10:28 +02:00
Urban Rotnik d1b1b5f268 Include archived columns to inventories export 2020-06-22 14:28:49 +02:00
aignatov-bio dc50e7f1fd Add archived_by and archived_on column to columns manage modal 2020-06-22 14:00:44 +02:00
aignatov-bio 6f2d5b359e Add action buttons to repository index 2020-06-19 15:54:45 +02:00
Mojca Lorber 8d43603789 Fix acivities and error handeling 2020-06-19 09:04:42 +02:00
Mojca Lorber 6e8062179c Implement archiving and restoring of whole inventories 2020-06-18 18:07:23 +02:00
aignatov-bio 323929b270 Add restore/delete buttons 2020-06-18 14:09:29 +02:00
aignatov-bio e9830ebfee Add view switcher 2020-06-18 14:08:24 +02:00
aignatov-bio 8b10d49118 Clean up CSS 2020-06-18 14:08:24 +02:00
Urban Rotnik a05be67d3a
Merge pull request #2652 from urbanrotnik/ur-sci-4703-archived-tag 
Add archived tags to assigned repository rows [SCI-4703]
 2020-06-18 13:47:57 +02:00
aignatov-bio 7f9af06f78 Fix dropdown position for full screen modals 2020-06-18 13:29:28 +02:00
aignatov-bio e8ea8b5b3f Fix long inventory name issue on task page 2020-06-17 15:08:07 +02:00
Oleksii Kriuchykhin 8280d2a41e Allow HTML in inline editor, needed for handling smart annotations [SCI-4707] 2020-06-16 13:55:27 +02:00
Urban Rotnik c0a2d4709c
Merge pull request #2662 from urbanrotnik/ai-sci-4770 
Fix MarvinJS modal header [SCI-4770] - HotFix
 2020-06-16 11:44:04 +02:00
aignatov-bio 95ae8215a7 Fix MarvinJS modal header 2020-06-16 10:28:43 +02:00
Oleksii Kriuchykhin 0641ad094f Improve user input filtering on user settings page and for task tags [SCI-4707] 2020-06-15 15:41:06 +02:00
aignatov-bio a6ff5b1ed8
Merge pull request #2653 from aignatov-bio/ai-sci-4692-add-archiving-columns-to-datable-helper 
Add archiving column to datatable helper [SCI-4692]
 2020-06-15 15:35:19 +02:00
Urban Rotnik 868c1c1fa0 Improve row state passing 2020-06-15 13:42:16 +02:00
Urban Rotnik ec14cf9fef
Merge pull request #2657 from urbanrotnik/ai-sci-4765-v2 
Fix smart annotation in inventory on edit [SCI-4765] (HotFix branch)
 2020-06-12 11:41:02 +02:00
Urban Rotnik 800465f9a9
Merge pull request #2648 from aignatov-bio/ai-sci-4733-disable-marvinjs-if-not-using 
Not include marvinJS library, if marvinJS disabled [SCI-4733]
 2020-06-12 11:40:41 +02:00
aignatov-bio 97f5a7e9fc Fix smart annotation in inventory on edit 2020-06-12 11:17:50 +02:00
mlorb 0a7c9aeb1a
Merge pull request #2651 from urbanrotnik/ur-sci-4706-archiving-restoring-rows 
Archiving & restoring rows [SCI-4706]
 2020-06-11 16:41:53 +02:00
Mojca Lorber cfeb4b4d3d Fix protocol duplication at saving protocol from task to repository 2020-06-11 13:19:21 +02:00
aignatov-bio db35da0cee Add archiving column to datatable helper 2020-06-11 12:48:31 +02:00
Urban Rotnik 9bac0fb867 Add archived tags to assigned repository rows 2020-06-10 14:48:03 +02:00
Urban Rotnik c7d6c4d60e Add repository_rows restoring and archiving actions on FE 2020-06-09 22:16:55 +02:00
aignatov-bio 2b9062ac92 Add checkbox selector to datatable 2020-06-09 13:16:50 +02:00
Mojca Lorber c0c93772ff Fix protocol duplication at saving protocol from task to repository 2020-06-09 11:45:03 +02:00
aignatov-bio 15de84ff2f Not include marvinJS library, if marvinJS disabled 2020-06-08 09:59:26 +02:00
Oleksii Kriuchykhin 85ce72e5ff Remove obsolete JS functions from repositories datatable [SCI-4571] 2020-06-05 11:15:58 +02:00
aignatov-bio 4a6d7d0e12 Add archived inventories 2020-06-04 19:07:10 +02:00
aignatov-bio 66a77d8de9 Add sidebar reload on view change 2020-06-04 18:41:45 +02:00
aignatov-bio 012b7b3d23 Add switch for active/archive repository view 2020-06-04 18:41:45 +02:00
Oleksii Kriuchykhin 48865c8cea Clear the obsolete code for assiging inventory items to the task [SCI-4571] 2020-06-03 22:54:45 +02:00
Urban Rotnik 9d96baf008 Escape special chars for FE and BE 2020-06-02 15:16:01 +02:00
Urban Rotnik 9b0f215187 Fix status dropdown rendering 2020-06-02 06:15:34 +02:00
Urban Rotnik 4fc37e12a0 Fix dropdown render for columns manage modal 2020-06-01 18:41:58 +02:00
aignatov-bio 3294840611 Fix sidebar event 2020-06-01 14:45:03 +02:00
aignatov-bio 7c8460dcf5
Merge pull request #2628 from aignatov-bio/ai-sci-4699-change-line-thikness 
Change selected line thickness [SCI-4699]
 2020-06-01 10:43:46 +02:00
aignatov-bio 222e89ea8d Change selected line thickness 2020-06-01 10:30:06 +02:00
aignatov-bio 8f3c7fa9aa
Merge pull request #2627 from aignatov-bio/ai-sci-4549-fix-shared-inventory-icon 
Fix shared inventory icon [SCI-4549]
 2020-06-01 10:28:07 +02:00
aignatov-bio e67f345602
Merge pull request #2624 from aignatov-bio/ai-sci-4701-small-css-fixes 
Small css fixes [SCI-4701]
 2020-06-01 10:27:54 +02:00
aignatov-bio aee75a2f83 Add repository list view 2020-06-01 10:24:03 +02:00
aignatov-bio 1430ca5ae9 Fix shared inventory icon 2020-05-29 13:17:07 +02:00
Alex Kriuchykhin be8c7e01e2
Merge pull request #2622 from aignatov-bio/ai-sci-4699-show-selected-snapshot-in-sidebar 
Show selected snapshot in sidebar [SCI-4699]
 2020-05-29 11:14:52 +02:00
Alex Kriuchykhin 4c50f75aa2
Merge pull request #2621 from aignatov-bio/ai-sci-4710-fix-escape-issue-in-dropdowns 
Fix escape issue in dropdowns [SCI-4710]
 2020-05-29 09:52:36 +02:00
aignatov-bio 7f0d43209e Small css fixes 2020-05-28 16:04:21 +02:00
aignatov-bio 368ee8a689 Show selected snapshot in sidebar 2020-05-28 15:18:26 +02:00
aignatov-bio f7a215c953 Fix escape issue in dropdowns 2020-05-28 10:55:36 +02:00
aignatov-bio 32c1f4af84 Fix forgot password link margin 2020-05-27 12:55:15 +02:00
aignatov-bio 7b36392a19
Merge pull request #2606 from aignatov-bio/ai-sci-4621-resize-simple-table-header-size-on-sidebar-colapse 
Resize simple table header on sidebar collapse [SCI-4621]
 2020-05-27 09:35:40 +02:00
aignatov-bio 73c7ff47a5 Fix z-index for full view modal 2020-05-26 12:41:07 +02:00
aignatov-bio f86b71144d Resize simple table header on sidebar collapse 2020-05-25 16:21:28 +02:00
Mojca Lorber 76a1f73989 Change order of snapshots versions 2020-05-25 12:15:24 +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
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
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
Mojca Lorber 12982260b7 Fix css hover effects 2020-05-21 08:37:40 +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
Mojca Lorber e2959fec32 Merge branch 'develop' into ml-sci-4582 2020-05-20 10:37:33 +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
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
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
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
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 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
Mojca Lorber 4c15c89cf5 Add New Task layout Collapsed/Expanded States saving 2020-05-15 00:49:23 +02:00
aignatov-bio c9a9cd2e75 Remove search from state load in task repository 2020-05-14 21:49:01 +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 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
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
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 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 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
aignatov-bio f94ea51ecb Small snapshot css corrections 2020-05-10 13:08:19 +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 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 e9c54f10fb Fix markup 2020-05-08 11:58:40 +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 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 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 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
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
aignatov-bio 4e5ebd01b5 Fix I18n 2020-05-06 12:20:20 +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
aignatov-bio 1b57040c37 Fix deepscan issues 2020-05-05 09:44:38 +02:00