Commit graph

4593 commits

Author SHA1 Message Date
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
Anton
171a996aec Revamp filters flyouts [SCI-8977] 2023-08-28 13:15:41 +02: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
Ivan Kljun
90199d3590 Add method light_color? to my_module_status [SCI-9007] 2023-08-25 15:47:34 +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
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
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
Alex Kriuchykhin
2a228d3350
Remove obsolete JS code inclusion from protocol_status_bar [SCI-9134] (#6072) 2023-08-24 15:13:52 +02:00
Martin Artnik
0faad52f6c Merge branch 'hotfix/1.28.0.1' into develop 2023-08-24 12:14:30 +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
Ivan Kljun
023a6fe0a8 Update 'Not started' button for reports [SCI-9007] 2023-08-24 08:31:07 +02:00
ajugo
207af995af
Fix display of tags on shareable task [SCI-8750] (#6059) 2023-08-23 18:04:01 +02:00
Alex Kriuchykhin
3c0389adc8
Make docx parser feature togglable [SCI-9094] (#6055) 2023-08-23 16:46:29 +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
Martin Artnik
7abfa97224 Fix project public role picker [SCI-9084] 2023-08-23 11:00:58 +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
Ivan Kljun
28adb4956d Add 'Not started' btn to other views 2023-08-22 14:30:49 +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
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
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
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
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
2d64d2fcbf Merge branch 'develop' into features/september-release 2023-08-21 11:25:27 +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
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
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
Giga Chubinidze
620c76a975 UI changes of "Create new inventory" modal 2023-08-21 06:56:14 +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
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
sboursen-scinote
4d7fa93c06 Fix PDF report generation error [SCI-9059] 2023-08-18 11:23:49 +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
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
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
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
400c1cb303 Update status and shared buttons design to Amanda [SCI-9007] 2023-08-17 15:18:46 +02:00
Anton
622a8766bb Hide results title if results not selected [SCI-9062] 2023-08-17 14:51:40 +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
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
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
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
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
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
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
Martin Artnik
8d31c5eb3b Merge branch 'develop' into features/ove-integration 2023-08-16 10:41:26 +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
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
wandji20
b9e391e781 Fix inventory item CSS abd set nonce shared file preview inline JavaScript [SCI-9043] 2023-08-15 14:28:53 +01: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
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
Anton
a46674b3a3 Fix small bootstrap issues [SCI-9051] 2023-08-11 11:34:11 +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