scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
14640 commits 70 branches 179 tags 165 MiB
Commit graph

11548 commits

Author SHA1 Message Date
Martin Artnik ede9e40be8 Fix attachment sorting in results [SCI-9267] 2023-09-08 16:07:43 +02:00
Martin Artnik 520f978f35
Fix update of database settings values [SCI-9240] (#6174) 2023-09-08 14:45:39 +02:00
aignatov-bio cbb4e02e90
Merge pull request #6173 from aignatov-bio/ai-sci-9264-add-active-archive-switch-to-result-page 
Add active/archive switch to results page [SCI-9264]
 2023-09-08 13:47:44 +02:00
Anton 7b44a47d51 Add active/archive switch to results page [SCI-9264] 2023-09-08 13:42:02 +02:00
Martin Artnik 68bf78e0af
Merge pull request #6172 from G-Chubinidze/gc_SCI_9237 
Protocol template title is displayed in the grey area [SCI-9237]
 2023-09-08 13:31:13 +02:00
wandji e6252e09cc
Change consumption reposrt esport modal text [SCI-9194] (#6167) 2023-09-08 11:39:46 +02:00
Ivan Kljun 1242ec588f Add and fix result activities [SCI-9010] 2023-09-08 11:36:59 +02:00
Alex Kriuchykhin d8965e8ef9
Refactor old export async methods to ActiveJobs [SCI-9092] (#6170) 2023-09-08 11:35:16 +02:00
Giga Chubinidze b436550ae9 Protocol template title is displayed in the grey area 2023-09-08 11:59:57 +04:00
Gregor Lasnibat d029b54291 Fix shared task issues [SCI-9226] 2023-09-08 00:03:01 +02:00
Gregor Lasnibat c82a1b1108 Fix shared task issues [SCI-9226] 2023-09-07 21:04:01 +02:00
Gregor Lasnibat 5ad6b27f9c
Merge pull request #6169 from lasniscinote/gl_SCI_9256 
Fix styles for input in OVE/Marvin editor [SCI-9256]
 2023-09-08 10:19:59 +02:00
wandji 8e4dbbac58
Remove name when loading ove file [SCI-9169] (#6165) 2023-09-07 17:19:09 +02:00
Gregor Lasnibat 93a1c842d9 Fix styles for input in OVE/Marvin editor [SCI-9256] 2023-09-07 15:42:37 +02:00
Martin Artnik 4abc2288b3
Merge pull request #6163 from artoscinote/ma_SCI_9244 
Fix global search to work with new results [SCI-9244]
 2023-09-07 14:17:06 +02:00
aignatov-bio 18a5fcd58f
Merge pull request #6161 from aignatov-bio/ai-sci-9249-add-step-text-title-to-protocol-print 
Add step text title to print protocol [SCI-9249]
 2023-09-07 14:16:09 +02:00
aignatov-bio 92749d5ec2
Merge branch 'features/september-release' into ai-sci-9210-add-move-action-to-asset-card 2023-09-07 14:15:17 +02:00
aignatov-bio 704749bd09
Merge pull request #6164 from aignatov-bio/ai-sci-9253-fix-permissions-on-results 
Fix permissions on results [SCI-9253]
 2023-09-07 14:14:37 +02:00
wandji a59f94c5a9
Add RepositoryStockValueZipExport service and connect export consumption button [SCI-9023] (#6092) 
* Add RepositoryStockValueZipExport service and connect export consumption button [SCI-9023]

* Add consumption export modal and improve report generation [SCI-9023]

* Add repository_row association to repository_ledger_records [SCI-9023]
 2023-09-07 13:12:27 +02:00
Anton 53d08fe09d Fix permissions on results [SCI-9253] 2023-09-07 12:12:30 +02:00
aignatov-bio d2c0e3dca2
Merge pull request #6160 from aignatov-bio/ai-sci-9230-fix-navigator-css 
Fix navigator CSS [SCI-9230][SCI-9233]
 2023-09-07 12:03:07 +02:00
Martin Artnik bf7b1c2f2a Fix global search to work with new results [SCI-9244] 2023-09-07 11:43:45 +02:00
Gregor Lasnibat 6934ae38aa Fix wrong OVE file size [SCI-9243] 2023-09-07 11:36:17 +02:00
Anton 170187a5e5 Add step text title to print protocol [SCI-9249] 2023-09-07 10:59:38 +02:00
Martin Artnik 722ef7cc0f
Merge pull request #6158 from ivanscinote/SCI-8592-long-name-experiment-modal 
Fix long name experiment modal [SCI-8592]
 2023-09-07 10:49:53 +02:00
Anton 8f9072f46e Fix navigator CSS [SCI-9230][SCI-9233] 2023-09-07 10:45:50 +02:00
Martin Artnik 70bdb870b5
Merge pull request #6124 from artoscinote/ma_SCI_9209 
Fix attachment deletion and image errors [SCI-9209]
 2023-09-07 10:37:41 +02:00
Martin Artnik d9e8be91d9
Merge pull request #6153 from artoscinote/ma_SCI_9212 
Fix status flow loading when modal opens [SCI-9212]
 2023-09-07 10:37:25 +02:00
Anton 7af03bd651 Add move action to asset thumbnail [SCI-9210] 2023-09-07 10:33:33 +02:00
Ivan Kljun 368a6f62ea Fix long names also for canvas view modal [SCI-8592] 2023-09-07 10:09:18 +02:00
Giga Chubinidze 13fc4cceb1 hound fix 2023-09-07 03:59:11 +04:00
Giga Chubinidze c071eb4c16 Implement inline edit design changes for legacy inline edit (PET titles, etc.) 2023-09-07 03:56:42 +04:00
wandji a25e6fdda3
Add sorting options to experiment task table view [SCI-9120] (#6102) 2023-09-06 16:14:17 +02:00
Martin Artnik f22d777c2c Fix status flow loading when modal opens [SCI-9212] 2023-09-06 15:33:58 +02:00
Anton 1247406055 Add archive view to results [SCI-9223] 2023-09-06 15:06:27 +02:00
Alex Kriuchykhin 60f9814eca
Fix failed_delivery_notifiable_job concern naming [SCI-9119] (#6151) 2023-09-06 14:58:30 +02:00
G-Chubinidze 3976e05042
Merge branch 'features/september-release' into gc_SCI_9178 2023-09-06 16:38:25 +04:00
Giga Chubinidze 44cb0db41a removed object constantization 2023-09-06 16:36:26 +04:00
Martin Artnik 1e49cc5608
Merge pull request #6149 from G-Chubinidze/gc_SCI_9187 
Implement type-to-search functionality in the "Move to different results" modal [SCI-9187]
 2023-09-06 14:31:05 +02:00
Giga Chubinidze 76b7c45021 Implement type-to-search functionality in the 'Move to different result' modal [SCI-9187] 2023-09-06 16:12:31 +04:00
Gregor Lasnibat c030d2b6d1 Fix missing paperclip icon for file attachment [SCI-9224] 2023-09-06 13:52:03 +02:00
Alex Kriuchykhin eea24a69e9
Add FailureNotifiableJob jobs concerns for creating failure notifications for users [SCI-9119] (#6147) 2023-09-06 12:51:34 +02:00
Gregor Lasnibat f172c97a79 Fix missing OVE file preview [SCI-9214] 2023-09-06 12:45:42 +02:00
wandji d671471b44
Add autofocus to 2fa input field [SCI-9069] (#6145) 2023-09-06 12:40:58 +02:00
wandji dfce1e1382
Fix issue previewing large image after edit [SCI-8914] (#6143) 2023-09-06 11:43:51 +02:00
Martin Artnik 3b3e3cdc46
Merge pull request #6138 from ivanscinote/SCI-8592-long-name-experiment-modal 
Fix long names being cut off at move task modal [SCI-8592]
 2023-09-06 11:39:26 +02:00
Martin Artnik 33cd529967
Merge pull request #6144 from G-Chubinidze/gc_SCI_8798_v2 
Remove text when option is chosen in dropdown selector in add member to team [SCI-8798]
 2023-09-06 11:38:56 +02:00
wandji d5deb4fa52
Allow non-automatic user_assignments to be updated whe n user role is changed [SCI-9173] (#6137) 2023-09-06 11:06:22 +02:00
aignatov-bio b5883178a4
Merge pull request #6123 from ivanscinote/SCI-9016-inline-edit-component-ui-rework 
Rework inline edit vue component UI [SCI-9016]
 2023-09-06 10:49:18 +02:00
aignatov-bio 218b853577
Merge pull request #6139 from artoscinote/ma_SCI_9212 
Fix status flow modal to work across multiple pages [SCI-9212]
 2023-09-06 10:34:31 +02:00
Giga Chubinidze 6ade210728 Remove text when option is chosen in dropdown selector in add member to team [SCI-8798] 2023-09-05 19:07:18 +04:00
Giga Chubinidze 5a6202aea2 Unable to create a MarvinJS attachment [SCI-9178] 2023-09-05 18:29:15 +04:00
Anton 48b89fc699 Fix activities for results [SCI-9206][SCI-9205][SCI-9207] 2023-09-05 16:25:21 +02:00
Ivan Kljun c2b686324f Fix long names being cut off at move task modal [SCI-8592] 2023-09-05 15:58:50 +02:00
Martin Artnik 914697d4bf Fix status flow modal to work across multiple pages [SCI-9212] 2023-09-05 15:54:53 +02:00
Martin Artnik 94932d0b04 Fix attachment deletion and image errors [SCI-9209] 2023-09-05 14:43:16 +02:00
aignatov-bio 7a32703c1a
Merge branch 'features/september-release' into ai-sci-9088-add-attachments-move-ability 2023-09-05 14:41:23 +02:00
aignatov-bio 647fb76910
Merge branch 'features/september-release' into ai-sci-9108-add-infinite-scroll 2023-09-05 14:40:03 +02:00
aignatov-bio c33243b962
Merge pull request #6126 from aignatov-bio/ai-sci-9141-add-title-to-tinymce-fields 
Add title to text component [SCI-9141]
 2023-09-05 14:32:42 +02:00
aignatov-bio c3a5bf2e37
Merge pull request #6136 from aignatov-bio/ai-sci-9195-fix-tinymce-sticky-header 
Fix tinymce header [SCI-9195]
 2023-09-05 14:31:20 +02:00
Ivan Kljun a6abfc7e31 Applying hound suggestions [SCI-9016] 2023-09-05 13:39:21 +02:00
Oleksii Kriuchykhin 2c816cf463 Merge branch 'release/1.28.0' into develop 2023-09-05 12:54:37 +02:00
Alex Kriuchykhin 5928f708e1
Remove user controlled method execution from connected_accounts controller, add Okta unlinking functionality [SCI-9220] (#6135) 2023-09-05 12:53:51 +02:00
Anton b4659e88a9 Fix tinymce header [SCI-9195] 2023-09-05 12:06:48 +02:00
Alex Kriuchykhin 90cd330126
Fix removing user from public projects [SCI-9174] (#6130) 2023-09-05 11:36:26 +02:00
Ivan Kljun 86e2cfe747 Merge remote-tracking branch 'upstream/features/september-release' into SCI-9016-inline-edit-component-ui-rework 2023-09-05 11:31:30 +02:00
artoscinote 8d352b758a
Merge pull request #6133 from ivanscinote/SCI-9182-rearranging-content-within-a-result-modal-translation 
Use act_as_list for reordering result elements, localize title for result reordering modal [SCI-9182]
 2023-09-05 11:09:08 +02:00
Ivan Kljun 56744e2dcd Use act_as_list for reordering result elements, localize title for result reordering modal [SCI-9182] 2023-09-05 11:02:39 +02:00
artoscinote c59ee1c358
Merge pull request #6132 from G-Chubinidze/gc_SCI_9179 
Archiving results doesn't work [SCI-9179]
 2023-09-05 10:53:43 +02:00
Giga Chubinidze b7da98c1dd Archiving results doesn't work [SCI-9179] 2023-09-05 11:55:15 +04:00
artoscinote cdfe9aaa0c
Revert "Don't display icons in fields with errors (alignment issues) [SCI-9217]" 2023-09-05 09:21:40 +02:00
Oleksii Kriuchykhin 7b40b43922 Merge branch 'release/1.28.0' into develop 2023-09-04 16:01:46 +02:00
Alex Kriuchykhin df290ad3b3
Improve parameter filtering in activities filters and smart annotations [SCI-9218] (#6129) 2023-09-04 15:56:17 +02:00
Martin Artnik cc29ca4cce Don't display icons in fields with errors (alignment issues) [SCI-9217] 2023-09-04 15:17:22 +02:00
Ivan Kljun 54a8552901 Fix my_module_results_path and add id to experiments/tablejs tag [SCI-911] 2023-09-04 14:23:55 +02:00
Anton 86f413cc71 Add title to text component [SCI-9141] 2023-09-04 14:13:29 +02:00
Giga Chubinidze 3b8669ed84 Add timestamps to results [SCI-9181] 2023-09-04 11:40:32 +04:00
Gregor Lasnibat b382bb441e Fix save empty OVE [SCI-9193] 2023-09-02 06:44:30 +02:00
lasniscinote 178d46dfae
Merge pull request #6134 from lasniscinote/gl_SCI_9213 
Fix gene sequence attachment icons [SCI-9213]
 2023-09-05 12:58:19 +02:00
Alex Kriuchykhin f0fe040932
Fix OVE asset preview reloading after update [SCI-9112] (#6122) 2023-09-05 11:36:37 +02:00
Gregor Lasnibat 589faef72f Fix gene sequence attachment icons [SCI-9213] 2023-09-02 03:14:51 +02:00
Ivan Kljun 40638dbb63 Rework inline edit vue component UI [SCI-9016] 2023-09-01 17:18:13 +02:00
Martin Artnik cb023cd9c8 Add back status_flow.scss, deleted by accident 2023-09-01 13:59:58 +02:00
wandji c46c2ee9d6
Detach the File name changes from changing filename inside the OVE [SCI-9169] (#6116) 2023-09-01 13:54:41 +02:00
artoscinote dc535bce52
Merge pull request #6121 from G-Chubinidze/gc_SCI_9186 
Button translation in the "Move to different result" Modal [sci-9186]
 2023-09-01 11:40:57 +02:00
artoscinote 7b73e03a5f
Merge pull request #6120 from G-Chubinidze/gc_SCI_9185 
Placeholder text in the "Move to different result" modal dropdown [SCI-9185]
 2023-09-01 11:40:34 +02:00
Giga Chubinidze b71323d720 changed object mutation/changed placeholder check 2023-09-01 13:37:48 +04:00
artoscinote 51227b5c65
Merge pull request #6119 from G-Chubinidze/gc_SCI_9081 
Placeholder text (titles, description field) [SCI-9081]
 2023-09-01 11:02:06 +02:00
Martin Artnik 3724a4a067 Merge branch 'develop' into features/september-release 2023-09-01 10:30:48 +02:00
wandji bed7f574f0
Hide align toolbar option in OVE editor [SCI-9113] (#6113) 
* Hide align toolbar option in OVE editor [SCI-9113]

* Hide alligment toolbar in OVE editor [SCI-9113]
 2023-09-01 10:18:36 +02:00
Giga Chubinidze 6db9134065 Button translation in the "Move to different result" Modal 2023-09-01 11:59:56 +04:00
Giga Chubinidze 100fdde5ca Placeholder text in the "Move to different result" modal dropdown 2023-09-01 11:49:43 +04:00
artoscinote 19026b936d
Merge pull request #6117 from artoscinote/ma_SCI_9180 
Fix result assets when duplicating [SCI-9180]
 2023-08-31 16:00:50 +02:00
Anton d2ffaa209c Fix results CSS [SCI-9177] 2023-08-31 15:53:38 +02:00
Oleksii Kriuchykhin b4eb4d38e6 Merge branch 'develop' into features/ove-integration 2023-08-31 15:52:38 +02:00
Martin Artnik 65e55acc06 Fix result assets when duplicating [SCI-9180] 2023-08-31 15:38:56 +02:00
wandji 167abe5239
Add .json extension to OVE import tooltip [SCI-9116] (#6112) 
* Add .json extension to OVE import tooltip [SCI-9116]

* Override import and downlod tooltip values [SCI-9116]
 2023-08-31 12:51:49 +02:00
Alex Kriuchykhin d63ec9f927
Fix shareable links association on user model [SCI-9200] (#6114) 2023-08-31 11:48:35 +02:00
artoscinote 142504743d
Merge pull request #6109 from artoscinote/ma_SCI_9107 
Fix up result element duplicate endpoints [SCI-9107]
 2023-08-30 15:59:39 +02:00
Anton 2d76e628be Add infinite scroll to results [SCI-9108] 2023-08-30 15:51:23 +02:00
G-Chubinidze 7a1b1b5cf5
UI rework of thumbnail view asset controls [SCI-9015] (#6104) 
* UI rework of thumbnail view asset controls [SCI-9015]

* styling change css -> tailwind
 2023-08-30 15:42:55 +02:00
Martin Artnik 8245ad9738 Fix up result element duplicate endpoints [SCI-9107] 2023-08-30 14:54:38 +02:00
Alex Kriuchykhin fd58a23e55
Handle situations when file preview was not yet generated for shared tasks [SCI-9183] (#6106) 2023-08-30 13:30:12 +02:00
Martin Artnik c6e8bc1d2a Fix TinyMCE sticky header calculation [SCI-9184] 2023-08-30 13:28:36 +02:00
Anton e9cd01467d Add custom colors to tailwind config [SCI-9124] 2023-08-30 13:21:51 +02:00
Martin Artnik 9c1948998d Revert "Fix Protocols.io modal not loading any protocols [SCI-9167]" 
This reverts commit 983daa0e67.
 2023-08-30 13:09:20 +02:00
aignatov-bio f5235a9b9d
Merge pull request #6097 from aignatov-bio/ai-sci-8980-scrolling-on-task-page 
Add sticky scrolling to task page [SCI-8980]
 2023-08-30 11:54:28 +02:00
Anton c496d2c763 Fix transaction rollback [SCI-9088] 2023-08-30 11:48:16 +02:00
Anton 6a287fa54f Add sticky scrolling to task page [SCI-8980] 2023-08-30 11:09:27 +02:00
wandji 645b6dbe16
Add sort options to dashboard current task dropdown [SCI-9121] (#6103) 2023-08-30 09:51:41 +02:00
Martin Artnik d6ffb326d1 Display show more for experiment description if there are more than 2 lines [SCI-9096] 2023-08-29 17:03:34 +02:00
artoscinote ffb8c7c455
Merge pull request #6100 from scinote-eln/hotfix/1.28.0.2 
Hotfix/1.28.0.2
 2023-08-29 16:31:04 +02:00
artoscinote fabc9ddd1d
Merge pull request #6099 from okriuchykhin/ok_SCI_9170 
Add CSP tag to sign_in_halt layout [SCI-9170]
 2023-08-29 16:29:38 +02:00
Oleksii Kriuchykhin 75890a0053 Add CSP tag to sign_in_halt layout [SCI-9170] 2023-08-29 16:26:33 +02:00
Ivan Kljun d5066c1a5d Fix task status color on exp. list view [SCI-9159] 2023-08-29 16:12:00 +02:00
sboursen-scinote 983daa0e67 Fix Protocols.io modal not loading any protocols [SCI-9167] 
The JavaScript responsible for loading the list was attached to a
Partial that by itself was loaded using and AJAX request. Therefore,
The JavaScript was not being executed (no page reload). It was thus moved
to the parent partial (loaded on page reload) and called when the required
HTML is appended to the DOM.
 2023-08-29 14:26:07 +02:00
artoscinote 30cb9b0697
Fix RTE images in exports [SCI-9164] (#6095) 2023-08-29 13:50:43 +02:00
aignatov-bio e75d846930
Merge pull request #6085 from sboursen-scinote/sb_SCI-9138 
Fix description text area when creating a new team [SCI-9138]
 2023-08-29 10:33:06 +02:00
artoscinote c955c235d2
Fix user assignment endpoints [SCI-9150] (#6094) 
* Fix project assignments API endpoint [SCI-9150]

* Fix API endpoint for updating experiment assignments [SCI-9150]

* Fix API endpoint for updating task assignments [SCI-9150]
 2023-08-29 10:32:39 +02:00
artoscinote bb3a2f1c24
Fix applying resizable class [SCI-9137] (#6093) 2023-08-29 10:20:46 +02:00
aignatov-bio e8f839d719
Merge pull request #6088 from aignatov-bio/ai-sci-8977-ui-revamp-filters-modal 
Revamp filters flyouts [SCI-8977]
 2023-08-29 10:18:54 +02:00
wandji c80e99bdbc
Add protocol activity group for protocol step sequence assets [SCI-9087] (#6078) 2023-08-29 09:42:51 +02:00
sboursen-scinote 9f05f6d28b Fix description text area when creating a new team [SCI-9138] 2023-08-28 20:51:03 +02:00
aignatov-bio 1f382be2ca
Merge pull request #6091 from aignatov-bio/ai-sci-9144-fix-marvinjs-on-steps 
Fix marvinJS button initialisation [SCI-9144]
 2023-08-28 15:59:50 +02:00
Anton eb44724ece Fix marving JS button initialization [SCI-9144] 2023-08-28 15:53:58 +02:00
aignatov-bio 0cbcfadec9
Merge pull request #6090 from aignatov-bio/ai-sci-9149-fix-tinymce-in-safari 
Fix tinymce in safari [SCI-9149]
 2023-08-28 15:20:24 +02:00
Anton 8d7aa2aba5 Fix tinymce in safari [SCI-9149] 2023-08-28 15:17:15 +02:00
artoscinote 90f23cc61c
Fix API endpoints for user assignments [SCI-9150] (#6089) 
* Fix project assignments API endpoint [SCI-9150]

* Fix API endpoint for updating experiment assignments [SCI-9150]

* Fix API endpoint for updating task assignments [SCI-9150]
 2023-08-28 15:13:30 +02:00
Alex Kriuchykhin 165b7febcf
Fix JS errors on text results creation/editing [SCI-9140] (#6086) 2023-08-28 14:53:09 +02:00
Anton 171a996aec Revamp filters flyouts [SCI-8977] 2023-08-28 13:15:41 +02:00
G-Chubinidze bbffce5e03
Placeholder text (titles, description field) [SCI-9081] (#6087) 
* Placeholder text (titles, description field) [SCI-9081]

* removed serializer code

* Update table.vue
 2023-08-28 10:36:40 +02:00
Giga Chubinidze 0e2f9ff81d removed serializer code 2023-08-28 12:14:44 +04:00
artoscinote 953bd234f4
Merge pull request #6065 from ivanscinote/SCI-9007-update-colors 
Update 'Not started' status color at reports [SCI-9007]
 2023-08-28 09:56:25 +02:00
Alex Kriuchykhin a7aa06d18a
Fix error handling on new folder and project edit modals [SCI-9135] (#6082) 2023-08-28 09:37:11 +02:00
Giga Chubinidze 6d8d804c71 Placeholder text (titles, description field) [SCI-9081] 2023-08-28 10:32:08 +04:00
ajugo db4aa53f72
Merge pull request #5993 from sboursen-scinote/sb_SCI-9038 
Set sequence attachments file icon [SCI-9038]
 2023-08-25 21:53:22 +02:00
Ivan Kljun 90199d3590 Add method light_color? to my_module_status [SCI-9007] 2023-08-25 15:47:34 +02:00
Anton 6615c01cb4 Add input field with search history [SCI-9102] 2023-08-25 15:02:27 +02:00
wandji f4c48fe907
Fix label templates datatables height overflow [SCI-8559] (#6083) 2023-08-25 14:23:05 +02:00
Soufiane a19ab3b519
Fix OVE CSS issues [SCI-9114] (#6081) 
- Fix broken CSS import.
- Hide body scroll when editor is open.
- Fix editor header design.
 2023-08-25 14:22:37 +02:00
sboursen-scinote 195df7936f Use custom images for marvin and OVE [SCI-9038] 2023-08-25 13:59:18 +02:00
sboursen-scinote 0d7c9862ee Set sequence attachment icons [SCI-9038] 
- Fix edit action
- Add OVE icon to step attachment
- Add OVE icon to global search results
 2023-08-25 13:53:57 +02:00
Alex Kriuchykhin ac159c29ed
Fix task card due date setup modal [SCI-9139] (#6080) 2023-08-25 13:08:50 +02:00
wandji 61da3a12b9
Add menubar to ove editor [SCI-9115] (#6079) 
* Add menubar to ove editor [SCI-9115]
 2023-08-25 11:36:33 +02:00
Anton e66968357a Fix hound 2023-08-25 09:46:53 +02:00
ajugo 103b62798b
Return error if label template preview image is nil [SCI-9070] (#6077) 2023-08-24 16:45:34 +02:00
ajugo 5ea31337b7
Remove SSO buttons on forgotten password screen [SCI-9049] (#6076) 2023-08-24 16:44:04 +02:00
Soufiane e00a8bb7a3
Update logo across Scinote [SCI-8997] (#6058) 
- Update logo in PDF reports
- Update logo in Docx reports
- Update logo in sign-in page
 2023-08-24 16:27:33 +02:00
Anton f31d2b8912 Add move ability to attachments [SCI-9088] 2023-08-24 15:57:03 +02:00
Soufiane bed603c5d5
Fix design of sign in and signature modal [SCI-9109] (#6074) 2023-08-24 15:50:05 +02:00
wandji 962de09599
Add bootstrap-select to experiment clone modal and fix overflowing text [SCI-8559] (#6060) 
* Add bootstrap-select to experiment clone modal and fix overflowing text [SCI-8559]
 2023-08-24 15:49:22 +02:00
Alex Kriuchykhin 56e411f35e
Add export stock consumption buttons and permission helper [SCI-9022] (#6040) 2023-08-24 15:28:28 +02:00
ajugo 9d051556ec
CSS fixes for assigned items to task and task comment number [SCI-9104] (#6068) 2023-08-24 15:21:54 +02:00
ajugo fe58d9c864
Show team members counter in team table [SCI-5589] (#6073) 2023-08-24 15:15:06 +02:00
Alex Kriuchykhin 2a228d3350
Remove obsolete JS code inclusion from protocol_status_bar [SCI-9134] (#6072) 2023-08-24 15:13:52 +02:00
Alex Kriuchykhin c1e2128b04
Fix link to original file in docx protocol parser notification [SCI-9123] (#6070) 2023-08-24 15:13:41 +02:00
Martin Artnik dfa2afa480 Fix sticky tinyMCE menu offset [SCI-9131] 2023-08-24 14:21:30 +02:00
Martin Artnik 0faad52f6c Merge branch 'hotfix/1.28.0.1' into develop 2023-08-24 12:14:30 +02:00
ivanscinote 059530620b
Implement delegated event handling for rel='external' [SCI-8737] (#6050) 
* Replace tinymce target='_blank' with rel='external' [SCI-8737]

* Add noopener to rel='external' links
 2023-08-24 11:12:11 +02:00
artoscinote 97f406d0a8
Merge pull request #6063 from G-Chubinidze/gc_SCI_7976 
Fix gray background on tox button [SCI-7976]
 2023-08-24 11:08:13 +02:00
Giga Chubinidze 5cd7d2fb11 changed team management logic 2023-08-24 13:03:10 +04:00
G-Chubinidze d3901bd96f
Project card permission with not assigned team admin [SCI-8727] (#6045) 
Fix project card action permission checks
 2023-08-24 10:59:45 +02:00
Ivan Kljun 24a6150500 Add gray border to button 'Not started' at PDF reports 2023-08-24 09:34:17 +02:00
Alex Kriuchykhin 5b0b56e8f2
Fix assets inclusion on OVE editing page [SCI-8961] (#6057) 2023-08-24 09:26:32 +02:00
Soufiane 9d0f62824e
Remove blinking button from actiontoolbar when loading [SCI-9067] (#6062) 2023-08-24 09:19:35 +02:00
ajugo 9a38cbe578
Merge pull request #6061 from sboursen-scinote/sb_SCI-9093 
Fix multiple issues for August release [SCI-9093]
 2023-08-24 08:45:52 +02:00
Ivan Kljun 023a6fe0a8 Update 'Not started' button for reports [SCI-9007] 2023-08-24 08:31:07 +02:00
Giga Chubinidze 584a746018 Fix gray background on tox button [SCI-7976] 2023-08-24 09:47:24 +04:00
sboursen-scinote 51d491dc0a Fix multiple issues for August release [SCI-9093] 
- Restore draft background color is missing in RTE
- Shorten the Import item modal dropdown field
 2023-08-23 18:33:10 +02:00
ajugo bbe0aa29ea
Fix showing of project folder toolbar buttons [SCI-9099] (#6053) 
* Fix showing of project folder toolbar buttons [SCI-9099]

* Fix reading permission for all projects for team admins [SCI-9099]

* Fix check for team admin [SCI-9099]
 2023-08-23 18:05:20 +02:00
ajugo 207af995af
Fix display of tags on shareable task [SCI-8750] (#6059) 2023-08-23 18:04:01 +02:00
artoscinote 9f23fe557a
Add entity breadcrumbs to activity webhooks [SCI-9056] (#6056) 2023-08-23 16:49:17 +02:00
Alex Kriuchykhin 3c0389adc8
Make docx parser feature togglable [SCI-9094] (#6055) 2023-08-23 16:46:29 +02:00
wandji 207b302a03
Set margin for module protocol task content [SCI-9018] (#6044) 2023-08-23 15:59:11 +02:00
ajugo 253be93368
Fix loading of navigators [SCI-8797] (#5868) 2023-08-23 15:49:00 +02:00
ajugo 63f0f5a307
Disable adding step_files for protocol parser [SCI-8993] (#5990) 2023-08-23 15:44:27 +02:00
aignatov-bio 4f0909e298
Merge pull request #6054 from aignatov-bio/ai-sci-9027-move-task-status-to-secondary-navigation 
Move status flow css to independent scope [SCI-9027]
 2023-08-23 15:38:44 +02:00
Anton d99ba04e39 Move status flow css to independent scope [SCI-9027] 2023-08-23 15:37:18 +02:00
artoscinote 0bea4a06ef
Add result duplicate action [SCI-8959] (#6019) 2023-08-23 15:05:31 +02:00
artoscinote abd6e794e9
Merge pull request #6049 from artoscinote/ma_SCI_9013 
Implement result filters [SCI-9013]
 2023-08-23 15:03:24 +02:00
Ivan Kljun 39ed4b1b92 Hide Cancel/Save btns after click at Share task modal [SCI-9008] 2023-08-23 14:20:24 +02:00
Anton f964a7461d Move status block to secondary navigation [SCI-9027] 2023-08-23 14:03:41 +02:00
wandji 71bcc78243
Verify sequence asset preview for non-editable role and add css class [SCI-8967] (#6012) 
* Verify sequence asset preview for non-editable user role and add css class [SCI-8967]

* Add safe navigation operator when checking gene sequence blob meta asset_type [SCI-9867]
 2023-08-23 13:12:46 +02:00
Alex Kriuchykhin b08a94ced6
Remove What's new section from user preferences section [SCI-9098] (#6046) 2023-08-23 13:12:06 +02:00
artoscinote e1416e3efd
Merge branch 'features/september-release' into ma_SCI_9013 2023-08-23 12:01:14 +02:00
Martin Artnik b3965e5aca Implement result filters [SCI-9013] 2023-08-23 11:59:21 +02:00
Anton 3057ddd4cb Fix file name for result orderable 2023-08-23 11:36:53 +02:00
artoscinote e03920affd
Merge branch 'develop' into ma_SCI_8462 2023-08-23 11:21:32 +02:00
Martin Artnik 7abfa97224 Fix project public role picker [SCI-9084] 2023-08-23 11:00:58 +02:00
artoscinote e4ad77f00f
Merge pull request #6043 from G-Chubinidze/gc_SCI_7976 
Fixed gray background on tinymce crop button [SCI-7976]
 2023-08-22 16:35:59 +02:00
Giga Chubinidze 74c1691ae6 Fixed gray background on tinymce crop button 2023-08-22 18:33:09 +04:00
Anton beed1cdb9d Make top navigation and breadcrumbs collapsable [SCI-9090] 2023-08-22 16:24:34 +02:00
artoscinote f60243e424
Merge pull request #6041 from ivanscinote/SCI-9007-update-colors 
Fix 'Not started' status button at missing locations [SCI-9007]
 2023-08-22 15:19:05 +02:00
ivanscinote c8bc4bef01
Refactor new tab opening mechanism and update link options in TinyMCE v6 [SCI-8737] (#5866) 
Refactor new tab opening mechanism and update link options in TinyMCE v6 [SCI-8737]
 2023-08-22 14:59:34 +02:00
Ivan Kljun 28adb4956d Add 'Not started' btn to other views 2023-08-22 14:30:49 +02:00
wandji 196b6628ae
Add task protocol activities for gene sequence asset actions [SCI-8965] (#6013) 2023-08-22 14:24:43 +02:00
ajugo 9de4d455a5
Merge pull request #6018 from wandji20/wb-SCI-9078 
Hide welcome modal after initial page load shareable links [SCI-9078]
 2023-08-22 14:10:57 +02:00
aignatov-bio c111d287ef
Merge pull request #6039 from aignatov-bio/ai-sci-9024-add-move-modal-for-elements 
Add element movements between step and results [SCI-9024]
 2023-08-22 12:26:57 +02:00
artoscinote 8ba9b2df6a
Merge pull request #6038 from artoscinote/ma_SCI_9084 
Fix visibility checkbox for project edit modal [SCI-9084]
 2023-08-22 12:25:34 +02:00
wandji20 87f7a74e02 Use shareable link uuid for setting session storage value [SCI-9078] 2023-08-22 11:21:05 +01:00
Anton e9174ad158 Add element movements between step [SCI-9024] 2023-08-22 12:15:55 +02:00
Martin Artnik 75bad0e8bc Fix visibility checkbox for project edit modal [SCI-9084] 2023-08-22 12:05:32 +02:00
wandji20 d46e80ba9b Hide welcome modal using sessionStorage after first page load of shared link [SCI-9078] 2023-08-22 10:59:02 +01:00
artoscinote ea3984776c
Merge pull request #6037 from artoscinote/ma_SCI_9084 
Fix edit project modal [SCI-9084]
 2023-08-22 11:06:14 +02:00
Martin Artnik 82f490b445 Fix edit project modal [SCI-9084] 2023-08-22 11:04:34 +02:00
Andrej 29cddf5ef7 Merge branch 'develop' into features/ove-integration 2023-08-22 11:00:34 +02:00
Alex Kriuchykhin dbbc5775d4
Add unit column to ledger records, fix stock update records and their creation logic [SCI-9021] (#6034) 2023-08-22 10:47:58 +02:00
Andrej 35ecd064d2 Fix tinymce help plugin language inclusion [SCI-9086] 2023-08-22 10:24:45 +02:00
G-Chubinidze 1253511020
Merge pull request #6035 from G-Chubinidze/gc_SCI_9014 
Add thumbnail asset preview to list view assets [SCI-9014]
 2023-08-22 12:22:06 +04:00
Giga Chubinidze 76479f6bf7 hound fix 2023-08-22 06:02:30 +04:00
Giga Chubinidze c699095d1a Add thumbnail asset preview to list view assets [SCI-9014] 2023-08-22 05:55:20 +04:00
Soufiane 6bce3b40df
FIX: Shared task fails to load sometimes [SCI-9052] (#6027) 2023-08-21 16:47:18 +02:00
wandji 1d051aeb0f
Fix CSS UI issues for shareable links task sharing [SCI-9080] (#6031) 
* Fix css UI issues for shareable links task sharing [SCI-9080]
 2023-08-21 16:07:38 +02:00
artoscinote 2e55181510
Merge pull request #6033 from artoscinote/ma_SCI_8994 
Fix issues with repository columns [SCI-8994][SCI-8846]
 2023-08-21 16:07:00 +02:00
Martin Artnik 5312ddbff6 Fix issues with repository columns [SCI-8994][SCI-8846] 2023-08-21 15:59:17 +02:00
Anton 0161277380 Fix bootstrap in report [SCI-9085] 2023-08-21 15:26:58 +02:00
artoscinote 8f24e90ee4
Merge pull request #6030 from wandji20/wb-SCI-9074 
Fix css issue protocol template author edit [SCI-9074]
 2023-08-21 12:58:23 +02:00
artoscinote 6f5ef60ab1
Merge pull request #5733 from G-Chubinidze/gc_SCI_8727 
Project card permission with not assigned team admin [SCI-8727]
 2023-08-21 12:19:28 +02:00
G-Chubinidze afdfec5f71
Update projects_service.rb 2023-08-21 14:13:00 +04:00
Giga Chubinidze a391e6e6e1 changed loop 2023-08-21 14:08:17 +04:00
artoscinote d8da463dc2
Merge pull request #5956 from ivanscinote/SCI-9008-share-task-modal 
Move blur event to whole modal at Share task [SCI-9008]
 2023-08-21 12:04:54 +02:00
wandji20 b41b0b04f0 Fix css issue protocol template author edit [SCI-9074] 2023-08-21 11:01:07 +01:00
artoscinote 00167e30b0
Merge pull request #6029 from artoscinote/ma_SCI_8422 
Fix filtering of template tags [SCI-8422]
 2023-08-21 11:56:28 +02:00
Ivan Kljun 5902ee28e1 Remove blur event function as it is redundant 2023-08-21 11:52:57 +02:00
Martin Artnik fc18c76efd Fix filtering of template tags [SCI-8422] 2023-08-21 11:44:01 +02:00
ajugo 95e6006c6a
Merge pull request #6026 from rekonder/aj_SCI_9077 
Fix scrolling of the shareable links layout [SCI-9077]
 2023-08-21 11:36:44 +02:00
Anton 0780ed17b0 Fix conflicts 2023-08-21 11:34:34 +02:00
Anton 2d64d2fcbf Merge branch 'develop' into features/september-release 2023-08-21 11:25:27 +02:00
aignatov-bio 58eaaf98b9
Merge pull request #6028 from aignatov-bio/ai-sci-8536-fix-long-task-names 
Fix long task names [SCI-8536]
 2023-08-21 11:18:53 +02:00
Anton d135c86f70 Fix long task names [SCI-8536] 2023-08-21 11:17:09 +02:00
artoscinote de61c37a4e
Merge pull request #5706 from wandji20/wb-SCI-8559 
Fix CSS Issues[SCI-8559]
 2023-08-21 11:05:38 +02:00
Andrej ef4d360be8 Fix scrolling of the shareable links layout [SCI-9077] 2023-08-21 10:38:54 +02:00
wandji20 5e6138fa18 Replace unecessary margin value with tailwind value [SCI-9018] 2023-08-21 09:27:28 +01:00
wandji20 0ae44eb3a7 Use default tailwind size for task assigned protocol description [SCI-9018] 2023-08-21 09:27:28 +01:00
wandji20 7c07befd3e Fix CSS issues in protocols, and quick start(new task) [SCI-9018] 2023-08-21 09:27:28 +01:00
artoscinote 25f5afdcef
Merge pull request #6023 from G-Chubinidze/gc_SCI_8864 
UI changes of "Create new inventory" modal [SCI-8864]
 2023-08-21 10:25:29 +02:00
aignatov-bio 33476403a5
Merge pull request #6025 from aignatov-bio/ai-sci-9085-fix-report-css 
Fix report css [SCI-9085]
 2023-08-21 10:12:31 +02:00
Anton ded0ac1b9f Fix report css [SCI-9085] 2023-08-21 09:54:35 +02:00
Ivan Kljun 022c2ee9de Merge remote-tracking branch 'upstream/develop' into SCI-9008-share-task-modal 2023-08-21 09:53:28 +02:00
Ivan Kljun 0553b5b0dc Merge remote-tracking branch 'upstream/develop' into SCI-9008-share-task-modal 2023-08-21 09:32:59 +02:00
artoscinote 7b3d1b92c5
Merge pull request #5907 from ivanscinote/SCI-8893-navigator-freezes 
Create vue method for toggling navigator state [SCI-8893]
 2023-08-21 09:20:29 +02:00
Ivan Kljun b357e3117c Merge remote-tracking branch 'upstream/features/september-release' into SCI-8893-navigator-freezes 2023-08-21 09:16:32 +02:00
sboursen-scinote ca35ad0122 Fix shared task view issues [SCI-9076] 
- Fix task header effects when selected
 2023-08-21 09:15:46 +02:00
Ivan Kljun 0c1f47eada Add hound linter suggestion 2023-08-21 09:09:40 +02:00
Giga Chubinidze 620c76a975 UI changes of "Create new inventory" modal 2023-08-21 06:56:14 +04:00
Giga Chubinidze 3c588709be changed logic 2023-08-21 06:48:08 +04:00
artoscinote 3f754710ac
Merge pull request #6021 from ivanscinote/SCI-9007-update-colors 
Add .btn-not-started to task status flow modal [SCI-9007]
 2023-08-18 17:37:48 +02:00
Ivan Kljun f71c54dd74 Add .btn-not-started to task status flow modal [SCI-9007] 2023-08-18 17:21:26 +02:00
ajugo 6de239547e
Merge pull request #6020 from sboursen-scinote/sb_SCI-9019 
Table header not visible after creating a project/folder [SCI-9019]
 2023-08-18 16:34:15 +02:00
sboursen-scinote 2dc82c9ed9 Show table header in folder when creating the first project [SCI-9019] 2023-08-18 16:26:53 +02:00
Alex Kriuchykhin e3c23bd474
Merge pull request #6016 from sboursen-scinote/sb_SCI-9059 
Fix PDF report generation error [SCI-9059]
 2023-08-18 11:37:30 +02:00
Anton 37e1c46152 Hide result title in docx [SCI-9062] 2023-08-18 11:35:24 +02:00
sboursen-scinote 4d7fa93c06 Fix PDF report generation error [SCI-9059] 2023-08-18 11:23:49 +02:00
ajugo dcdbfefa91
Merge pull request #6011 from sboursen-scinote/sb_SCI-9066 
Fix small css issues [SCI-9066]
 2023-08-18 11:17:34 +02:00
Alex Kriuchykhin e9e15f015b
Merge pull request #6015 from okriuchykhin/ok_SCI_9079 
Fix move experiment modal form submission [SCI-9079]
 2023-08-18 11:13:10 +02:00
Ivan Kljun ca35e13893 Merge remote-tracking branch 'upstream/features/september-release' into SCI-8925-show-paragraphs-checklist 2023-08-18 11:12:49 +02:00
Oleksii Kriuchykhin c76fca0ab3 Fix move experiment modal form submission [SCI-9079] 2023-08-18 10:55:21 +02:00
Ivan Kljun 6918b3c568 Merge with develop and fix conflict [SCI-8928] 2023-08-18 10:54:07 +02:00
artoscinote 20c20012b2
Merge pull request #5863 from ivanscinote/SCI-8807-notifications 
Remove system notifications [SCI-8807]
 2023-08-18 10:28:05 +02:00
artoscinote 45791a764f
Merge pull request #6014 from wandji20/wb-SCI-9057 
Fix bug in new result table event delegation [SCI-9057]
 2023-08-18 10:13:36 +02:00
artoscinote 664819a7fc
Merge pull request #6008 from ivanscinote/SCI-9007-update-colors 
Update status and shared buttons design to Amanda [SCI-9007]
 2023-08-18 10:12:26 +02:00
artoscinote 35c0de4cef
Merge pull request #5882 from G-Chubinidze/gc_SCI_8933 
Fixed Inventory Calendar Header [SCI-8933]
 2023-08-18 10:07:32 +02:00
artoscinote c28b54c43b
Merge pull request #5937 from G-Chubinidze/gc_SCI_5605 
Some icons have the checkboard pattern applied to the background [SCI-5605]
 2023-08-18 10:04:06 +02:00
wandji20 cf3cb707fd Fix bug in new result table event delegation [SCI-9057] 2023-08-18 07:16:01 +01:00
sboursen-scinote a38158c788 Fix small css issues [SCI-9066] 2023-08-17 22:23:46 +02:00
Alex Kriuchykhin 67042ce254
Merge pull request #6003 from okriuchykhin/ok_SCI_9028 
Show only default label templates when feature is disabled [SCI-9028]
 2023-08-17 16:50:00 +02:00
artoscinote f21c1ba7c5
Merge pull request #6009 from artoscinote/ma_SCI_8959 
Add some basic result component layout [SCI-8959]
 2023-08-17 16:42:26 +02:00
Martin Artnik 23a8872e11 Add some basic result component layout [SCI-8959] 2023-08-17 16:32:42 +02:00
ajugo 813347dcf0
Merge pull request #6000 from rekonder/aj_SCI_8948 
Create new sequence attachment on task protocol step [SCI-8948]
 2023-08-17 15:57:23 +02:00
artoscinote 2cc49ec6b5
Merge pull request #6005 from wandji20/wb-SCI-9003 
Fix CSS style issues [SCI-9003]
 2023-08-17 15:48:07 +02:00
Soufiane 4f1ea84489
Add the promotion screen for Sequence editor (OVE) [SCI-8968] (#6007) 2023-08-17 15:39:32 +02:00
Ivan Kljun e3f111debc Remove whitespace 2023-08-17 15:31:04 +02:00
Ivan Kljun b96dc345dd Apply hound linter suggestions 2023-08-17 15:29:22 +02:00
ajugo dd80b4019b
Merge pull request #5942 from sboursen-scinote/sb_SCI-8987 
Fix micro-interactions for shareable links modals [SCI-8987]
 2023-08-17 15:28:43 +02:00
sboursen-scinote ef9368d2cb Fix micro-interactions for shareable links modals [SCI-8987] 2023-08-17 15:22:16 +02:00
Ivan Kljun 400c1cb303 Update status and shared buttons design to Amanda [SCI-9007] 2023-08-17 15:18:46 +02:00
ajugo 032655f4e7
Merge pull request #6002 from rekonder/aj_SCI_8986 
Show toast message on successful copy [SCI-8986]
 2023-08-17 15:14:05 +02:00
Alex Kriuchykhin d81e2a0e47
Merge pull request #5995 from aignatov-bio/ai-sci-9062-hide-result-title-if-results-not-selected 
Hide results title if results not selected [SCI-9062]
 2023-08-17 14:58:21 +02:00
Anton 622a8766bb Hide results title if results not selected [SCI-9062] 2023-08-17 14:51:40 +02:00
Alex Kriuchykhin fd1b7885f4
Merge pull request #6006 from rekonder/aj_SCI_9064 
Add checks for metadata on protocol import [SCI-9064]
 2023-08-17 14:31:09 +02:00
Andrej b07432a444 Add checks for metadata on protocol import [SCI-9064] 2023-08-17 14:20:44 +02:00
wandji20 4a3f8146e3 Fix CSS style issues [wb-SCI-9003] 2023-08-17 13:11:58 +01:00
Alex Kriuchykhin c356018965
Merge pull request #5918 from sboursen-scinote/sb_SCI-8981 
Share button is disabled for locked and archived tasks [SCI-8981]
 2023-08-17 14:10:09 +02:00
Anton 16eedcdade Revamp modals across app [SCI-8978] 2023-08-17 14:01:26 +02:00
Oleksii Kriuchykhin 14e49956f7 Show only default label templates when feature is disabled [SCI-9028] 2023-08-17 13:44:22 +02:00
Andrej 9a09fbc8ce Show toast message on successful copy [SCI-8986] 2023-08-17 11:21:53 +02:00
Oleksii Kriuchykhin 450f5df8ea Allow export of archived inventories [SCI-9060] 2023-08-17 11:20:26 +02:00
Andrej 6e8dda64b2 Create new sequence attachment on task protocol step [SCI-8948] 2023-08-17 09:38:44 +02:00
artoscinote 0082b858ec
Merge pull request #5983 from sboursen-scinote/sb_SCI-9042 
Add space after (A) in shareable links layout [SCI-9042]
 2023-08-17 09:00:01 +02:00
Giga Chubinidze 63ed250f4a Result action menu [SCI-8954] 2023-08-17 10:29:34 +04:00
sboursen-scinote ffa6e8bc51 Add space after (A) in shareable links layout [SCI-9042] 2023-08-16 21:10:10 +02:00
wandji20 25e6cbdbd8 Move inline JavaScript inclusion for new and edit result table to result_tables.js [SCI-9057] 2023-08-16 17:08:25 +01:00
sboursen-scinote d631098d9a Fix multiple issues with edit sequence on task protocol [SCI-8966] 
- Fix edit button label and icon
- Fix preview modal for gene-sequence
 2023-08-16 17:01:43 +02:00
Alex Kriuchykhin 975a197716
Merge pull request #5987 from ivanscinote/SCI-9034-shared-task-issues 
Fix moment.js import and showing preview thumbnail img at shared task [SCI-9034]
 2023-08-16 15:34:57 +02:00
Alex Kriuchykhin 5eea990881
Merge pull request #5980 from wandji20/wb-SCI-9058 
Move new and edit result asset inline Javascript to result_asset.js  [SCI-9058]
 2023-08-16 15:34:21 +02:00
Ivan Kljun 1ea77b4ac8 Apply hound linter suggestions 2023-08-16 15:28:28 +02:00
Ivan Kljun 843cbb06da Fix trigger load and error event in active_storage_previews 2023-08-16 15:27:09 +02:00
Alex Kriuchykhin 66a72dff5f
Merge pull request #5989 from okriuchykhin/ok_SCI_8817_v2 
Improve handling of responses from protocols parser [SCI-8817]
 2023-08-16 14:52:56 +02:00
Alex Kriuchykhin 0c304ec80c
Merge pull request #5994 from okriuchykhin/ok_SCI_9053_v2 
Fix calls of user assignment propagation jobs with optional assigned_by [SCI-9053]
 2023-08-16 14:51:46 +02:00
wandji20 ebcb784149 Move result asset new and edit event handler to result asset and delete files [SCI-9058] 2023-08-16 13:50:40 +01:00
Oleksii Kriuchykhin 5e29523c61 Fix calls of user assignment propagation jobs with optional assigned_by [SCI-9053] 2023-08-16 14:34:42 +02:00
Anton 1d21b40479 Fix long project and task names in report [SCI-9061] 2023-08-16 14:16:54 +02:00
Anton 005779b3d3 Fix long project and task names in report [SCI-9061] 2023-08-16 14:12:47 +02:00
Oleksii Kriuchykhin 2ab559be97 Improve handling of responses from protocols parser [SCI-8817] 2023-08-16 13:26:41 +02:00
aignatov-bio 3e5a3d24dd
Merge pull request #5988 from aignatov-bio/ai-sci-9012-fix-api-for-new-results 
Fix results api [SCI-9012]
 2023-08-16 13:23:20 +02:00
Anton ea299919e3 Fix results api [SCI-9012] 2023-08-16 11:45:37 +02:00
artoscinote 0062108996
Merge pull request #5984 from wandji20/wb-SCI-9043 
Fix inventory item CSS and set nonce shared file preview inline JavaScript [SCI-9043]
 2023-08-16 11:17:47 +02:00
artoscinote 92d2850800
Merge pull request #5985 from G-Chubinidze/gc_SCI_8725 
Reports table: changed minimum width to accommodate shrunk screen [SCI-8725]
 2023-08-16 11:17:15 +02:00
Alex Kriuchykhin 145b834e8a
Merge pull request #5935 from ivanscinote/SCI-8800-projects-table-double-load 
Add turbolinks-cache-control to no-preview [SCI-8800]
 2023-08-16 11:06:16 +02:00
wandji20 ad65de20ce Add space in curly braces for edit result asset form html property [SCI-9058] 2023-08-16 10:06:06 +01:00
Ivan Kljun 860a8efda7 Add moment.js to application.js.erb 2023-08-16 10:52:36 +02:00
Ivan Kljun 1880723c8c Fix moment.js import and showing preview thumbnail img at shared task [SCI-9034] 2023-08-16 10:49:34 +02:00
Martin Artnik 8d31c5eb3b Merge branch 'develop' into features/ove-integration 2023-08-16 10:41:26 +02:00
artoscinote 083bd4b1e2
Merge pull request #5827 from aignatov-bio/ai-sci-8843-fix-notification-infinite-scroll 
Fix infinite scroll for notifications [SCI-8843]
 2023-08-16 10:27:07 +02:00
ajugo 689f699d83
Merge pull request #5974 from sboursen-scinote/sb_SCI-8997 
Update Scinote logo in multiple pages [SCI-8997]
 2023-08-16 10:26:50 +02:00
sboursen-scinote dc27620d00 Make share button independent of task status flow or archived state [SCI-8981] 2023-08-16 10:22:55 +02:00
artoscinote b2b4c30ee2
Merge pull request #5978 from artoscinote/ma_SCI_8846 
Repository table fixes [SCI-8846]
 2023-08-16 10:17:45 +02:00
artoscinote 61f9acb9fa
Merge pull request #5981 from wandji20/wb-SCI-9057 
Set nonce for new and edit result table inline Javascript  [SCI-9057]
 2023-08-16 09:51:40 +02:00
ajugo f3fe21db5e
Merge pull request #5976 from sboursen-scinote/sb_SCI-9055 
Update font weights on shared tasks page [SCI-9055]
 2023-08-16 09:50:37 +02:00
Giga Chubinidze 55235969a7 changed minimum width to accomodate screen shrink 2023-08-16 10:22:20 +04:00
wandji20 b9e391e781 Fix inventory item CSS abd set nonce shared file preview inline JavaScript [SCI-9043] 2023-08-15 14:28:53 +01:00
sboursen-scinote dcaf55eeb2 Fix icon position for form password fields [SCI-9020] 2023-08-15 09:54:00 +02:00
wandji20 6d8e4670f1 Set nonce for new and edit result table inline javascript [SCI-9057] 2023-08-14 17:09:08 +01:00
wandji20 3fc5ac36b0 Set nonce for new and edit result asset inline javascript and fix image preview after editing [SCI-9058] 2023-08-14 16:48:00 +01:00
Martin Artnik 0471859545 Repository table fixes [SCI-8846] 2023-08-11 15:47:18 +02:00
Oleksii Kriuchykhin 5332cbc788 Pass user by id instead of serialized object for deleyed jobs [SCI-9053] 2023-08-11 15:31:29 +02:00
Anton 6e5fa5ccd7 Add create actions [SCI-8953] 2023-08-11 15:04:49 +02:00
sboursen-scinote 68d65222a6 Update the font weights on shared tasks page [SCI-9055] 2023-08-11 15:00:17 +02:00
sboursen-scinote 4d6adace9f Update Scinote logo in multiple pages [SCI-8997] 
- In public error pages.
- In sign_in_halt.
 2023-08-11 14:19:24 +02:00
Alex Kriuchykhin acb1a034a8
Fix assets inclusion in sign_in_halt layout [SCI-9044] (#5973) 2023-08-11 13:52:30 +02:00
Alex Kriuchykhin a3bc894df8
Fix repository creation modal [SCI-9045] (#5971) 2023-08-11 13:44:26 +02:00
wandji f8a3640c4c
Move snapshot of deleted inventories to the bottom of inventory list in report wizard [SCI-8487] (#5972) 2023-08-11 13:37:26 +02:00
artoscinote a5f14a8333
Merge pull request #5970 from wandji20/wb-SCI-9003 
Fix Css issues [SCI-9003]
 2023-08-11 13:13:51 +02:00
wandji20 e27c6174b4 Move unnecessary jquery style update to teams.scss stylesheet [SCI-9003] 2023-08-11 12:11:22 +01:00
artoscinote e401ff308b
Merge pull request #5968 from sboursen-scinote/sb_SCI-9020 
Fix multiple CSS issues [SCI-9020]
 2023-08-11 11:49:03 +02:00
wandji20 52fc7eb0e8 Fix Css issues [SCI-9003] 2023-08-11 10:45:51 +01:00
Anton a46674b3a3 Fix small bootstrap issues [SCI-9051] 2023-08-11 11:34:11 +02:00
sboursen-scinote 55e73dbfe9 Fix multiple CSS issues [SCI-9020] 2023-08-11 11:28:55 +02:00
Anton f6191dbb67 Add elements and attachments to new result [SCI-8953] 2023-08-11 11:03:26 +02:00
ivanscinote e9ac5bed82
Fix rendering team table [SCI-9039] (#5967) 
* Fix rendering team table [SCI-9039]

* Remove unused def_delegator
 2023-08-11 10:52:47 +02:00
artoscinote 8a72c4ca02
Merge pull request #5966 from G-Chubinidze/gc_SCI_9001 
Smart annotation modal- inventories are out of modal [SCI-9001]
 2023-08-11 10:21:11 +02:00
Giga Chubinidze 26eba7da64 Smart annotation modal- inventories are out of modal [SCI-9001] 2023-08-10 22:41:39 +04:00
Giga Chubinidze 348d467d02 Non team owner user does not have access to archive inventory [SCI-8955] 2023-08-10 22:26:45 +04:00
Alex Kriuchykhin a4ea995027
Revert to using intermediate jquery_bundle file [SCI-9031] (#5962) 2023-08-10 17:19:28 +02:00
Alex Kriuchykhin c6a545d8b3
Fix Turbolinks redirects with ajax requests, add JQuery migration library [SCI-9031] (#5961) 2023-08-10 16:25:04 +02:00
Anton ac37885885 Merge branch 'develop' into features/september-release 2023-08-10 15:01:58 +02:00
aignatov-bio acab34679d
Merge pull request #5960 from aignatov-bio/ai-test-jquery-pr 
Restore bootstrap overrides
 2023-08-10 14:43:12 +02:00
Anton 3c0ccc730f Restore bootstrap overrides 2023-08-10 14:36:06 +02:00
artoscinote c8d11306fc
Merge pull request #5958 from sboursen-scinote/sb_SCI-9042 
Update shared task title [SCI-9042]
 2023-08-10 13:31:24 +02:00
artoscinote c1a408f0c5
Merge pull request #5954 from ivanscinote/SCI-9039-viewing-team-page 
Remove bootstrap_form_tag [SCI-9039]
 2023-08-10 13:30:59 +02:00