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

13931 commits

This Branch
This Branch
All Branches
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
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
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
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
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
ajugo 380a426524
Merge pull request #5916 from sboursen-scinote/sb_SCI-8975 
Fix shareable links CSS [SCI-8975]
 2023-08-04 13:49:32 +02:00
sboursen-scinote 40f78f4a28 Fix shareable links CSS [SCI-8975] 
- Fix the style of the toggle button globally.
- Fix permissions on who can toggle team shareable links.
- Change wrong translations in shareable links modal.
- Remove placeholder text for start-date
 2023-08-04 12:34:04 +02:00
Andrej caf34320f8 Fix calculations in table for shareable task [SCI-8979] 2023-08-04 12:32:19 +02:00
ajugo 7a6886b895
Fix rendering of RTE images for shareable links [SCI-8970] (#5913) 2023-08-04 11:24:27 +02:00
Soufiane f3bef4ae25
Fix Broken CSP on the shareable links page [SCI-8969] (#5911) 2023-08-04 11:22:33 +02:00
Soufiane f856ddf78c
Assigned items in task datatable will not load if stock management is enabled [SCI-8944] (#5904) 
* Fix assigned items datatable in shareable link with stock management [SCI-8944]

* Avoid skipping auth token verification for assets download [SCI-8944]
 2023-08-04 11:21:43 +02:00
Alex Kriuchykhin e50d53c691
Merge pull request #5870 from wandji20/wb-SCI-8738 
Add method to filter by timestamp range for mobile api endpoints
 2023-08-03 09:45:56 +02:00
Alex Kriuchykhin b264bfab68
Merge pull request #5906 from scinote-eln/features/shareable-links 
Merge features/shareable_links to develop
 2023-08-02 16:34:23 +02:00
Oleksii Kriuchykhin b49b7c4a80 Merge branch 'develop' into features/shareable-links 2023-08-02 16:05:21 +02:00
ivanscinote 5a531c98ae
Add callback to clear form errors at create wopi files [SCI-8927] (#5877) 
* Add callback to clear form errors at create wopi files [SCI-8927]
 2023-08-02 15:34:36 +02:00
ivanscinote 242df0632d
Merge branch 'features/august-release' into SCI-8807-notifications 2023-08-02 13:40:06 +02:00
Ivan Kljun 7e4d284def Fixed sprite down arrow image for jstree 2023-08-02 13:32:49 +02:00
artoscinote 7a8663779e
Merge pull request #5902 from ivanscinote/SCI-8712-UI-arrows-tooltip 
Replace jstree sprite image and remove inventory table overlaying tooltip [SCI-8712]
 2023-08-02 11:56:24 +02:00
Ivan Kljun 88a6df5985 Remove table overlaying tooltip for inventories 2023-08-02 09:26:41 +02:00
Ivan Kljun a35206cd8a Adding new sprite image for jstree 2023-08-02 09:01:29 +02:00
wandji20 a0372d14bf Improve base controller timestamp filter method [SCI-8738] 2023-08-01 18:59:58 +01:00
ajugo fa187f3b31
Add shared assets download and fix loading of the shareable button on task [SCI-8754] (#5878) 
* Add shared assets download and fix loading of the shareable button on task [SCI-8754]

* Add additional check before asset loading [SCI-8754]

* Add additional check before asset loading [SCI-8754]

* Load asset for specific task [SCI-8754]
 2023-08-01 16:46:41 +02:00
wandji20 07411fbc25 Refactor base controller timestamp filter method [SCI-8738] 2023-08-01 13:25:17 +01:00
Soufiane 3f3064ba19
Fix Auth issues task public view [SCI-8936] (#5890) 2023-08-01 14:23:48 +02:00
Alex Kriuchykhin 4a563d3456
Implement loading settings from both, database and env variables [SCI-8813] (#5885) 2023-08-01 10:44:27 +02:00