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

14837 commits

This branch
This branch
All branches
Author SHA1 Message Date
Martin Artnik
74c9993c8a
Merge pull request #6454 from lasniscinote/gl_SCI_9518 
Fix Report table bottom toolbar moving [SCI-9518]
 2023-10-16 12:11:13 +02:00
Martin Artnik
45699fdced
Merge pull request #6445 from sboursen-scinote/sb_SCI-9527 
Fix item card scroller [SCI-9527]
 2023-10-16 11:46:47 +02:00
Gregor Lasnibat
d580b9758c Fix Report table bottom toolbar moving [SCI-9518] 2023-10-16 11:41:59 +02:00
Martin Artnik
e5a7e2d4ba
Merge pull request #6412 from G-Chubinidze/gc_SCI_9429 
Code sample in RTF on archived results is not highlighted with colors [SCI-9429]
 2023-10-16 10:25:12 +02:00
Martin Artnik
88bdd36dd9
Merge pull request #6443 from artoscinote/ma_SCI_9496 
Refactor select.vue to use the outside click directive [SCI-9496]
 2023-10-16 10:24:25 +02:00
ajugo
67008a54d6
Fix item sidebar showing on full view of inventory [SCI-9525] (#6447) 2023-10-16 10:18:22 +02:00
Gregor Lasnibat
57bfe0036b
Fix Rename the buttons Show/Hide in multiline text fields [SCI-9439] (#6444) 2023-10-16 10:12:21 +02:00
aignatov-bio
4b3644d6fb
Merge pull request #6452 from aignatov-bio/ai-sci-9476-fix-comments-on-shared-tasks 
Fix comments in shareable tasks [SCI-9476]
 2023-10-16 09:59:04 +02:00
Anton
cb954ed605 Fix comments in shareable tasks [SCI-9476] 2023-10-16 09:55:52 +02:00
sboursen-scinote
cfa8a12b6d Fix item card scroller [SCI-9527] 2023-10-14 13:03:49 +02:00
Martin Artnik
45e45d1543 Refactor select.vue to use the outside click directive [SCI-9496] 2023-10-13 16:12:01 +02:00
Soufiane
0a5686d9bc
Show task name in sticky header for Viewer users [SCI-9524] (#6432) 2023-10-13 16:10:07 +02:00
Gregor Lasnibat
86d337541a
Fixed creating MS office file with empty name freezes modal [SCI-9497] (#6440) 2023-10-13 16:09:16 +02:00
Martin Artnik
e60b7754ad
Merge pull request #6438 from scinote-eln/revert-6430-SCI-9515-click-away-not-working-after-editing-chemical-drawing-in-rtf 
Revert "Refocus on tinymce editor after marvinjs img update [SCI-9515]"
 2023-10-13 14:41:05 +02:00
Martin Artnik
3021297f73
Revert "Refocus on tinymce editor after marvinjs img update [SCI-9515]" 2023-10-13 14:40:52 +02: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
Giga Chubinidze
8e9d35d6b4 added prism highlighting 2023-10-13 03:53:45 +04: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
Giga Chubinidze
de8366bb51 Code sample in RTF on archived results is not highlighted with colors [SCI-9429] 2023-10-11 03:22:11 +04: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