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

3136 commits

Author SHA1 Message Date
Martin Artnik 5a073b1364
Merge branch 'develop' into features/bugfixes-and-css 2023-10-27 10:29:13 +02:00
Anton fded38a5a6 Fix i18n for clipboard modal [SCI-9588] 2023-10-26 13:32:17 +02:00
Anton 0ffd3dcee3 Add image paster [SCI-9588] 2023-10-26 12:15:30 +02:00
aignatov-bio ff667a3a2b
Merge pull request #6529 from scinote-eln/features/navigator-resize 
Features/navigator resize
 2023-10-25 14:05:14 +02:00
Anton da3c54b7f0 Merge branch 'develop' into features/bugfixes-and-css 2023-10-25 13:26:06 +02:00
Anton e0f2677d1c Fix marvinJS in tinymce [SCI-9594] 2023-10-24 16:31:20 +02:00
Anton 3dd36e1dda Add drag n drop to results [SCI-9576] 2023-10-19 15:58:20 +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
sboursen-scinote 885b66504b FIX no custom columns placeholder [SCI-9529] 2023-10-19 10:53:18 +02:00
Martin Artnik fb9204df64 Merge branch 'develop' into features/bugfixes-and-css 2023-10-18 14:51:35 +02: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
Giga Chubinidze f268a0cab0 Attachments renamed to Files [SCI-9505] 2023-10-17 11:33:29 +04:00
Gregor Lasnibat 3b4fbc944f Added archived columns [SCI-9469] 2023-10-16 13:02:28 +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
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
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
aignatov-bio d7dd6fdf15
Remove result activities from protocol group [SCI-9491] (#6420) 2023-10-12 15:36:39 +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
Ivan Kljun d34d424b0f Make navigator resizable [SCI-9318] 2023-10-12 14:45: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
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
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
Martin Artnik a9b629bdf7 Copy fixes [SCI-9440] 2023-10-09 11:40:12 +02:00
Martin Artnik 9bf5903c54
Merge pull request #6384 from aignatov-bio/ai-sci-9491-fix-acitvity-type-selector 
Fix activity type selector [SCI-9491]
 2023-10-09 09:42:50 +02:00
Martin Artnik 1df8ad6f87
Merge pull request #6383 from G-Chubinidze/gc_SCI_9424 
CSS:  Various issues [SCI-9424]
 2023-10-09 09:41:48 +02:00
Anton 6b6ecf1b43 Fix activity type selector [SCI-9491] 2023-10-09 09:40:42 +02:00
Giga Chubinidze 9b9b486324 CSS: Various issues [SCI-9424] 2023-10-09 11:35:52 +04:00
Alex Kriuchykhin 5b39c2f08e
Merge pull request #6258 from sboursen-scinote/sb_SCI-9068 
FIX: Clicking any link makes a side scrollbar appear on the page [SCI-9068]
 2023-10-05 15:33:35 +02:00
wandji20 d3c2a7e0ad Fix issue with timestamps for reports [SCI-9420] 2023-10-05 12:25:08 +01:00
Alex Kriuchykhin 4888ebc3eb
Merge pull request #6346 from rekonder/aj_SCI_9442 
Add missing wording for failed export email/notifications [SCI-9442]
 2023-10-04 15:46:22 +02:00
Oleksii Kriuchykhin 421ba27a6f Merge branch 'release/1.28.0' into develop 2023-10-04 13:19:31 +02:00
Andrej 9b1d9823c1 Add missing wording for failed export email/notifications [SCI-9442] 2023-10-04 09:02:35 +02: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 64449af994
Merge pull request #6341 from artoscinote/ma_SCI_9441 
Fix error translations [SCI-9441]
 2023-10-03 15:32:00 +02:00
Martin Artnik 2b76fe6b5b Fix error translations [SCI-9441] 2023-10-03 15:23:49 +02:00
sboursen-scinote 1aaea77070 Add dynamic card placeholder calculation to prevent scrollbars [SCI-9068] 2023-10-03 15:00:26 +02:00
wandji20 b5acdd2bf6 Refactor application helper method [SCI-9406] 2023-10-03 13:24:39 +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
wandji20 285276a59a Rename item card export label [SCI-9157] 2023-10-03 10:54:45 +01:00
wandji20 2372edcf25 Add export button to item card [SCI-9157] 2023-10-03 10:52:57 +01:00
Martin Artnik a85b2643ce
Merge pull request #6319 from artoscinote/ma_SCI_9425 
Implement default name for results [SCI-9425]
 2023-10-03 10:56:03 +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
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