Commit graph

14121 commits

Author SHA1 Message Date
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
wandji
7430f2240d
Add navigation section to item card [SCI-9154] (#6268) 2023-09-25 09:53:12 +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
wandji
767c98c101
Add barcode and print label to item card [SCI-9156] (#6269)
* Add barcode and print label to item card [SCI-9156]

* Rename wrong label [SCI-9156]
2023-09-22 16:17:42 +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
Alex Kriuchykhin
3500b5f08c
Merge pull request #6266 from sboursen-scinote/sb_SCI-9215
Remove the Experiment ID from the three dots menu [SCI-9215]
2023-09-22 10:01:44 +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
sboursen-scinote
90b9813083 Remove the Experiment ID displayed in the three dots menu dropdown [SCI-9215] 2023-09-21 11:38:09 +02:00
Andrej
56a57233df Add assigned tasks block to the item card [SCI-9155] 2023-09-19 15:40:32 +02:00
Alex Kriuchykhin
9dd90bd133
Merge pull request #6244 from okriuchykhin/ok_SCI_9313
Connect backend to the new item card [SCI-9313]
2023-09-19 09:48:12 +02:00
Oleksii Kriuchykhin
3b170a0c0d Connect backend to the new item card [SCI-9313] 2023-09-18 16:42:01 +02:00
Oleksii Kriuchykhin
36f4e22fa3 Merge branch 'develop' into features/october-release 2023-09-15 14:08:45 +02:00
Alex Kriuchykhin
06516cadb0
Merge pull request #6229 from wandji20/wb-SCI-9151
Add default columns to inventory item card [SCI-9151]
2023-09-15 13:51:35 +02:00
wandji20
de4cb662a6 Update translation name for item_card [SCI-9151] 2023-09-15 12:30:02 +01:00
wandji20
0b0eddd62b Add default columns to inventory item card [SCI-9151] 2023-09-15 11:39:42 +01:00
Martin Artnik
94db5c1155
Merge pull request #6227 from lasniscinote/gl_SCI_9294
Fix wrong OVE view file size after editing [SCI_9294]
2023-09-15 12:32:16 +02:00
Gregor Lasnibat
415e7338f7 Fix wrong OVE view file size after editing [SCI_9294] 2023-09-15 11:50:13 +02:00
Martin Artnik
18072bbde7 Fix update of database settings values [SCI-9240] 2023-09-15 11:04:13 +02:00
Gregor Lasnibat
afd1903ab7
Merge pull request #6224 from lasniscinote/gl_SCI_9153
New item card custom columns [SCI-9153]
2023-09-15 10:39:26 +02:00
Martin Artnik
cc1d179366
Merge pull request #6225 from rekonder/aj_SCI_9032
Fix gene sequence html compiling with deface [SCI-9302]
2023-09-15 09:15:25 +02:00
Andrej
b9fe7c3d3e Fix gene sequence html compiling with deface [SCI-9032] 2023-09-14 17:10:52 +02:00
Alex Kriuchykhin
2504083157
Merge pull request #6221 from okriuchykhin/ok_SCI_9287
Fix user and team activities filters [SCI-9287]
2023-09-14 15:17:13 +02:00
Oleksii Kriuchykhin
45e9a459d7 Fix user and team activities filters [SCI-9287] 2023-09-14 14:22:01 +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
Gregor Lasnibat
cf641201ac New item card custom columns [SCI-9153] 2023-09-13 16:13:22 +02:00
Gregor Lasnibat
48e3298caa
Merge pull request #6215 from lasniscinote/gl_SCI_9091
Finished v.01 of inventory item card (RepositoryItemSidebar) [SCI-9091]
2023-09-13 16:13:12 +02:00
ajugo
efed11be3c
Remove cancel button in import protocol parser modals and fix wording [SCI-9284] (#6203) 2023-09-13 15:02:30 +02:00
Alex Kriuchykhin
fae428e305
Fix OVE file preview from imported .eln [SCI-9263] (#6200) 2023-09-13 15:00:52 +02:00
ajugo
700df3525e
Fix special characters rendering for asset filenames [SCI-9242] (#6197) 2023-09-13 15:00:28 +02:00
wandji
642e3b5ff4
Add link to knowledge base [SCI-9231] (#6190)
* Add link to knowledge base [SCI-9231]

* Remove custom OVE help link [SCI-9231]
2023-09-13 14:45:28 +02:00
Gregor Lasnibat
6709d5ee73 Finished v.01 of inventory item card (RepositoryItemSidebar) [SCI-9091] 2023-09-13 08:34:07 +02:00
ajugo
4de09f4f9e
Merge pull request #6187 from sboursen-scinote/sb_SCI-8968-move-to-common
Update OVE promo [SCI-8968]
2023-09-12 09:38:43 +02:00
sboursen-scinote
ba390d6239 Remove unecessary locals [SCI-8968] 2023-09-12 09:15:11 +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
Alex Kriuchykhin
a07174ed78
Fix disabling buttons on submit for remote forms [SCI-9241] (#6184) 2023-09-11 15:22:25 +02:00
wandji
76b1aaab87
Rename OVE labels in file uploads [SCI-9163] (#6115)
* Rename OVE labels in file uploads [SCI-9163]

* Move translations for ove trial reminders [SCI-9163]
2023-09-11 12:58:12 +02:00
wandji
6687ac178b
Fix issue displaying gene sequence activities in global activities [SCI-9268] (#6180) 2023-09-11 12:57:16 +02:00
wandji
a3dd30d218
Load OVE packages via yarn [SCI-9231] (#6176)
* Add OVE yarn package and load assets from node_modules [SCI-9231]

* Move hardcoded text to i18 [SCI-9231]
2023-09-11 09:50:05 +02:00
Gregor Lasnibat
0dc79316f1
Merge pull request #6175 from lasniscinote/gl_SCI_9226
Fix shared task issues [SCI-9226]
2023-09-08 15:19:51 +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
Gregor Lasnibat
c82a1b1108 Fix shared task issues [SCI-9226] 2023-09-07 21:04:01 +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
Gregor Lasnibat
5a4930e90f
Merge pull request #6162 from lasniscinote/gl_SCI_9243
Fix wrong OVE file size [SCI-9243]
2023-09-07 11:38:11 +02:00
Gregor Lasnibat
6934ae38aa Fix wrong OVE file size [SCI-9243] 2023-09-07 11:36:17 +02:00
Martin Artnik
b46e20b917
Merge pull request #6150 from lasniscinote/gl_SCI_9224
Fix missing paperclip icon for file attachment [SCI-9224]
2023-09-06 14:52:35 +02:00