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

3240 commits

Author SHA1 Message Date
Martin Artnik b3c2dd75cf
Merge pull request #6349 from ivanscinote/SCI-9430-move-result-does-not-work 
Fix moving result elements bug [SCI-9430]
 2023-10-04 13:54:30 +02:00
Ivan Kljun 2919516bca Fix moving result elements bug [SCI-9430] 2023-10-04 13:37:00 +02:00
Oleksii Kriuchykhin 421ba27a6f Merge branch 'release/1.28.0' into develop 2023-10-04 13:19:31 +02:00
Martin Artnik 37c71d8567
Merge pull request #6321 from ivanscinote/SCI-9403-user-is-able-to-move-content-to-archived-results 
Fix move_targets methods to only return active results; prevent moving elements to archived results [SCI-9403]
 2023-10-03 12:45:42 +02:00
Alex Kriuchykhin 40b6078ab2
Merge pull request #6312 from rekonder/aj_SCI_9386 
Refactor export stock consumption modal [SCI-9386]
 2023-10-03 10:33:00 +02:00
Andrej 835cfb5e07 Refactor export stock consumption modal [SCI-9386] 2023-10-03 09:27:10 +02:00
Martin Artnik f620a99577 Fix checking asset blob permissions [SCI-9353] 2023-10-02 16:18:29 +02:00
Andrej e1ca9175b7 Fix marvinjs loading and speedup creating of the wopi files [SCI-9409] 2023-10-02 08:32:50 +02:00
Ivan Kljun b0511ecec5 Fix move_targets methods to only return active results; prevent moving elements to archived results [SCI-9403] 2023-09-29 14:43:12 +02:00
Martin Artnik 2edba4e188 Fix for downloading assets not in current user team [SCI-9353] 2023-09-27 14:13:34 +02:00
Martin Artnik d44d29a0fd
Merge pull request #6301 from G-Chubinidze/gc_SCI_9299 
OVE - Activities related to Task result [SCI-9299]
 2023-09-27 12:49:58 +02:00
Giga Chubinidze b53ac04577 styling fix 2023-09-27 14:47:35 +04:00
Ivan Kljun 0b069430db Fix bug for adding Office files to a result [SCI-9349] 2023-09-27 10:55:03 +02:00
Giga Chubinidze da70fed43a OVE - Activities related to Task result [SCI-9299] 2023-09-27 03:45:29 +04:00
Martin Artnik 3a22d7715d Merge branch 'develop' into features/september-release 2023-09-25 10:37:40 +02:00
sboursen-scinote adc0a460bd Improve logic for custom logos on error pages [SCI-9147] 
- Switch to dynamic ERB templates.
- Move text to I18n
 2023-09-22 10:26:32 +02:00
Anton 566705cb67 Small fixes [SCI-9340] 2023-09-22 10:07:29 +02:00
Anton 77948572f1 Refactor checklist [SCI-9340] 2023-09-22 08:36:37 +02:00
Martin Artnik 5983ecb2bd
Merge pull request #6255 from artoscinote/ma_SCI_9348 
Clean up legacy comment logic [SCI-9348]
 2023-09-20 13:10:28 +02:00
Martin Artnik 44394fa1b6 Clean up legacy comment logic [SCI-9348] 2023-09-20 13:07:30 +02:00
Anton dd17b46667 Fix inline editing 2023-09-19 13:56:07 +02:00
aignatov-bio 5626bdef4b
Merge pull request #6247 from aignatov-bio/ai-sci-9260-fix-wopi 
Fix wopi and pdf preview [SCI-9260]
 2023-09-19 13:17:42 +02:00
