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
13846 commits 70 branches 179 tags 165 MiB
Commit graph

13846 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
sboursen-scinote c27c7245bc Fix various CSS issues [SCI-8940] 
- Maintain the position of the top navigation controls when user is without team.
- Add "missing" avatar to avatar change modal
- Disable wrapping of (A) in archived P/E/T
- Fix padding/margin issues in Archived tasks and Protocol templates
 2023-08-04 09:11:53 +02:00
Alex Kriuchykhin a943ea2dd7
Merge pull request #5888 from wandji20/wb-SCI-8907 
Create step orderable element for step_text when creating a step via the API [SCI-8907]
 2023-08-03 14:19:05 +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
wandji20 90b3f8943a Improve api step controller create action [SCI-8907] 2023-08-03 04:08:26 +01: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
wandji 31f8bc19d5
Add unique database index to checklist items position (#5886) 
* Add unique database index to checklist items position and update errors to render flash message when a checklist item validation fails [SCI-8841]

* Improve protocol checklist item reordering [SCI-8841]

* Add act as list to gemfile and use sequential updates for reodering with act_as_list [SCI-8841]
 2023-08-02 15:37:01 +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
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
Soufiane 382a4e57ac
Load external services asynchronously [SCI-8937] (#5900) 2023-08-02 11:17:34 +02:00