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
15144 commits 70 branches 179 tags 165 MiB
Commit graph

5172 commits

Author SHA1 Message Date
sboursen-scinote b93baeb730 Replace Scinote Icons [SCI-9557] 2023-10-28 12:51:11 +02:00
Oleksii Kriuchykhin ee76488f32 Merge branch 'develop' into features/inventory-item-card-edit 2023-10-27 14:25:32 +02:00
wandji c22d1e226b
Add new stock management modal and edit itemm card stock fields [SCI-9415] (#6474) 
* Add edit fetaure to item card stock field [SCI-9415]

* Replace manage stock modal [SCI-9415]

* Fix issue displaying item card [SCI-9415]

* Minor improvements [SCI-9415]

* Enable stock modal in assigned inventories [SCI-9415]

* Use toggleable reminder value [SCI-9415]
 2023-10-27 10:31:38 +02:00
Martin Artnik 5a073b1364
Merge branch 'develop' into features/bugfixes-and-css 2023-10-27 10:29:13 +02:00
mvrazic e4f49a86ab
e2e - modified tags where names were used [SCI-9620] (#6538) 2023-10-26 16:03:58 +02:00
Oleksii Kriuchykhin 6235a03595 Merge branch 'develop' into e2e 2023-10-26 15:36:36 +02:00
Anton 226d189789 Add new datetime pciker [SCI-9127] 2023-10-26 15:01:26 +02:00
Anton 0ffd3dcee3 Add image paster [SCI-9588] 2023-10-26 12:15:30 +02:00
Martin Artnik 2a5b596e2b
Merge pull request #6515 from G-Chubinidze/gc_SCI_9533 
Text doesn't fit in the flyout when a linked PT has been changed [SCI-9533]
 2023-10-26 10:11:02 +02:00
Anton 7515c979dd Fix dropdown click aways [SCI-9599] 2023-10-25 14:29:08 +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
Alex Kriuchykhin 1eece29f84
Fix error at filtering by date on project page [SCI-9590] (#6523) 2023-10-24 16:00:41 +02:00
Soufiane 809aaa8aa3
Implement field editing for the new item card [SCI-9412] (#6421) 
- Created new checklist component.
- updated the functionality of the select-search component.
- Name field.
- Text fields.
- Numeric fields.
- List fields.
- Status fields.
- Checklist fields.
 2023-10-24 15:49:37 +02:00
aignatov-bio 060300c785
Merge pull request #6522 from aignatov-bio/ai-sci-9592-fix-protocol-header 
Fix protocol header [SCI-9592]
 2023-10-24 13:43:53 +02:00
Anton d0703f04dc Fix protocol header [SCI-9592] 2023-10-24 13:41:13 +02:00
Martin Artnik 4f014394e2 Fix members filter [SCI-9585] 2023-10-23 13:31:27 +02:00
Martin Artnik d74cd77e41
Merge pull request #6516 from scinote-eln/develop 
Merge develop
 2023-10-23 11:14:50 +02:00
Giga Chubinidze 0d998b3947 Text doesn't fit in the flyout when a linked PT has been changed [SCI-9533] 2023-10-23 08:26:38 +04:00
ajugo 849743a410
Fix repository reload on cancel button click on import modal [SCI-9316] (#6511) 2023-10-20 12:53:34 +02:00
Martin Vražič c392b5114f Modified and added new tags mostly for inventories section. 2023-10-20 11:23:51 +02:00
Martin Artnik 040379039f
Merge pull request #6510 from G-Chubinidze/gc_SCI_9552 
Report - Well plates columns fix [SCI-9552]
 2023-10-20 10:16:11 +02:00
aignatov-bio 453bdf0082
Merge pull request #6508 from aignatov-bio/ai-sci-9576-add-drag-n-drop-to-results 
Fix drag n drop on results
 2023-10-20 09:43:49 +02:00
Gregor Lasnibat 6812bd135b
Fixed double PATCH request sent [SCI-9568] (#6512) 2023-10-20 09:37:09 +02:00
Giga Chubinidze 186eb1cc7e Report - Well plates columns fix [SCI-9552] 2023-10-20 02:27:06 +04:00
Anton 635a4b7fb3 Fix drag n drop on results 2023-10-19 17:41:13 +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
Alex Kriuchykhin 18c03eb836
Fix smart annotation links on the item card [SCI-9571] (#6501) 2023-10-19 16:35:15 +02:00
aignatov-bio 29ce96b67d
Merge pull request #6496 from aignatov-bio/ai-sci-9518-fix-bottom-toolbar-for-reports 
Fix bottom toolbar for reports [SCI-9518]
 2023-10-19 11:31:39 +02:00
Anton 4122876a90 Fix bottom toolbar for reports [SCI-9518] 2023-10-19 10:16:09 +02:00
Martin Artnik 1cf2e31e1f
Merge pull request #6489 from sboursen-scinote/sb_SCI-9549 
Fix background blurring of stacked modals [SCI-9549]
 2023-10-19 10:02:08 +02:00
ivanscinote 8b5f610c07
Fix grid rows layout for experiment table view when no results found [SCI-9482] (#6434) 2023-10-19 09:47:44 +02:00
sboursen-scinote e0d1841b7b Fix blurring of stacked modals [SCI-9549] 2023-10-18 17:15:17 +02:00
Martin Artnik 73ec9848ea
Merge pull request #6470 from artoscinote/ma_SCI_9411 
Fix MarvinJS loading race condition [SCI-9411]
 2023-10-18 15:23:21 +02:00
ajugo 965deded98
Fix collapsing/extending containers on shareable results [SCI-9555] (#6476) 2023-10-18 10:15:43 +02:00
Gregor Lasnibat 22c718d61c
Fixed protocol template table header covered by the list [SCI-9520] (#6457) 2023-10-17 16:32:02 +02:00
Martin Artnik 947d5e6744 Fix MarvinJS loading race condition [SCI-9411] 2023-10-17 15:15:11 +02:00
ajugo 67008a54d6
Fix item sidebar showing on full view of inventory [SCI-9525] (#6447) 2023-10-16 10:18:22 +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 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 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
ajugo 04a898760a
Add assign button to item cards [SCI-9158] (#6326) 2023-10-12 15:46:13 +02:00
ajugo 4b5c7362e5
Fix opening of the datetime picker direction [SCI-9146] (#6395) 2023-10-12 15:37:23 +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
Anton 84477cad43 Update css for shared protocol [SCI-9476] 2023-10-11 11:41:34 +02:00
Andrej 79118effa7 Merge branch 'develop' into features/october-release 2023-10-10 11:09:04 +02:00
Martin Artnik 5bd9834e91 Fix issues with project filters [SCI-9492] 2023-10-10 10:12:26 +02:00
Martin Artnik 7a01020a2d
Merge pull request #6389 from aignatov-bio/ai-sci-small-css-fixes 
CSS fixes
 2023-10-09 11:34:57 +02:00
Anton c39ba5afe6 Css fixes 2023-10-09 11:29:28 +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
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
Martin Artnik 56f53a7ed8
Merge pull request #6366 from lasniscinote/gl_SCI_9463 
Fixed project filter not saved, red dot missing [SCI-9463]
 2023-10-06 15:33:51 +02:00
Gregor Lasnibat 7c7c0b0d88 Working on project filter not saved, red dot missing [SCI-9463] 
Fixed project filters not saved/red dot not showing when applied [SCI-9463]

PR fix 01 [SCI-9463]
 2023-10-06 15:31:00 +02:00
wandji20 8408b65818 Fix issue with text name when importting protocol eln file [SCI-9490] 2023-10-06 14:19:42 +01: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
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
Alex Kriuchykhin b73f88f91c
Merge pull request #6359 from rekonder/aj_SCI_9452 
Fix opening protocol parser import modal [SCI-9452]
 2023-10-05 15:28:18 +02: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
Andrej 0a53b2e6bc Fix opening protocol parser import modal [SCI-9452] 2023-10-04 17:13:27 +02:00
Andrej 0889c40d46 Fix icons and OVE view for attachments [SCI-9445] 2023-10-04 16:18:03 +02:00
Alex Kriuchykhin e4e4992415
Merge pull request #6338 from sboursen-scinote/sb_SCI-8126-fix3 
Fix no-result placeholder position for archived project list [SCI-8126]
 2023-10-04 15:46:51 +02:00
Martin Artnik 5b29ccd1f9
Merge pull request #6354 from lasniscinote/gl_SCI_9418 
Fixed edit date/datetime columns range option selection [SCI-9418]
 2023-10-04 14:16:27 +02:00
Gregor Lasnibat 6dbc3c5aaa Fixed edit date/datetime columns range option selection [SCI-9418] 
Fixed edit date/datetime columns range option selection [SCI-9418]
 2023-10-04 14:05:51 +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
Giga Chubinidze 5544b0e50e uniquefied gallery param from js 2023-10-04 14:49:32 +04: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
Gregor Lasnibat edabe117a9 Fix scroll to start when navigating inventory pages [SCI-9393] 
PR fix 01 [SCI-9393]
 2023-10-04 10:54:03 +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 615d6ebbfa Wrong icon on the Export button in bottom toolbar & Manage columns back button [SCI-9447] 2023-10-04 04:56:17 +04:00
sboursen-scinote 1aaea77070 Add dynamic card placeholder calculation to prevent scrollbars [SCI-9068] 2023-10-03 15:00:26 +02:00
sboursen-scinote d3fbfc3618 Fix no-result placeholder position for archived project list [SCI-8126] 2023-10-03 14:04:09 +02:00
Ivan Kljun 667025b7c6 Fix UI for consumption/edit stock/assign to task modals [SCI-9407] 2023-10-03 11:12:03 +02: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
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
Giga Chubinidze f99db28760 using tailwind 2023-10-03 11:04:38 +04:00
Giga Chubinidze 3932b22cd4 Smart annotation modal: inventory name not correct [SCI-9332] 2023-10-02 08:14:16 +04: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
Martin Artnik a499a0f0ea
Merge pull request #6307 from artoscinote/ma_SCI_9338 
Fix datepicker min/max limits [SCI-9338]
 2023-09-27 14:53:55 +02:00
Martin Artnik 99dd94e21f Fix datepicker min/max limits [SCI-9338] 2023-09-27 14:46:48 +02:00
Martin Artnik d86da2d145
Merge pull request #6207 from ivanscinote/SCI-9217-eye-icons-out-of-placeholder-placeholder-height 
Fix eye icon placement in password fields [SCI-9217]
 2023-09-27 14:19:41 +02:00
Martin Artnik 5da684e959
Merge pull request #6178 from artoscinote/ma_SCI_9277 
Keep asset image tooltip aspect ratio [SCI-9277]
 2023-09-27 13:40:45 +02:00
Martin Artnik 2503266b15
Merge pull request #6304 from sboursen-scinote/sb_SCI-8126-fix2 
Fix no-result placeholder position for archived project list [SCI-8126]
 2023-09-27 12:43:58 +02:00
Martin Artnik 3d04ed603f
Merge pull request #6302 from ivanscinote/SCI-9336-no-horizontal-scrollbar-on-protocol-label-templates-when-bottom-action-toolbar-is-displayed 
Fix horizotnal scrollbar position for protocol & label templates [SCI-9336]
 2023-09-27 12:43:04 +02:00
Martin Artnik 923006dc38
Merge pull request #6300 from aignatov-bio/ai-sci-9382-results-bug-fixes 
Bug fixes [SCI-9382][SCI-9392][SCI-9395][SCI-9396]
 2023-09-27 12:41:34 +02:00
sboursen-scinote e446522e81 Fix no-result placeholder position for archived project list [SCI-8126] 2023-09-27 10:14:54 +02:00
Ivan Kljun d53e2e8a5a Fix horizotnal scrollbar position for protocol & label templates [SCI-9336] 2023-09-27 08:53:02 +02:00
Anton f630b8860b Bug fixes [SCI-9382][SCI-9392][SCI-9395][SCI-9396] 2023-09-26 16:23:16 +02:00