Commit graph

4593 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
9e67b20b38 Merge branch 'features/october-release' into develop 2023-10-12 15:40:21 +02:00
ajugo
c55c9e2596
Fix button permission for the shareable link on task [SCI-9517] (#6427) 2023-10-12 15:36:00 +02:00
Gregor Lasnibat
60d79be220
Working on item card interactions, implemented close on click outside [SCI-9470] (#6401)
Fixed date format, checklist content, active/archived state [SCI-9470]

Fixed date formatting on BE [SCI-9470]
2023-10-12 15:26:41 +02:00
Ivan Kljun
d34d424b0f Make navigator resizable [SCI-9318] 2023-10-12 14:45:51 +02:00
ajugo
357eebee40
Fix stock export on task [SCI-9477] (#6400) 2023-10-12 14:43:17 +02:00
Giga Chubinidze
3502d96674 CSS: Signatures modal issues [SCI-9489] 2023-10-12 10:52:55 +04:00
Anton
84477cad43 Update css for shared protocol [SCI-9476] 2023-10-11 11:41:34 +02:00
Oleksii Kriuchykhin
e08304d0cd Merge branch 'develop' into features/inventory-item-card-edit 2023-10-11 10:51:51 +02:00
wandji
d236ba0a5b
Add reminders to item card [SCI-9154] (#6285)
* Add reminders to item card [SCI-9154]

* Refactor item card reminder component [SCI-9154]
2023-10-11 09:35:10 +02:00
Oleksii Kriuchykhin
5c5319d80d Fix file preview generation issues in export all [SCI-9461] 2023-10-10 15:30:15 +02:00
Andrej
79118effa7 Merge branch 'develop' into features/october-release 2023-10-10 11:09:04 +02:00
Giga Chubinidze
cad028bd1a CSS: Various issues on task page [SCI-9473] 2023-10-10 12:28:26 +04:00
Martin Artnik
43f89b93ea
Merge pull request #6367 from mvrazic/e2e
Update e2e
2023-10-09 11:21:47 +02:00
Martin Artnik
e6834d0b74
Merge pull request #6387 from ivanscinote/SCI-9464-missing-content-to-exported-project-report-pdf-docx-file
Fix pdf reports [SCI-9464]
2023-10-09 11:01:33 +02:00
Ivan Kljun
879b03ad3d Fix pdf reports [SCI-9464] 2023-10-09 10:49:07 +02:00
Oleksii Kriuchykhin
c51612c2a1 Merge branch 'develop' into e2e 2023-10-09 10:26:00 +02:00
Andrej
ab49c52054 Fix css for item card [SCI-9475] 2023-10-09 09:33:38 +02:00
Martin Artnik
60acd42614
Merge pull request #6378 from lasniscinote/gl_SCI_9435
Not responsive task page [SCI-9435]
2023-10-09 09:14:34 +02:00
Gregor Lasnibat
cce02b29ed Fixed overflowing text, breaking buttons in new line, figuring out how header stacking works (flickering bug) [SCI-9435]
Fixed header stack stuttering [SCI-9435]

PR fix 01 [SCI-9435]
2023-10-08 16:07:05 +02:00
Alex Kriuchykhin
6da8725a46
Merge pull request #6373 from okriuchykhin/ok_SCI_9136
Hide task share button if user has no permissions for task sharing [SCI-9136]
2023-10-06 15:12:34 +02:00
Oleksii Kriuchykhin
16fda4adfb Hide task share button if user has no permissions for task sharing [SCI-9136] 2023-10-06 14:05:51 +02:00
Martin Artnik
5265312125
Merge pull request #6365 from G-Chubinidze/gc_SCI_9398
Misalignments on the log in page when 2FA is enforced [SCI-9398]
2023-10-06 09:40:43 +02:00
Giga Chubinidze
4399b6cc0a Misalignments on the log in page when 2FA is enforced [SCI-9398] 2023-10-06 10:32:47 +04:00
Martin Vražič
9a5717d6e2 added e2e tags to the main containers and two items 2023-10-05 17:39:44 +02:00
Martin Artnik
19c44c50ff
Merge pull request #6363 from artoscinote/ma_SCI_9410
Fix attachment issues [SCI-9410]
2023-10-05 16:42:10 +02:00
Martin Artnik
5c7ee78cd6 Fix attachment issues [SCI-9410] 2023-10-05 15:44:41 +02:00
Alex Kriuchykhin
e48fc19546
Merge pull request #6361 from sboursen-scinote/sb_SCI-9468
Import from Protocols.io not loading protocols [SCI-9468]
2023-10-05 15:35:44 +02:00
wandji20
36ff372b30 Small improvement [SCI-9420] 2023-10-05 14:23:10 +01:00
wandji20
d3c2a7e0ad Fix issue with timestamps for reports [SCI-9420] 2023-10-05 12:25:08 +01:00
sboursen-scinote
9b24bf9504 Fix Protocols.io modal not loading any protocols [SCI-9468]
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-10-05 12:03:05 +02:00
wandji20
6358ad2da4 Fix issue with protocol and result text name [SCI-9420] 2023-10-05 08:08:49 +01:00
Martin Artnik
1c84a97bd7
Merge pull request #6360 from G-Chubinidze/gc_SCI_9405
Projects table header covered by top toolbar on some breakpoint [SCI-9405]
2023-10-05 09:06:12 +02:00
Giga Chubinidze
3dbdbf02f8 Projects table header covered by top toolbar on some breakpoint [SCI-9405] 2023-10-05 02:44:30 +04:00
Martin Artnik
bcf7039fee
Merge pull request #6355 from artoscinote/ma_SCI_9428
Fix z-index of task tab toolbar [SCI-9428]
2023-10-04 15:43:02 +02:00
Martin Artnik
b545b6fdf9 Fix z-index of task tab toolbar [SCI-9428] 2023-10-04 14:22:17 +02:00
Oleksii Kriuchykhin
421ba27a6f Merge branch 'release/1.28.0' into develop 2023-10-04 13:19:31 +02:00
Martin Artnik
6f45980648
Merge pull request #6335 from ivanscinote/SCI-9407-css-consumption-modals-assign-to-task-modal-issues
Fix UI for consumption/edit stock/assign to task modals [SCI-9407]
2023-10-04 12:51:59 +02:00
Martin Artnik
b15cedd198
Merge pull request #6345 from G-Chubinidze/gc_SCI_9438
CSS: Incorrect icons on large PDF previews & caret on task activity [SCI-9438]
2023-10-04 12:51:20 +02:00
Martin Artnik
f3900baadc
Merge pull request #6347 from artoscinote/ma_SCI_9339
Shared task designated users style fix [SCI-9339]
2023-10-04 12:50:23 +02:00
ivanscinote
a4d0d71f18
Merge branch 'develop' into SCI-9407-css-consumption-modals-assign-to-task-modal-issues 2023-10-04 11:00:33 +02:00
Martin Artnik
03b12e0a22 Shared task designated users style fix [SCI-9339] 2023-10-04 09:56:09 +02:00
Martin Artnik
1f5ecfba33
Merge pull request #6344 from G-Chubinidze/gc_SCI_9447
Wrong icon on the Export button in bottom toolbar & Manage columns back button [SCI-9447]
2023-10-04 09:25:01 +02:00
Giga Chubinidze
b4247391a5 CSS: Incorrect icons on large PDF previews & caret on task activity [SCI-9438] 2023-10-04 05:36:03 +04:00
Giga Chubinidze
615d6ebbfa Wrong icon on the Export button in bottom toolbar & Manage columns back button [SCI-9447] 2023-10-04 04:56:17 +04:00
Martin Artnik
5960446401
Merge pull request #6320 from wandji20/wb-SCI-9406
Add helper method to show grey layout background [SCI-9406]
2023-10-03 16:43:18 +02:00
Martin Artnik
2d9c6ae249
Merge pull request #6339 from artoscinote/ma_SCI_9339
Fix broken shared task styling [SCI-9339]
2023-10-03 15:12:48 +02:00
Martin Artnik
c9e3055a22 Fix broken shared task styling [SCI-9339] 2023-10-03 14:26:06 +02:00
wandji20
dd34e72fb9 Add helper method to show grey layout background [SCI-9406] 2023-10-03 12:48:31 +01:00
Alex Kriuchykhin
f3f4fc1ad0
Merge pull request #6333 from okriuchykhin/ok_SCI_9368
Use custom sanitizer config for PDF reports generation [SCI-9368]
2023-10-03 13:09:50 +02:00
Alex Kriuchykhin
a000f0e67e
Merge pull request #6303 from wandji20/wb-SCI-9157
Add export button to item card [SCI-9157]
2023-10-03 12:52:03 +02:00
wandji20
2372edcf25 Add export button to item card [SCI-9157] 2023-10-03 10:52:57 +01:00
Ivan Kljun
667025b7c6 Fix UI for consumption/edit stock/assign to task modals [SCI-9407] 2023-10-03 11:12:03 +02:00
wandji20
4f5ecf66f4 Update OVE package and fix bug opening github issue link [SCI-9359] 2023-10-03 09:54:54 +01:00
Martin Artnik
03d6d99f7e
Merge pull request #6323 from G-Chubinidze/gc_SCI_9332
Smart annotation modal: inventory name not correct [SCI-9332]
2023-10-03 10:39:23 +02:00
Giga Chubinidze
de2023c873 removed unnecessary tw classes 2023-10-03 12:38:40 +04:00
Alex Kriuchykhin
40b6078ab2
Merge pull request #6312 from rekonder/aj_SCI_9386
Refactor export stock consumption modal [SCI-9386]
2023-10-03 10:33:00 +02:00
Oleksii Kriuchykhin
d9404df361 Use custom sanitizer config for PDF reports generation [SCI-9368] 2023-10-03 09:39:47 +02:00
Gregor Lasnibat
80de7483eb Prepare a modal displaying relationships for a specific item [SCI-9357] 2023-10-03 09:33:39 +02:00
Andrej
835cfb5e07 Refactor export stock consumption modal [SCI-9386] 2023-10-03 09:27:10 +02:00
Andrej
1aa9091e0d Fix protocol parser import button closing [SCI-9275] 2023-10-03 09:13:20 +02:00
Giga Chubinidze
f99db28760 using tailwind 2023-10-03 11:04:38 +04:00
wandji20
7b9e4088de Update OVE package and fix bug opening github issue link [SCI-9359] 2023-10-02 23:33:46 +01:00
G-Chubinidze
fbdd5a8165
Revert "Organization settings (org. admin) - allowing the use of protocols for AI [SCI-9324]" 2023-10-02 12:28:29 +04:00
Giga Chubinidze
3932b22cd4 Smart annotation modal: inventory name not correct [SCI-9332] 2023-10-02 08:14:16 +04:00
Martin Artnik
a1df2b7b52
Merge pull request #6314 from G-Chubinidze/gc_SCI_9245_V2
DOCX not working if result name empty. [SCI-9245]
2023-09-29 12:24:18 +02:00
Giga Chubinidze
0be8ab5839 used i18n 2023-09-29 14:18:45 +04:00
Martin Artnik
0cb3c8bc62
Merge pull request #6313 from G-Chubinidze/gc_SCI_9324
Organization settings (org. admin) - allowing the use of protocols for AI [SCI-9324]
2023-09-29 11:49:26 +02:00
Giga Chubinidze
005bf93197 Organization settings (org. admin) - allowing the use of protocols for AI [SCI-9324] 2023-09-29 11:51:25 +04:00
Giga Chubinidze
07ce65f5e6 DOCX not working if result name empty. 2023-09-29 10:38:27 +04:00
Martin Artnik
7319ac5b50
Merge pull request #6310 from artoscinote/ma_SCI_9328
Fix linked protocol dropdown [SCI-9328]
2023-09-28 15:46:37 +02:00
Martin Artnik
82b9b676b6 Fix linked protocol dropdown [SCI-9328] 2023-09-28 15:40:48 +02:00
Martin Artnik
6e405d40a6 Refactor datepicker limits [SCI-9338] 2023-09-28 13:33:17 +02:00
Gregor Lasnibat
f352c7f186 Working on new behaviour for switching between item clicks [SCI-9354]
Working on scrolling and highlighting [SCI-9354]

Item card preload and section title animation [SCI-9354]

Added box-shadow [SCI-9354]

Refactored logic and styles [SCI-9354]

PR fix, added back the missing HighlightComponent [SCI-9354]

PR fixes, refactoring [SCI-9354]

PR fix [SCI-9354]

Fixed scrolling to 'Assigned', highlighting [SCI-9354]

PR fix, modular logic, rename [SCI-9354]
2023-09-28 13:21:20 +02:00
Alex Kriuchykhin
ba5ef94764
Merge pull request #6253 from rekonder/aj_SCI_9155_tmp
Add assigned tasks block to the item card [SCI-9155]
2023-09-27 15:03:20 +02:00
Martin Artnik
d86da2d145
Merge pull request #6207 from ivanscinote/SCI-9217-eye-icons-out-of-placeholder-placeholder-height
Fix eye icon placement in password fields [SCI-9217]
2023-09-27 14:19:41 +02:00
Andrej
5e5010632d Fix naming in assigned my module helper [SCI-9155] 2023-09-27 11:44:08 +02:00
Alex Kriuchykhin
8cf26d7a90
Merge pull request #6283 from rekonder/aj_SCI_9162
Fix css for importing inventory [SCI-9162]
2023-09-26 15:07:15 +02:00
Andrej
9641c75a4a Merge branch 'develop' of https://github.com/scinote-eln/scinote-web into aj_SCI_9275 2023-09-26 11:23:25 +02:00
Andrej
1aa9b17b1a Add relationship column to the inventory [SCI-9356] 2023-09-26 11:12:45 +02:00
Oleksii Kriuchykhin
d69b7cc6e8 Merge branch 'develop' into features/october-release 2023-09-26 11:11:30 +02:00
Ivan Kljun
0794b4bdc7 Fix dropdown always open on protocol templates [SCI-9333] 2023-09-26 09:11:54 +02:00
Andrej
4e6ccce9dd Merge branch 'features/october-release' of https://github.com/scinote-eln/scinote-web into aj_SCI_9155_tmp 2023-09-25 11:49:51 +02:00
Andrej
e0355bd75a Fix generation of labels [SCI-9155] 2023-09-25 11:47:30 +02:00
wandji
7dac5e63be
Add navigation section to item card [SCI-9154] (#6252) 2023-09-25 10:49:09 +02:00
wandji
5314ef14c7
Revert "Add navigation section to item card [SCI-9154] (#6268)" (#6284)
This reverts commit 7430f2240d.
2023-09-25 10:46:19 +02:00
Martin Artnik
3a22d7715d Merge branch 'develop' into features/september-release 2023-09-25 10:37:40 +02:00
wandji
7430f2240d
Add navigation section to item card [SCI-9154] (#6268) 2023-09-25 09:53:12 +02:00
Andrej
65affdf639 Fix css for importing inventory [SCI-9162] 2023-09-25 09:06:13 +02:00
Andrej
9ca96145d5 Merge branch 'features/october-release' of https://github.com/scinote-eln/scinote-web into aj_SCI_9155_tmp 2023-09-25 08:05:28 +02:00
Andrej
2478918aa6 Fix protocol parser flyout and notifications [SCI-9275] 2023-09-25 07:55:43 +02:00
Anton
6c8447beac Fix status color 2023-09-22 14:46:10 +02:00
Alex Kriuchykhin
50a87b1562
Merge pull request #6235 from wandji20/wb-SCI-8914
Fix issue previweing and realoding assets on hover and after viewmode change [SCI-8914]
2023-09-22 14:14:38 +02:00
Alex Kriuchykhin
c817c269cb
Merge pull request #6270 from lasniscinote/gl_SCI_9153
Refactoring RepositoryItemSidebar and custom columns [SCI-9153]
2023-09-22 14:13:54 +02:00
Anton
ad3cd98d6e CSS fixes protocol page 2023-09-22 11:59:39 +02:00
wandji20
3dd7d0fdb3 Fix issue previweing and realoding assets on hover and after viewmode change [SCI-8914] 2023-09-22 09:36:07 +01:00
sboursen-scinote
adc0a460bd Improve logic for custom logos on error pages [SCI-9147]
- Switch to dynamic ERB templates.
- Move text to I18n
2023-09-22 10:26:32 +02:00
Gregor Lasnibat
1bf2bc6156 Refactoring RepositoryItemSidebar and custom columns [SCI-9153]
Fixed regular card (without cusotm columns) styles [SCI-9153]

Updated API to return column name, working on subcomponents [SCI-9153]

TooltipPreview on dynamic file component working [SCI-9153]

Finished new item card refactor [SCI-9153]

PR fix 01 [SCI-9153]

PR fixes 02 [SCI-9153]
2023-09-21 20:18:20 +02:00
Alex Kriuchykhin
5cc41451cd
Merge pull request #6254 from sboursen-scinote/sb_SCI-9133
Fix missing icon files in exported projects [SCI-9133]
2023-09-21 17:12:08 +02:00
Martin Vražič
9d0fe1cd59 Merge branch 'develop' into e2e
Latest state from the dev. branch.
2023-09-21 15:30:44 +02:00
sboursen-scinote
aa769f92f7 Fix missing icon files in exported projects [SCI-9133] 2023-09-21 15:11:02 +02:00
Anton
97999028ef Fix modals after revamp [SCI-9330] 2023-09-21 12:52:55 +02:00
sboursen-scinote
90b9813083 Remove the Experiment ID displayed in the three dots menu dropdown [SCI-9215] 2023-09-21 11:38:09 +02:00
aignatov-bio
2ab4d2b8dc
Merge pull request #6263 from aignatov-bio/ai-sci-9319-update-protocol-template-screen
Update protocol template screen [SCI-9319]
2023-09-21 10:39:16 +02:00
Anton
40144ea33f Update protocol template screen [SCI-9319] 2023-09-21 10:37:58 +02:00
aignatov-bio
ecd00a4f4f
Merge pull request #6262 from aignatov-bio/ai-sci-9342-fix-task-details-section-css
Task details css fixes [SCI-9342]
2023-09-21 10:20:00 +02:00
Martin Artnik
810e0ffaff
Merge pull request #6261 from G-Chubinidze/gc_SCI_9269
CSS: Results revamp issues [SCI-9269]
2023-09-21 10:00:14 +02:00
Anton
ce2d91025c Task details css fixes [SCI-9342] 2023-09-21 09:48:46 +02:00
Alex Kriuchykhin
04e191e377
Merge pull request #6259 from wandji20/wb-SCI-9191
Fix issue displaying long tables protocol description in import modal [SCI-9191]
2023-09-21 09:26:25 +02:00
Giga Chubinidze
eb5d09e2fb CSS: Results revamp issues 2023-09-21 10:52:41 +04:00
Alex Kriuchykhin
8e1f8296f4
Merge pull request #6243 from rekonder/aj_SCI_9272
Fix message for successful import protocol from protocol parser [SCI-9272]
2023-09-20 19:36:12 +02:00
wandji20
ca8e6d88dc Fix issue displaying long tables protocol description in impor modal [SCI-9191] 2023-09-20 15:04:10 +01:00
Martin Artnik
5983ecb2bd
Merge pull request #6255 from artoscinote/ma_SCI_9348
Clean up legacy comment logic [SCI-9348]
2023-09-20 13:10:28 +02:00
Martin Artnik
44394fa1b6 Clean up legacy comment logic [SCI-9348] 2023-09-20 13:07:30 +02:00
Anton
d46ee2adf6 Fix task secondary navigation on small screens [SCI-9305] 2023-09-20 12:30:15 +02:00
Andrej
b47651750b Fix message for successful import protocol from protocol parser [SCI-9272] 2023-09-19 15:47:51 +02:00
Andrej
56a57233df Add assigned tasks block to the item card [SCI-9155] 2023-09-19 15:40:32 +02:00
aignatov-bio
dcce202f78
Merge pull request #6248 from aignatov-bio/ai-sci-9274-fix-legacy-inline-editing
Fix legacy inline editing [SCI-9274]
2023-09-19 13:49:13 +02:00
aignatov-bio
5626bdef4b
Merge pull request #6247 from aignatov-bio/ai-sci-9260-fix-wopi
Fix wopi and pdf preview [SCI-9260]
2023-09-19 13:17:42 +02:00
Anton
ab8deeb181 Fix legacy inline editing [SCI-9274] 2023-09-19 13:17:23 +02:00
Anton
370508304b Fix wopi and pdf preview [SCI-9260] 2023-09-19 12:44:28 +02:00
Alex Kriuchykhin
7825433ac2
Merge pull request #6242 from rekonder/aj_SCI_9273
Insert the correct link for protocol parser import in the email notification [SCI-9273]
2023-09-19 09:54:05 +02:00
Oleksii Kriuchykhin
3b170a0c0d Connect backend to the new item card [SCI-9313] 2023-09-18 16:42:01 +02:00
Andrej
5e4f156ae5 Insert correct link for protocol parser import in email notification [SCI-9273] 2023-09-18 15:30:11 +02:00
Martin Artnik
8784add939
Merge pull request #6240 from artoscinote/ma_SCI_9211
Fix report generation with text results [SCI-9211]
2023-09-18 15:07:05 +02:00
Martin Artnik
2f4b1ef7b0 Fix report generation with text results [SCI-9211] 2023-09-18 15:01:13 +02:00
Martin Artnik
9aa4274702
Merge pull request #6237 from lasniscinote/gl_SCI_9188
Fixed misplaced checkbox for archived task [SCI-9188]
2023-09-18 14:42:00 +02:00
Gregor Lasnibat
6efdc75f45 Fixed misplaced checkbox for archived task [SCI-9188]
Fixed linter issues [SCI-9188]
2023-09-18 13:41:58 +02:00
Andrej
aebea07be4 Change dropdown options for importing protocols [SCI-9288] 2023-09-18 13:15:55 +02:00
Andrej
9f672ecfe2 Move OVE trial period handling [SCI-9301] 2023-09-15 16:07:10 +02:00
Oleksii Kriuchykhin
36f4e22fa3 Merge branch 'develop' into features/october-release 2023-09-15 14:08:45 +02:00
wandji20
0b0eddd62b Add default columns to inventory item card [SCI-9151] 2023-09-15 11:39:42 +01:00
Oleksii Kriuchykhin
4e16d702bd Fix next page loading for global and task activities [SCI-9175] 2023-09-15 12:34:27 +02:00
Martin Artnik
160d9775d8 Merge branch 'develop' into features/september-release 2023-09-15 10:40:55 +02:00
Andrej
b9fe7c3d3e Fix gene sequence html compiling with deface [SCI-9032] 2023-09-14 17:10:52 +02:00
Anton
af0fbfeec0 Merge branch 'develop' into features/september-release 2023-09-14 13:45:40 +02:00
Martin Artnik
1421de018a
Merge pull request #6182 from G-Chubinidze/gc_SCI_9245
Ensure reports work with new results [SCI-9245]
2023-09-14 10:37:15 +02:00
Giga Chubinidze
bf1a543e94 refactored to result orderable element assoc 2023-09-14 06:25:38 +04:00
Martin Vražič
b0f3628ee9 changing previous naming at left menu & adding e2e tags on project section 2023-09-13 23:40:50 +02:00
Alex Kriuchykhin
40a82f67c0
Merge pull request #6216 from scinote-eln/features/ove-integration
Features/ove integration
2023-09-13 17:05:48 +02:00
wandji
c2d6b4d960
Add option to disable save button when OVE editor is in readonly mode [SCI-9110] (#6111)
* Add option to disable save button when OVE editor is in readonly mode [SCI-9110]
2023-09-13 16:53:16 +02:00
wandji
e0ed027211
Fix css issues in manage tags modal [SCI-9168] (#6208) 2023-09-13 15:00:04 +02:00
Ivan Kljun
01a909c9e7 Fix eye icon placement in password fields [SCI-9217] 2023-09-13 14:16:52 +02:00
Anton
d34608d22c Fix layout on task activties page [SCI-9261] 2023-09-13 14:08:39 +02:00
Martin Artnik
cb28c4d566
Merge pull request #6185 from ivanscinote/SCI-9250-fix-shared-task-with-new-results
Fixed shared task to work with new results [SCI-9250]
2023-09-13 13:43:30 +02:00
Martin Artnik
ee5f77f8dd Remove obsolete CSS tag [SCI-9293] 2023-09-13 13:05:01 +02:00
Martin Vražič
cadc0a336b added e2e tags to left menu 2023-09-13 12:05:10 +02:00
Martin Artnik
7bb5305b14
Merge pull request #6193 from artoscinote/ma_SCI_9096
Fix displaying the 'more' link for multiline experiment description [SCI-9096]
2023-09-13 10:00:38 +02:00
Gregor Lasnibat
6709d5ee73 Finished v.01 of inventory item card (RepositoryItemSidebar) [SCI-9091] 2023-09-13 08:34:07 +02:00
Martin Artnik
08157cd8a1 Fix displaying the 'more' link for multiline experiment description [SCI-9096] 2023-09-12 13:50:02 +02:00
wandji
58bce55f91
Fix css issues in manage tags modal [SCI-9168] (#6189) 2023-09-12 13:46:22 +02:00
sboursen-scinote
bebae64944 Update OVE promo [SCI-8968]
- Move OVE promo to addons
- Update text and style of the promo
- Fix the iFrame closing logic
2023-09-11 16:42:50 +02:00
aignatov-bio
daa708a840
Merge pull request #6183 from aignatov-bio/ai-sci-fix-css-task-results
CSS fixed for task protocol
2023-09-11 15:57:36 +02:00
Alex Kriuchykhin
a07174ed78
Fix disabling buttons on submit for remote forms [SCI-9241] (#6184) 2023-09-11 15:22:25 +02:00
Ivan Kljun
dfaa91c682 Fixed shared task to work with new results [SCI-9250] 2023-09-11 15:19:22 +02:00
Anton
3f12f91b4a CSS fixed for task protocol 2023-09-11 12:19:21 +02:00
Giga Chubinidze
a11a879d90 Ensure reports work with new results [SCI-9245] 2023-09-11 12:13:22 +04:00
Gregor Lasnibat
b9cff2faff
Merge pull request #6181 from lasniscinote/gl_SCI_9226
Fix shared task issues [SCI-9226]
2023-09-11 09:59:07 +02:00
Martin Artnik
b831b9aa12
Merge pull request #6105 from artoscinote/ma_SCI_9096
Display show more for experiment description if there are more than 2 lines [SCI-9096]
2023-09-11 09:39:06 +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
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
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
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
Martin Artnik
bf7b1c2f2a Fix global search to work with new results [SCI-9244] 2023-09-07 11:43:45 +02:00
Anton
170187a5e5 Add step text title to print protocol [SCI-9249] 2023-09-07 10:59:38 +02: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
Anton
1247406055 Add archive view to results [SCI-9223] 2023-09-06 15:06:27 +02:00
wandji
d671471b44
Add autofocus to 2fa input field [SCI-9069] (#6145) 2023-09-06 12:40:58 +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
Anton
48b89fc699 Fix activities for results [SCI-9206][SCI-9205][SCI-9207] 2023-09-05 16:25:21 +02:00
Martin Artnik
914697d4bf Fix status flow modal to work across multiple pages [SCI-9212] 2023-09-05 15:54:53 +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
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
Gregor Lasnibat
589faef72f Fix gene sequence attachment icons [SCI-9213] 2023-09-02 03:14:51 +02:00
Martin Artnik
3724a4a067 Merge branch 'develop' into features/september-release 2023-09-01 10:30:48 +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
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
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
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
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
sboursen-scinote
9f05f6d28b Fix description text area when creating a new team [SCI-9138] 2023-08-28 20:51:03 +02:00
Alex Kriuchykhin
165b7febcf
Fix JS errors on text results creation/editing [SCI-9140] (#6086) 2023-08-28 14:53:09 +02:00