scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 23:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
13987 commits 70 branches 179 tags 165 MiB
Commit graph

13987 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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