Martin Artnik
18b5222227
Merge branch 'features/inventory-item-card-edit' into develop
2023-11-22 15:09:10 +01:00
Soufiane
bc2904823d
Add link to assigned item to task for snapshots version [SCI-9689] ( #6656 )
2023-11-22 14:53:08 +01:00
Martin Artnik
0b2c8546c0
Add proper e2e ids to inventories and inventory items [SCI-9624]
2023-11-22 13:49:29 +01:00
Anton
84494a707b
Fix resize icon name
2023-11-21 15:11:42 +01:00
aignatov-bio
4d3c9381b0
Merge pull request #6679 from aignatov-bio/ai-sci-9748-fix-repository-search
...
Fix filters and missing barcode icon [SCI-9748]
2023-11-21 14:05:25 +01:00
Anton
25048ddd4e
Fix filters and missing barcode icon [SCI-9748]
2023-11-21 13:51:16 +01:00
Martin Artnik
19297c8f69
Fix label printing modal [SCI-9749]
2023-11-21 13:39:21 +01:00
Anton
6b82e12165
Fix resizeble navigator
2023-11-20 16:28:43 +01:00
wandji
91f650e227
Reload inventory table after changes to item card [SCI-9617] ( #6626 )
...
* Reload inventory table row after changes to item card [SCI-9617]
* Reload full table after updating item card column [SCI-9617]
* Update 2 line if condition formatting style [SCI-9617]
2023-11-20 15:26:01 +01:00
ajugo
8853f54ad3
Fix rendering template for additional data for reports [SCI-9717] ( #6660 )
2023-11-17 11:11:07 +01:00
Oleksii Kriuchykhin
f7d8fc96ac
Merge branch 'develop' into features/bugfixes-and-improvements
2023-11-17 10:44:32 +01:00
Martin Artnik
3547b7c2d1
Merge pull request #6655 from scinote-eln/e2e
...
Merge e2e
2023-11-16 13:23:13 +01:00
Oleksii Kriuchykhin
cc8b993430
Merge branch 'develop' into features/inventory-item-card-edit
2023-11-16 11:12:50 +01:00
Oleksii Kriuchykhin
e8abbbbcdf
Merge branch 'develop' into features/inventory-items-relationships
2023-11-16 11:04:27 +01:00
Anton
13eca7e035
Fix time format and picker position [SCI-9706]
2023-11-15 16:18:00 +01:00
wandji
0987ebf637
Update viewer and technician interaction on shareable link modal [SCI-9047] ( #6568 )
2023-11-15 15:55:48 +01:00
Anton
8d2187815b
Fix turbolinks cache settings [SCI-9700][SCI-9701]
2023-11-15 11:02:50 +01:00
Oleksii Kriuchykhin
3bc7edc7f7
Merge branch 'develop' into features/inventory-item-card-edit
2023-11-15 10:58:42 +01:00
Anton
7fe2922f2d
Merge branch 'features/datetime-picker' of github.com:scinote-eln/scinote-web into features/datetime-picker
2023-11-14 18:08:48 +01:00
Anton
6abc643aec
Merge branch 'develop' into features/datetime-picker
2023-11-14 18:08:03 +01:00
Anton
b162e1b04f
Fix repository range validation [SCI-9691]
2023-11-14 15:21:42 +01:00
Soufiane
12006bc286
Add relationships section to the items sidebar [SCI-9668] ( #6623 )
2023-11-14 14:04:46 +01:00
Martin Artnik
83eb4eeb16
Make task description TinyMCE init in line with the vue one [SCI-9682]
2023-11-14 11:54:50 +01:00
Anton
b7f876aa37
Date time picker improvments [SCI-9678][SCI-9688]
2023-11-14 11:26:27 +01:00
Anton
66c3a766bd
Fix datetime picker padding
2023-11-13 14:17:45 +01:00
Anton
cf0a1931cd
Merge branch 'develop' into features/datetime-picker
2023-11-13 14:14:09 +01:00
Anton
7e135405c5
Small css changes
2023-11-13 14:13:29 +01:00
wandji
64669dee4d
Increase dataTables_scrollbody width when it has y-overflow [SCI-8610] ( #6598 )
2023-11-10 14:58:15 +01:00
wandji
67ec9b63f3
Fix overlapping filename in inventory table [SCI-9199] ( #6579 )
2023-11-10 14:55:43 +01:00
Oleksii Kriuchykhin
29f43d42af
Merge branch 'features/inventory-item-card-edit' into features/inventory-items-relationships
2023-11-10 09:26:05 +01:00
Oleksii Kriuchykhin
0b72740062
Merge branch 'develop' into features/inventory-items-relationships
2023-11-10 09:19:45 +01:00
Anton
c7cd435e95
Merge branch 'develop' into features/datetime-picker
2023-11-09 11:40:26 +01:00
Martin Artnik
923df0ddfb
Merge pull request #6610 from lasniscinote/gl_SCI_9311
...
Fixed [CAPA] - Tasks do not show up in Table View [SCI-9311]
2023-11-09 10:48:59 +01:00
Martin Artnik
136440f704
Merge pull request #6582 from G-Chubinidze/gc_SCI_9521
...
Issues with attachment previews [SCI-9521]
2023-11-09 10:48:18 +01:00
Gregor Lasnibat
0109c8f288
Fixed [CAPA] - Tasks do not show up in Table View [SCI-9311]
2023-11-09 08:36:30 +01:00
Anton
f92f0790ed
Fix resizeable navigator
2023-11-08 19:32:43 +01:00
Anton
dcf206368e
Merge branch 'features/datetime-picker' of github.com:scinote-eln/scinote-web into features/datetime-picker
2023-11-08 14:57:29 +01:00
Anton
ee857feece
Merge branch 'develop' into features/datetime-picker
2023-11-08 14:19:15 +01:00
Anton
b09bd8a3c5
Add style styling to datetime pixker [SCI-9627]
2023-11-08 13:55:08 +01:00
Anton
a6b22b958c
Fix datetime picker css
2023-11-07 16:10:17 +01:00
Anton
2ab479950a
Replace datetime picker in activties and create task
2023-11-07 15:15:37 +01:00
Anton
688538aa39
Replace datetime pickers in repositories [SCI-9629]
2023-11-07 11:46:25 +01:00
Gregor Lasnibat
557142f727
CSS: Assigned users dropdown on task details [SCI-9446]
2023-11-07 11:30:57 +01:00
Martin Artnik
f26950f249
Fix initialization of MarvinJS [SCI-9642]
2023-11-06 14:16:15 +01:00
Anton
d4f555da40
Replace datepicker in filters [SCI-9626]
2023-11-06 10:12:06 +01:00
Giga Chubinidze
d84e6e2e4e
Issues with attachment previews [SCI-9521]
2023-11-06 13:06:59 +04:00
ivanscinote
e6e7805c29
Apply layout for Grover PDF library [SCI-9566] ( #6547 )
2023-11-03 13:19:46 +01:00
Martin Artnik
94ff37baf4
Merge pull request #6570 from ivanscinote/SCI-9567-move-report-fonts-to-a-separate-file-for-export
...
Move base64 SN-icon-font to reports_pdf.sass.scss [SCI-9567]
2023-11-03 11:04:09 +01:00
ajugo
d82ec3a705
Fix zebra label printing order [SCI-9575] ( #6574 )
2023-11-03 10:11:19 +01:00
Ivan Kljun
0861b7ac0b
Move base64 SN-icon-font to reports_pdf.sass.scss [SCI-9567]
2023-11-02 13:38:12 +01:00
Anton
9cb9680c55
Replace datetime picker in canvas [SCI-9630]
2023-11-02 13:36:47 +01:00
Martin Artnik
16ebf0cbe8
Revert "Revert "Refocus on tinymce editor after marvinjs img update [SCI-9515]""
2023-11-02 13:18:50 +01:00
Anton
04fc356175
Replace datepicker in task table [SCI-9631]
2023-11-02 13:11:06 +01:00
Anton
70bbc0af47
Add new datetime picker [SCI-9127]
2023-10-30 15:19:39 +01:00
wandji
a16de72611
Mange stock modal improvements [SCI-9591] ( #6545 )
...
* Mange stock modlla improvements [SCI-9591]
* Fix manage stock modal close button [SCI-9591]
* Update manage stock url after update stock value [SCI-9591]
2023-10-30 09:47:10 +01:00
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
Martin Artnik
6308779668
Merge branch 'develop' into features/notification-revamp
2023-10-27 12:04:07 +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
Anton
db3f217bba
Implement acitvity notifications
...
[SCI-9512]
2023-10-17 14:59:50 +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
225193387a
Update notifications settings saving
2023-10-16 09:41:38 +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
