Commit graph

13800 commits

Author SHA1 Message Date
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
wandji a05bd7a6dd
Rename label repository in initializer extend.rb [SCI-8808] (#5964) 2023-08-11 09:43:16 +02: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
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
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
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
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
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 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
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
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
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
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
Alex Kriuchykhin 8f1276440a
Merge pull request #5928 from rekonder/aj_SCI_8971
Fix WOPI preview for shareable link assets [SCI-8971]
2023-08-08 10:06:16 +02:00
ajugo c63b7d7a64
Merge pull request #5927 from sboursen-scinote/sb_SCI-8982
Fix task details CSS [SCI-8982]
2023-08-07 16:41:46 +02:00
sboursen-scinote 04fdf0cfee Fix task details CSS [SCI-8982] 2023-08-07 15:53:09 +02:00
aignatov-bio 2ae5de1158
Merge pull request #5925 from aignatov-bio/ai-sci-fix-css-bundling-remove-libraries
Fix bundling for deleted files
2023-08-07 15:44:09 +02:00
Anton 5aa01716ef Fix bundling for deleted files 2023-08-07 15:42:13 +02:00
Andrej baf9b7f30a Fix WOPI preview for shareable link assets [SCI-8971] 2023-08-07 15:32:36 +02:00
ajugo c8fbdacf22
Merge pull request #5921 from rekonder/aj_SCI_8986
Copy shareable link when you enable sharing for task [SCI-8986]
2023-08-07 15:17:49 +02:00
Alex Kriuchykhin 7aa8ad94b6
Merge pull request #5923 from scinote-eln/dependabot/npm_and_yarn/jquery-3.5.0
Bump jquery from 2.2.4 to 3.5.0
2023-08-07 13:17:17 +02:00
Alex Kriuchykhin dacc6b48aa
Merge pull request #5924 from scinote-eln/features/protocol-parsing
Merge features/protocol-parsing to develop
2023-08-07 13:00:56 +02:00
Oleksii Kriuchykhin 6cf7403b21 Merge branch 'develop' into features/protocol-parsing 2023-08-07 12:55:20 +02:00