Commit graph

14639 commits

Author SHA1 Message Date
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
artoscinote
8ef064e022
Merge pull request #5905 from artoscinote/ma_SCI_8962
Add read-only mode to OVE [SCI-8929]
2023-08-08 14:14:07 +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
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
Anton
758b28261d Merge branch 'develop' into features/september-release 2023-08-07 16:30:28 +02:00
artoscinote
a8bf290fc7
Merge pull request #5912 from artoscinote/ma_SCI_8947
Basic results component and structure [SCI-8947]
2023-08-07 16:09:34 +02:00
Martin Artnik
11fb166a0c Migration fix, additional endpoints, cleanup [SCI-8947] 2023-08-07 16:09:15 +02:00
Martin Artnik
633abf69c0 Basic results toolbar implementation [SCI-8952] 2023-08-07 16:09:15 +02:00
Martin Artnik
fd55aa21a6 Basic results component and structure [SCI-8947] 2023-08-07 16:09:13 +02:00
wandji
8546d451d3 Add result_orderable_elements_controller and update activities [SCI-8882] (#5880) 2023-08-07 16:08:06 +02:00
Alex Kriuchykhin
4299cce08b Migrate results to the new data model with ResultOrderableElements [SCI-8878] (#5869) 2023-08-07 16:07:20 +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
Anton
7961bee35f Merge branch 'develop' into features/september-release 2023-08-07 14:11:29 +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
dependabot[bot]
28edc56b1f
Bump jquery from 2.2.4 to 3.5.0
Bumps [jquery](https://github.com/jquery/jquery) from 2.2.4 to 3.5.0.
- [Release notes](https://github.com/jquery/jquery/releases)
- [Commits](https://github.com/jquery/jquery/compare/2.2.4...3.5.0)

---
updated-dependencies:
- dependency-name: jquery
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-07 09:31:48 +00:00
aignatov-bio
be4bd7f038
Merge pull request #5922 from scinote-eln/features/remove-front-end-gems
Features/remove front end gems
2023-08-07 11:31:12 +02:00
Anton
89c526103d Merge branch 'develop' into features/remove-front-end-gems 2023-08-07 11:23:21 +02:00
ajugo
6f76e86171
Implement results tab for shareable task link [SCI-8753] (#5910)
* Implement results tab for shareable task link [SCI-8753]
2023-08-07 10:45:52 +02:00
Anton
937bc60542 Merge branch 'features/september-release' of github.com:scinote-eln/scinote-web into features/september-release 2023-08-07 10:37:20 +02:00
Anton
89d7241f60 Merge branch 'develop' into features/september-release 2023-08-07 10:35:15 +02:00
Andrej
84233506c0 Copy shareable link when you enable sharing for task [SCI-8986] 2023-08-07 09:47:44 +02:00
ajugo
9a55889264
Merge pull request #5919 from okriuchykhin/ok_SCI_8974
Fix file URL generation on shared task page [SCI-8974]
2023-08-07 08:56:05 +02:00
ajugo
949dd494d7
Merge pull request #5898 from sboursen-scinote/sb_SCI-8126
Issues with the "You've reached the end of the list" banner [SCI-8126]
2023-08-07 08:40:37 +02:00
ajugo
c82f296aeb
Merge pull request #5914 from sboursen-scinote/sb_SCI-8940
Fix various CSS issues [SCI-8940]
2023-08-07 08:39:06 +02:00
Martin Artnik
8aa11e93f7 Fix production SASS build errors 2023-08-04 17:41:32 +02:00
Oleksii Kriuchykhin
c61a075818 Fix file URL generation on shared task page [SCI-8974] 2023-08-04 15:09:59 +02:00
Alex Kriuchykhin
b365553a14
Merge pull request #5917 from scinote-eln/features/august-release
Merge features/august release to develop
2023-08-04 14:01:44 +02:00
ajugo
40b4a972f4
Merge pull request #5915 from rekonder/aj_SCI_8979
Fix calculations in table for shareable task [SCI-8979]
2023-08-04 13:49:48 +02:00