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

4519 commits

Author SHA1 Message Date
Martin Artnik
d74cd77e41
Merge pull request #6516 from scinote-eln/develop 
Merge develop
 2023-10-23 11:14:50 +02:00
Martin Vražič
0f1ec8eada added e2e tag on create button - inventory dialog 2023-10-23 11:11:06 +02:00
Gregor Lasnibat
0a3ba6a366 Fixed Item card smart annotation link [SCI-9583] 2023-10-22 08:56:51 +02:00
mvrazic
77b3e7a44f
Merge branch 'e2e' into mv_SCI_9581 2023-10-20 15:06:30 +02:00
Martin Vražič
c392b5114f Modified and added new tags mostly for inventories section. 2023-10-20 11:23:51 +02:00
Alex Kriuchykhin
8a18bc6ad3
Fix item card on results page, fix smart annotation links in RTE fields [SCI-9572] (#6506) 2023-10-19 16:35:23 +02:00
Oleksii Kriuchykhin
ae7995fee2 Merge branch 'develop' into features/inventory-item-card-edit 2023-10-19 12:59:45 +02:00
Martin Artnik
4e76fbe087
Merge pull request #6436 from okriuchykhin/ok_SCI_9372 
Change the Wkhtmltopdf library to Grover for PDF generation [SCI-9372]
 2023-10-19 11:44:02 +02:00
Soufiane
e0a1a62bd5
Fix zebra print progress modal close button and padding [SCI-9536] (#6487) 2023-10-19 10:59:56 +02:00
Martin Artnik
fb9204df64 Merge branch 'develop' into features/bugfixes-and-css 2023-10-18 14:51:35 +02:00
ajugo
965deded98
Fix collapsing/extending containers on shareable results [SCI-9555] (#6476) 2023-10-18 10:15:43 +02:00
Giga Chubinidze
c865fedb7f Remove 'More [...]' button from the preview screens [SCI-9236] 2023-10-18 10:37:33 +04:00
Soufiane
fc52b7bdab
Fix item card css issues [SCI-9536] (#6458) 2023-10-17 17:09:11 +02:00
ajugo
9f1c668a10
Fix result assets download for shareable links [SCI-9542] (#6460) 2023-10-17 11:35:16 +02:00
wandji
c8359cdf3a
Add controller action to update inventory item cell data [SCI-9478] (#6379) 2023-10-16 17:43:53 +02:00
Alex Kriuchykhin
80ccd0039c
Apply saved custom columns order to the inventory item card [SCI-9540] (#6462) 2023-10-16 16:38:43 +02:00
wandji
550aa9df48
Update font size for stock edit modals [SCI-9451] (#6461) 2023-10-16 15:24:25 +02:00
Martin Artnik
606089a2c2
Merge pull request #6459 from G-Chubinidze/gc_SCI_9489_v2 
Fix modal back arrow issue [SCI-9489]
 2023-10-16 14:26:40 +02:00
Giga Chubinidze
b267c46865 Fix modal back arrow issue [SCI-9489] 2023-10-16 16:25:31 +04:00
Gregor Lasnibat
3b4fbc944f Added archived columns [SCI-9469] 2023-10-16 13:02:28 +02:00
ajugo
67008a54d6
Fix item sidebar showing on full view of inventory [SCI-9525] (#6447) 2023-10-16 10:18:22 +02:00
Anton
cb954ed605 Fix comments in shareable tasks [SCI-9476] 2023-10-16 09:55:52 +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
Oleksii Kriuchykhin
984ad7757f Change the Wkhtmltopdf library to Grover for PDF generation [SCI-9372] 2023-10-13 13:38:41 +02:00
Martin Artnik
9c302f186b
Merge branch 'features/navigator-resize' into SCI-9318-making-navigator-resizable 2023-10-13 10:33:37 +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
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
c55c9e2596
Fix button permission for the shareable link on task [SCI-9517] (#6427) 2023-10-12 15:36:00 +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
Ivan Kljun
d34d424b0f Make navigator resizable [SCI-9318] 2023-10-12 14:45:51 +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
Anton
84477cad43 Update css for shared protocol [SCI-9476] 2023-10-11 11:41:34 +02:00
Oleksii Kriuchykhin
e08304d0cd Merge branch 'develop' into features/inventory-item-card-edit 2023-10-11 10:51:51 +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
Oleksii Kriuchykhin
5c5319d80d Fix file preview generation issues in export all [SCI-9461] 2023-10-10 15:30:15 +02:00
Andrej
79118effa7 Merge branch 'develop' into features/october-release 2023-10-10 11:09:04 +02:00
Martin Artnik
43f89b93ea
Merge pull request #6367 from mvrazic/e2e 
Update e2e
 2023-10-09 11:21:47 +02:00
Martin Artnik
e6834d0b74
Merge pull request #6387 from ivanscinote/SCI-9464-missing-content-to-exported-project-report-pdf-docx-file 
Fix pdf reports [SCI-9464]
 2023-10-09 11:01:33 +02:00
Ivan Kljun
879b03ad3d Fix pdf reports [SCI-9464] 2023-10-09 10:49:07 +02:00
Oleksii Kriuchykhin
c51612c2a1 Merge branch 'develop' into e2e 2023-10-09 10:26:00 +02:00
Andrej
ab49c52054 Fix css for item card [SCI-9475] 2023-10-09 09:33:38 +02:00
Martin Artnik
60acd42614
Merge pull request #6378 from lasniscinote/gl_SCI_9435 
Not responsive task page [SCI-9435]
 2023-10-09 09:14:34 +02:00
Gregor Lasnibat
cce02b29ed Fixed overflowing text, breaking buttons in new line, figuring out how header stacking works (flickering bug) [SCI-9435] 
Fixed header stack stuttering [SCI-9435]

PR fix 01 [SCI-9435]
 2023-10-08 16:07:05 +02:00
Alex Kriuchykhin
6da8725a46
Merge pull request #6373 from okriuchykhin/ok_SCI_9136 
Hide task share button if user has no permissions for task sharing [SCI-9136]
 2023-10-06 15:12:34 +02:00
Oleksii Kriuchykhin
16fda4adfb Hide task share button if user has no permissions for task sharing [SCI-9136] 2023-10-06 14:05:51 +02:00
Martin Artnik
5265312125
Merge pull request #6365 from G-Chubinidze/gc_SCI_9398 
Misalignments on the log in page when 2FA is enforced [SCI-9398]
 2023-10-06 09:40:43 +02:00
Giga Chubinidze
4399b6cc0a Misalignments on the log in page when 2FA is enforced [SCI-9398] 2023-10-06 10:32:47 +04:00
Martin Vražič
9a5717d6e2 added e2e tags to the main containers and two items 2023-10-05 17:39:44 +02:00
Martin Artnik
19c44c50ff
Merge pull request #6363 from artoscinote/ma_SCI_9410 
Fix attachment issues [SCI-9410]
 2023-10-05 16:42:10 +02:00
Martin Artnik
5c7ee78cd6 Fix attachment issues [SCI-9410] 2023-10-05 15:44:41 +02:00
Alex Kriuchykhin
e48fc19546
Merge pull request #6361 from sboursen-scinote/sb_SCI-9468 
Import from Protocols.io not loading protocols [SCI-9468]
 2023-10-05 15:35:44 +02:00
wandji20
36ff372b30 Small improvement [SCI-9420] 2023-10-05 14:23:10 +01:00
wandji20
d3c2a7e0ad Fix issue with timestamps for reports [SCI-9420] 2023-10-05 12:25:08 +01:00
sboursen-scinote
9b24bf9504 Fix Protocols.io modal not loading any protocols [SCI-9468] 
The JavaScript responsible for loading the list was attached to a
Partial that by itself was loaded using and AJAX request. Therefore,
The JavaScript was not being executed (no page reload). It was thus moved
to the parent partial (loaded on page reload) and called when the required
HTML is appended to the DOM.
 2023-10-05 12:03:05 +02:00
wandji20
6358ad2da4 Fix issue with protocol and result text name [SCI-9420] 2023-10-05 08:08:49 +01:00
Martin Artnik
1c84a97bd7
Merge pull request #6360 from G-Chubinidze/gc_SCI_9405 
Projects table header covered by top toolbar on some breakpoint [SCI-9405]
 2023-10-05 09:06:12 +02:00
Giga Chubinidze
3dbdbf02f8 Projects table header covered by top toolbar on some breakpoint [SCI-9405] 2023-10-05 02:44:30 +04:00
Martin Artnik
bcf7039fee
Merge pull request #6355 from artoscinote/ma_SCI_9428 
Fix z-index of task tab toolbar [SCI-9428]
 2023-10-04 15:43:02 +02:00
Martin Artnik
b545b6fdf9 Fix z-index of task tab toolbar [SCI-9428] 2023-10-04 14:22:17 +02:00
Oleksii Kriuchykhin
421ba27a6f Merge branch 'release/1.28.0' into develop 2023-10-04 13:19:31 +02:00
Martin Artnik
6f45980648
Merge pull request #6335 from ivanscinote/SCI-9407-css-consumption-modals-assign-to-task-modal-issues 
Fix UI for consumption/edit stock/assign to task modals [SCI-9407]
 2023-10-04 12:51:59 +02:00
Martin Artnik
b15cedd198
Merge pull request #6345 from G-Chubinidze/gc_SCI_9438 
CSS: Incorrect icons on large PDF previews & caret on task activity [SCI-9438]
 2023-10-04 12:51:20 +02:00
Martin Artnik
f3900baadc
Merge pull request #6347 from artoscinote/ma_SCI_9339 
Shared task designated users style fix [SCI-9339]
 2023-10-04 12:50:23 +02:00
ivanscinote
a4d0d71f18
Merge branch 'develop' into SCI-9407-css-consumption-modals-assign-to-task-modal-issues 2023-10-04 11:00:33 +02:00
Martin Artnik
03b12e0a22 Shared task designated users style fix [SCI-9339] 2023-10-04 09:56:09 +02:00
Martin Artnik
1f5ecfba33
Merge pull request #6344 from G-Chubinidze/gc_SCI_9447 
Wrong icon on the Export button in bottom toolbar & Manage columns back button [SCI-9447]
 2023-10-04 09:25:01 +02:00
Giga Chubinidze
b4247391a5 CSS: Incorrect icons on large PDF previews & caret on task activity [SCI-9438] 2023-10-04 05:36:03 +04:00
Giga Chubinidze
615d6ebbfa Wrong icon on the Export button in bottom toolbar & Manage columns back button [SCI-9447] 2023-10-04 04:56:17 +04:00
Martin Artnik
5960446401
Merge pull request #6320 from wandji20/wb-SCI-9406 
Add helper method to show grey layout background [SCI-9406]
 2023-10-03 16:43:18 +02:00
Martin Artnik
2d9c6ae249
Merge pull request #6339 from artoscinote/ma_SCI_9339 
Fix broken shared task styling [SCI-9339]
 2023-10-03 15:12:48 +02:00
Martin Artnik
c9e3055a22 Fix broken shared task styling [SCI-9339] 2023-10-03 14:26:06 +02:00
wandji20
dd34e72fb9 Add helper method to show grey layout background [SCI-9406] 2023-10-03 12:48:31 +01:00
Alex Kriuchykhin
f3f4fc1ad0
Merge pull request #6333 from okriuchykhin/ok_SCI_9368 
Use custom sanitizer config for PDF reports generation [SCI-9368]
 2023-10-03 13:09:50 +02:00
Alex Kriuchykhin
a000f0e67e
Merge pull request #6303 from wandji20/wb-SCI-9157 
Add export button to item card [SCI-9157]
 2023-10-03 12:52:03 +02:00
wandji20
2372edcf25 Add export button to item card [SCI-9157] 2023-10-03 10:52:57 +01:00
Ivan Kljun
667025b7c6 Fix UI for consumption/edit stock/assign to task modals [SCI-9407] 2023-10-03 11:12:03 +02:00
wandji20
4f5ecf66f4 Update OVE package and fix bug opening github issue link [SCI-9359] 2023-10-03 09:54:54 +01:00
Martin Artnik
03d6d99f7e
Merge pull request #6323 from G-Chubinidze/gc_SCI_9332 
Smart annotation modal: inventory name not correct [SCI-9332]
 2023-10-03 10:39:23 +02:00
Giga Chubinidze
de2023c873 removed unnecessary tw classes 2023-10-03 12:38:40 +04: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
Oleksii Kriuchykhin
d9404df361 Use custom sanitizer config for PDF reports generation [SCI-9368] 2023-10-03 09:39:47 +02:00
Andrej
835cfb5e07 Refactor export stock consumption modal [SCI-9386] 2023-10-03 09:27:10 +02:00
Andrej
1aa9091e0d Fix protocol parser import button closing [SCI-9275] 2023-10-03 09:13:20 +02:00
Giga Chubinidze
f99db28760 using tailwind 2023-10-03 11:04:38 +04:00
wandji20
7b9e4088de Update OVE package and fix bug opening github issue link [SCI-9359] 2023-10-02 23:33:46 +01:00
G-Chubinidze
fbdd5a8165
Revert "Organization settings (org. admin) - allowing the use of protocols for AI [SCI-9324]" 2023-10-02 12:28:29 +04:00
Giga Chubinidze
3932b22cd4 Smart annotation modal: inventory name not correct [SCI-9332] 2023-10-02 08:14:16 +04:00
Martin Artnik
a1df2b7b52
Merge pull request #6314 from G-Chubinidze/gc_SCI_9245_V2 
DOCX not working if result name empty. [SCI-9245]
 2023-09-29 12:24:18 +02:00
Giga Chubinidze
0be8ab5839 used i18n 2023-09-29 14:18:45 +04:00
Martin Artnik
0cb3c8bc62
Merge pull request #6313 from G-Chubinidze/gc_SCI_9324 
Organization settings (org. admin) - allowing the use of protocols for AI [SCI-9324]
 2023-09-29 11:49:26 +02:00
Giga Chubinidze
005bf93197 Organization settings (org. admin) - allowing the use of protocols for AI [SCI-9324] 2023-09-29 11:51:25 +04:00
Giga Chubinidze
07ce65f5e6 DOCX not working if result name empty. 2023-09-29 10:38:27 +04:00
Martin Artnik
7319ac5b50
Merge pull request #6310 from artoscinote/ma_SCI_9328 
Fix linked protocol dropdown [SCI-9328]
 2023-09-28 15:46:37 +02:00
Martin Artnik
82b9b676b6 Fix linked protocol dropdown [SCI-9328] 2023-09-28 15:40:48 +02:00
Martin Artnik
6e405d40a6 Refactor datepicker limits [SCI-9338] 2023-09-28 13:33:17 +02:00
Gregor Lasnibat
f352c7f186 Working on new behaviour for switching between item clicks [SCI-9354] 
Working on scrolling and highlighting [SCI-9354]

Item card preload and section title animation [SCI-9354]

Added box-shadow [SCI-9354]

Refactored logic and styles [SCI-9354]

PR fix, added back the missing HighlightComponent [SCI-9354]

PR fixes, refactoring [SCI-9354]

PR fix [SCI-9354]

Fixed scrolling to 'Assigned', highlighting [SCI-9354]

PR fix, modular logic, rename [SCI-9354]
 2023-09-28 13:21:20 +02:00