Commit graph

14268 commits

Author SHA1 Message Date
Martin Artnik
16dbd48ad3 Merge branch 'develop' into features/september-release 2023-08-10 13:21:27 +02:00
artoscinote
29458330c6
Merge pull request #5957 from artoscinote/jquery_node_modules
Require jQuery from node_modules
2023-08-10 13:19:39 +02:00
sboursen-scinote
17ecdeeaf6 Update shared task title [SCI-9042]
- Add (A) prefix to archived tasks.
- Truncate long task names.
2023-08-10 13:13:17 +02:00
Martin Artnik
52eca4eba1 Require jQuery from node_modules 2023-08-10 12:11:22 +02:00
Ivan Kljun
949da66414 Move blur event to whole modal at Share task [SCI-9008] 2023-08-10 11:58:35 +02:00
artoscinote
2db8badc57
Merge pull request #5955 from artoscinote/ma_SCI_8946
Fix glitchy dropdowns on Safari [SCI-8946]
2023-08-10 11:47:54 +02:00
Martin Artnik
4d4eebd78e Fix glitchy dropdowns on Safari [SCI-8946] 2023-08-10 11:46:31 +02:00
Ivan Kljun
f9e5821361 Replace bootstrap_form_tag with form_with at _destroy_modal.html.erb [SCI-9039] 2023-08-10 11:16:43 +02:00
artoscinote
d1ea9f30cf
Merge pull request #5953 from artoscinote/ma_SCI_9005
Add missing datatables css [SCI-9005]
2023-08-10 10:53:53 +02:00
ajugo
2ddb43c2ea
Merge pull request #5850 from sboursen-scinote/sb_SCI-8842
Update illustrations [SCI-8842]
2023-08-10 10:53:41 +02:00
Martin Artnik
f53696977c Add missing datatables css [SCI-9005] 2023-08-10 10:48:56 +02:00
sboursen-scinote
d97035988a Move images to public folder [SCI-8842] 2023-08-10 10:33:35 +02:00
ajugo
5157f86b56
Merge pull request #5952 from ivanscinote/SCI-9025-show-label-preview
Allow zpl_preview Access Regardless of Label Template ENV Status [SCI-9025]
2023-08-10 09:54:08 +02:00
Soufiane
aedd3e0b6d
Fix multiple issues for Shared tasks feature [SCI-8985] (#5936)
- Centre vertically all related modals
- Convert task header tabs to sentence case
2023-08-10 09:43:31 +02:00
wandji20
b4657e534a Fix CSS Issues[SCI-8559] 2023-08-10 08:11:07 +01:00
ajugo
0224f420b1
Merge pull request #5946 from sboursen-scinote/sb_SCI-9002
Fix Shared task CSS [SCI-9002]
2023-08-09 17:02:59 +02:00
Ivan Kljun
0b4afdd9ad Enable showing Label preview even if Label template is disabled [SCI-9025] 2023-08-09 17:01:30 +02:00
Martin Artnik
a952319afd Merge branch 'develop' into features/september-release 2023-08-09 16:43:15 +02:00
sboursen-scinote
d5240f4620 Fix Shared task CSS [SCI-9002]
- Remove hover effect from step RTF elements
- Fix the styling of the assigned items datatable.
2023-08-09 16:09:45 +02:00
ajugo
aed9c0d658
Merge pull request #5948 from sboursen-scinote/sb_SCI-9009
Fix shareable links left panel scroll [SCI-9009]
2023-08-09 15:59:57 +02:00
artoscinote
c4afa7064b
Merge pull request #5938 from G-Chubinidze/gc_SCI_8725
Sorting icons are visible in table header row [SCI-8725]
2023-08-09 15:59:34 +02:00
artoscinote
c42a10e131
Merge pull request #5945 from ivanscinote/SCI-8955-result-content-rearange
Make result content rearrangable [SCI-8955]
2023-08-09 15:58:17 +02:00
artoscinote
7eb5214e45
Merge pull request #5947 from artoscinote/ma_SCI_9004
Fix forms [SCI-9004]
2023-08-09 15:50:24 +02:00
Martin Artnik
f1173661f5 Fix forms [SCI-9004] 2023-08-09 15:47:33 +02:00
sboursen-scinote
45f6e02524 Fix shareable links left panel scroll [SCI-9009] 2023-08-09 15:44:58 +02:00
aignatov-bio
a4d0106c18
Merge pull request #5944 from aignatov-bio/ai-test-jquery-pr
Movinf jQuery to asset pipeline
2023-08-09 14:45:10 +02:00
Anton
2da83f460f Test moving jquery 2023-08-09 14:43:17 +02:00
Ivan Kljun
669bb3dd48 Make result content rearrangable (UI needs to be finalised and tested with actual data) [SCI-8955] 2023-08-09 13:58:25 +02:00
Alex Kriuchykhin
e01c3682b4
Fix handling of result table metadata for project exports [SCI-9000] (#5943) 2023-08-09 13:54:31 +02:00
aignatov-bio
04aa835251
Merge pull request #5941 from aignatov-bio/ai-sci-8951-reafctor-task-layout
Refactor task page UX [SCI-8951]
2023-08-09 11:13:26 +02:00
Anton
f688995635 Refactor task page UX [SCI-8951] 2023-08-09 11:03:30 +02:00
wandji
6c18a5a622
Fix issue previewing image after edit [SCI-8914] (#5908)
* Fix issue previewing image after edit [SCI-8914]
2023-08-09 10:38:01 +02:00
wandji
a1e6392a45
Fix bugs with jquery3 upgrade [SCI-8973] (#5933)
* Fix bugs with jquery3 upgrade [SCI-8973]

* Remove deprecated jquery method (.error, .completed, .success) [SCI-8973]

* Fix linter error [SCI-8973]
2023-08-09 10:33:58 +02:00
Alex Kriuchykhin
fcfec7f7e9
Merge pull request #5939 from wandji20/wb-SCI-8738-updated
Wrap timestamp filter params in the filter attribute [SCI-8738-updated]
2023-08-09 09:47:45 +02:00
wandji20
02115cf967 Wrap timestamp filter params in the filter attribute [SCI-8738-updated] 2023-08-09 08:25:01 +01:00
Giga Chubinidze
780da16dde Sorting icons are visible in table header row [SCI-8725] 2023-08-09 04:57:01 +04:00
Giga Chubinidze
73e35994d5 new icon changes 2023-08-09 04:19:57 +04:00
artoscinote
d0f44bb9fd
Merge pull request #5934 from artoscinote/ma_SCI_8984
Fix column resizing for existing inventories with no colSize data [SCI-8984]
2023-08-08 14:24:22 +02:00
Ivan Kljun
5d92987779 Add turbolinks-cache-control to no-preview and thus eliminating double js loading on turbolinks [SCI-8800] 2023-08-08 14:21:26 +02:00
Martin Artnik
e0ceaa44cd Fix column resizing for existing inventories with no colSize data [SCI-8984] 2023-08-08 14:01:32 +02:00
Alex Kriuchykhin
6d4b2c9a9e
Merge pull request #5932 from rekonder/aj_SCI_8943
Add file extensions between inventories export [SCI-8943]
2023-08-08 13:51:29 +02:00
Alex Kriuchykhin
ab758c747f
Merge pull request #5920 from sboursen-scinote/sb_SCI-8983
Shared task - Details - multiple issues [SCI-8983]
2023-08-08 11:42:14 +02:00
sboursen-scinote
7b2a752d60 Fix multiple issues with shared task [SCI-8983]
- Circumvent authentication by using direct URL Users' avatars
- Change wrong completed-on icon
- Parse dates in browser's format
2023-08-08 11:11:46 +02:00
Anton
fcd76661c7 Fix inline edit 2023-08-08 11:09:26 +02:00
Anton
eac87c1804 Merge branch 'develop' into features/september-release 2023-08-08 11:06:27 +02:00
aignatov-bio
1c0a54fb60
Merge pull request #5931 from aignatov-bio/ai-update-jquery-version
Update jquery version
2023-08-08 10:58:46 +02:00
artoscinote
f297adfea2
Merge pull request #5930 from artoscinote/css_build_fix
Css build fix
2023-08-08 10:57:29 +02:00
Anton
f8cb258bcf Update jquery version 2023-08-08 10:57:28 +02:00
Andrej
6b71b408f0 Add file extensions between invetories export [SCI-8943] 2023-08-08 10:56:23 +02:00
Martin Artnik
4f85a6b723 Remove deleted file from import list 2023-08-08 10:50:36 +02:00