scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-14 13:16:28 +08:00
Code Issues Projects Releases Packages Wiki Activity
14771 commits 31 branches 181 tags 166 MiB
Commit graph

14771 commits

This branch
This branch
All branches
Author SHA1 Message Date
Giga Chubinidze
f268a0cab0 Attachments renamed to Files [SCI-9505] 2023-10-17 11:33:29 +04:00
Martin Artnik
fa57f9a71d
Merge pull request #6435 from lasniscinote/gl_SCI_9469 
Missing inventory columns on item card [SCI-9469]
 2023-10-13 11:59:15 +02:00
Gregor Lasnibat
8a30e70daa PR fix, removed optional chaining [SCI-9469] 2023-10-13 11:54:39 +02:00
ajugo
4e25b3921a
Remove duplicated show in repository_rows_controller (#6433) 2023-10-13 10:37:47 +02:00
Martin Artnik
a83235b23c
Merge pull request #6417 from aignatov-bio/ai-sci-9476-update-shared-tasks 
Update css for shared protocol [SCI-9476]
 2023-10-13 10:30:48 +02:00
Martin Artnik
43522c54a0
Merge pull request #6424 from G-Chubinidze/gc_SCI_9489 
CSS: Signatures modal issues [SCI-9489]
 2023-10-13 10:28:58 +02:00
Gregor Lasnibat
b5ece3429f
Fixed missing inventory columns on item card [SCI-9469] (#6416) 2023-10-13 09:51:50 +02:00
Martin Artnik
118a25e0ab
Merge pull request #6430 from ivanscinote/SCI-9515-click-away-not-working-after-editing-chemical-drawing-in-rtf 
Refocus on tinymce editor after marvinjs img update [SCI-9515]
 2023-10-12 16:45:36 +02:00
Ivan Kljun
d80d0af5b8 Refocus on tinymce editor after marvinjs img update [SCI-9515] 2023-10-12 16:35:36 +02:00
ajugo
c3ae813fb9
Remove link from assigned snapshot inventory row for simple view [SCI-9481] (#6405) 2023-10-12 16:30:58 +02:00
Soufiane
857bda6f69
Fix broken unit tests [SCI-8972] (#6342) 
- Models tests
- Controllers tests
- Jobs tests
- Permissions tests
- Utilities tests
 2023-10-12 16:16:43 +02:00
ajugo
04a898760a
Add assign button to item cards [SCI-9158] (#6326) 2023-10-12 15:46:13 +02:00
Oleksii Kriuchykhin
9e67b20b38 Merge branch 'features/october-release' into develop 2023-10-12 15:40:21 +02:00
ajugo
4b5c7362e5
Fix opening of the datetime picker direction [SCI-9146] (#6395) 2023-10-12 15:37:23 +02:00
aignatov-bio
d7dd6fdf15
Remove result activities from protocol group [SCI-9491] (#6420) 2023-10-12 15:36:39 +02:00
ajugo
c55c9e2596
Fix button permission for the shareable link on task [SCI-9517] (#6427) 2023-10-12 15:36:00 +02:00
Gregor Lasnibat
27652fd1a0
Working on sticky header + navigation behaviour [SCI-9472] (#6428) 
Working on highlighting ScrollSpy when scrolling. Decided on external library [SCI-9472]

Finished not sticky item header v.01 [SCI-9472]

PR fix01 [SCI-9472]
 2023-10-12 15:35:30 +02:00
wandji
6ca66f3b96
Fix text size and close icon in protocol docx parser [SCI-9451] (#6423) 2023-10-12 15:32:42 +02:00
ivanscinote
a5ec4a6c95
Fix outside_click.js [SCI-9404] (#6398) 2023-10-12 15:27:36 +02:00
Gregor Lasnibat
60d79be220
Working on item card interactions, implemented close on click outside [SCI-9470] (#6401) 
Fixed date format, checklist content, active/archived state [SCI-9470]

Fixed date formatting on BE [SCI-9470]
 2023-10-12 15:26:41 +02:00
ajugo
e0148cca31
Fix image preview and status icon for items card [SCI-9480] (#6413) 2023-10-12 15:19:51 +02:00
wandji
45cfe77ef7
Add qr code and print label to item card [SCI-9471 (#6364) 
* Add qr acode and print label to item card [SCI-9471

* Remove jQuery handler for setting barcode image src [SCI-9471]
 2023-10-12 15:10:54 +02:00
ajugo
357eebee40
Fix stock export on task [SCI-9477] (#6400) 2023-10-12 14:43:17 +02:00
Giga Chubinidze
3502d96674 CSS: Signatures modal issues [SCI-9489] 2023-10-12 10:52:55 +04:00
Martin Artnik
957f539e32
Bump version to 1.29.0.1 
Fix issue where users with only checklist check/uncheck permission could not click on the checklist check boxes.
 2023-10-11 12:08:09 +02:00
Anton
84477cad43 Update css for shared protocol [SCI-9476] 2023-10-11 11:41:34 +02:00
Martin Artnik
543e782634
Merge pull request #6415 from artoscinote/ma_SCI_9507 
Fix checklists for users with check permissions [SCI-9507]
 2023-10-11 11:37:00 +02:00
Martin Artnik
120f710bb4 Fix checklists for users with check permissions [SCI-9507] 2023-10-11 11:33:04 +02:00
Martin Artnik
9fdcd2d7bd
Bump version to 1.29.0 2023-10-11 10:58:09 +02:00
wandji
d236ba0a5b
Add reminders to item card [SCI-9154] (#6285) 
* Add reminders to item card [SCI-9154]

* Refactor item card reminder component [SCI-9154]
 2023-10-11 09:35:10 +02:00
Alex Kriuchykhin
c446bed593
Merge pull request #6411 from okriuchykhin/ok_SCI_9503 
Fix delete results permission helper, don't allow deletion if task is archived [SCI-9503]
 2023-10-10 17:56:13 +02:00
Oleksii Kriuchykhin
3d9e151fc0 Fix delete results permission helper, don't allow deletion if task is archived [SCI-9503] 2023-10-10 17:54:45 +02:00
Martin Artnik
8d9c64849c
Merge pull request #6410 from artoscinote/ma_SCI_9502 
Fix delete all steps modal [SCI-9502]
 2023-10-10 17:10:12 +02:00
Martin Artnik
03e0bc9a02 Fix delete all steps modal [SCI-9502] 2023-10-10 17:08:46 +02:00
Alex Kriuchykhin
dfe3a5c54b
Merge pull request #6409 from okriuchykhin/ok_SCI_9461_v2 
Fix file preview presence check in export all job [SCI-9461]
 2023-10-10 16:52:46 +02:00
Oleksii Kriuchykhin
2481b0af35 Fix file preview presence check in export all job [SCI-9461] 2023-10-10 16:51:15 +02:00
Martin Artnik
04e45eb1ee
Merge pull request #6408 from artoscinote/ma_SCI_9500 
Fix missing project in result level activities [SCI-9500]
 2023-10-10 16:25:49 +02:00
Martin Artnik
09df0c3b1f Fix missing project in result level activities [SCI-9500] 2023-10-10 16:23:58 +02:00
Martin Artnik
c640c784a1
Merge pull request #6407 from artoscinote/ma_SCI_9501 
Update table metadata when it's created [SCI-9501]
 2023-10-10 16:11:07 +02:00
Martin Artnik
7f8e515e88 Update table metadata when it's created [SCI-9501] 2023-10-10 16:09:47 +02:00
Alex Kriuchykhin
e131163f11
Merge pull request #6406 from okriuchykhin/ok_SCI_9461_v2 
Fix file preview generation issues in export all [SCI-9461]
 2023-10-10 15:33:26 +02:00
Oleksii Kriuchykhin
5c5319d80d Fix file preview generation issues in export all [SCI-9461] 2023-10-10 15:30:15 +02:00
Gregor Lasnibat
cac2b3c37e
Merge pull request #6394 from lasniscinote/gl_SCI_9474 
Fixed no file preview on item card [SCI-9474]
 2023-10-10 15:16:36 +02:00
Martin Artnik
6972abbe01
Merge pull request #6404 from artoscinote/ma_SCI_9500 
Add project to result activities [SCI-9500]
 2023-10-10 14:57:42 +02:00
Martin Artnik
b3c664664d Add project to result activities [SCI-9500] 2023-10-10 14:48:00 +02:00
Martin Artnik
d8247813c3
Merge pull request #6402 from ivanscinote/SCI-9464-missing-content-to-exported-project-report-pdf-docx-file 
Allow data attr in sanitize config [SCI-9464]
 2023-10-10 14:37:54 +02:00
Ivan Kljun
d68d7af529 Allow data attr in sanitize config [SCI-9464] 2023-10-10 14:33:55 +02:00
Martin Artnik
b03659cf08
Merge pull request #6403 from aignatov-bio/ai-sci-9499-fix-marving-js-move 
Fix marvinJS move on results [SCI-9499]
 2023-10-10 14:32:11 +02:00
Anton
1ab62616c4 Fix marvinJS move on results [SCI-9499] 2023-10-10 14:29:06 +02:00
Andrej
79118effa7 Merge branch 'develop' into features/october-release 2023-10-10 11:09:04 +02:00