Anton 370508304b Fix wopi and pdf preview [SCI-9260] 2023-09-19 12:44:28 +02:00
Giga Chubinidze b414cc4295 fixed hound and changed logic for ove to marvin 2023-09-19 12:50:45 +04:00
Giga Chubinidze 01e57e0395 Add activities for moving content between steps and results [SCI-9300] 2023-09-19 03:17:30 +04:00
Oleksii Kriuchykhin 4e16d702bd Fix next page loading for global and task activities [SCI-9175] 2023-09-15 12:34:27 +02:00
Gregor Lasnibat 415e7338f7 Fix wrong OVE view file size after editing [SCI_9294] 2023-09-15 11:50:13 +02:00
Martin Artnik 160d9775d8 Merge branch 'develop' into features/september-release 2023-09-15 10:40:55 +02:00
Oleksii Kriuchykhin 45e9a459d7 Fix user and team activities filters [SCI-9287] 2023-09-14 14:22:01 +02:00
Anton af0fbfeec0 Merge branch 'develop' into features/september-release 2023-09-14 13:45:40 +02:00
Alex Kriuchykhin 40a82f67c0
Merge pull request #6216 from scinote-eln/features/ove-integration 
Features/ove integration
 2023-09-13 17:05:48 +02:00
Alex Kriuchykhin fae428e305
Fix OVE file preview from imported .eln [SCI-9263] (#6200) 2023-09-13 15:00:52 +02:00
Anton d6ab6e15f8 Fix office creation on results [SCI-9260] 2023-09-13 14:30:00 +02:00
Martin Artnik cb28c4d566
Merge pull request #6185 from ivanscinote/SCI-9250-fix-shared-task-with-new-results 
Fixed shared task to work with new results [SCI-9250]
 2023-09-13 13:43:30 +02:00
Martin Artnik c5eb1759b6
Merge pull request #6198 from artoscinote/ma_SCI_9285 
Fix result pagination, fix new step/result buttons [SCI-9285]
 2023-09-13 10:00:01 +02:00
Martin Artnik 6114dd7afc Fix result pagination, fix new step/result buttons [SCI-9285] 2023-09-12 17:33:47 +02:00
Ivan Kljun cd892878db Merge remote-tracking branch 'upstream/features/september-release' into SCI-9010-rework-result-activities-to-be-aligned-with-step-activities 2023-09-11 15:38:46 +02:00
Ivan Kljun dfaa91c682 Fixed shared task to work with new results [SCI-9250] 2023-09-11 15:19:22 +02:00
Martin Artnik 8c3ff1813a
Merge pull request #6177 from artoscinote/ma_SCI_9267 
Fix attachment sorting in results [SCI-9267]
 2023-09-11 10:01:26 +02:00
Martin Artnik ede9e40be8 Fix attachment sorting in results [SCI-9267] 2023-09-08 16:07:43 +02:00
Anton 7b44a47d51 Add active/archive switch to results page [SCI-9264] 2023-09-08 13:42:02 +02:00
Ivan Kljun 1242ec588f Add and fix result activities [SCI-9010] 2023-09-08 11:36:59 +02:00
Alex Kriuchykhin d8965e8ef9
Refactor old export async methods to ActiveJobs [SCI-9092] (#6170) 2023-09-08 11:35:16 +02:00
wandji a59f94c5a9
Add RepositoryStockValueZipExport service and connect export consumption button [SCI-9023] (#6092) 
* Add RepositoryStockValueZipExport service and connect export consumption button [SCI-9023]

* Add consumption export modal and improve report generation [SCI-9023]

* Add repository_row association to repository_ledger_records [SCI-9023]
 2023-09-07 13:12:27 +02:00
Gregor Lasnibat 6934ae38aa Fix wrong OVE file size [SCI-9243] 2023-09-07 11:36:17 +02:00
Anton 1247406055 Add archive view to results [SCI-9223] 2023-09-06 15:06:27 +02:00
G-Chubinidze 3976e05042
Merge branch 'features/september-release' into gc_SCI_9178 2023-09-06 16:38:25 +04:00
Alex Kriuchykhin eea24a69e9
Add FailureNotifiableJob jobs concerns for creating failure notifications for users [SCI-9119] (#6147) 2023-09-06 12:51:34 +02:00
Giga Chubinidze 5a6202aea2 Unable to create a MarvinJS attachment [SCI-9178] 2023-09-05 18:29:15 +04:00
aignatov-bio 7a32703c1a
Merge branch 'features/september-release' into ai-sci-9088-add-attachments-move-ability 2023-09-05 14:41:23 +02:00