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

4668 commits

Author SHA1 Message Date
ajugo
14b3a1318b
Fix empty page for inventory and fix task title [SCI-8556] (#5511) 
* Remove empty state for inventory [SCI-8556]

* Fix shrinking of the task title on task page [SCI-8556]
 2023-05-30 11:19:10 +02:00
ajugo
d56eeeb26a
Fix top action switch padding problem [SCI-8570] (#5512) 2023-05-30 11:15:06 +02:00
Martin Artnik
bb32f3a935 Improve bottom action toolbar responsiveness [SCI-8550] 2023-05-29 16:34:07 +02:00
artoscinote
9d6ea63d6b
Merge pull request #5508 from artoscinote/ma_SCI_8538 
Fix pagination dropdown z-index [SCI-8538]
 2023-05-29 15:42:20 +02:00
Martin Artnik
2dcfd6e7b2 Fix pagination dropdown z-index [SCI-8538] 2023-05-29 15:40:38 +02:00
artoscinote
d6a8f779d0
Merge pull request #5507 from artoscinote/ma_SCI_8564 
Fix edit overlays for repository table [SCI-8564]
 2023-05-29 15:27:12 +02:00
Martin Artnik
e5c54a0c42 Fix edit overlays for repository table [SCI-8564] 2023-05-29 15:25:05 +02:00
ajugo
2e9fe37040
Fix repository table reloading and flash messages [SCI-8554] (#5504) 
* Fix repository table reloading and flash messages [SCI-8554]

* Pass function for repository reload [SCI-8554]
 2023-05-29 11:48:13 +02:00
artoscinote
01b54763a2
Merge pull request #5477 from G-Chubinidze/gc_SCI_8464 
CSS: inventory items top toolbar issues [SCI-8464]
 2023-05-29 11:32:16 +02:00
G-Chubinidze
43218900e4
Merge branch 'develop' into gc_SCI_8496 2023-05-29 13:27:18 +04:00
Giga Chubinidze
017781d0dc cleanup 2023-05-29 13:25:54 +04:00
artoscinote
1b1ecbfbaf
Merge pull request #5488 from G-Chubinidze/gc_SCI_8147 
Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147]
 2023-05-29 11:08:41 +02:00
artoscinote
5612303f79
Merge pull request #5487 from G-Chubinidze/gc_SCI_8098 
Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098]
 2023-05-29 11:07:53 +02:00
artoscinote
852bba642f
Merge pull request #5500 from G-Chubinidze/gc_SCI_8385 
Empty screen revamp [SCI-8385]
 2023-05-29 11:02:15 +02:00
artoscinote
b1fe71719a
Merge pull request #5503 from sboursen-scinote/sb_SCI-8546 
Duplicated item created in the inventory [SCI-8546]
 2023-05-29 10:38:42 +02:00
ajugo
e2624987bd
Save repository table page to local storage [SCI-8512] (#5501) 2023-05-29 10:27:00 +02:00
artoscinote
5b90a657e4
Merge pull request #5502 from artoscinote/ma_SCI_8525 
Add 'no actions' message to action toolbar [SCI-8525]
 2023-05-29 10:26:42 +02:00
artoscinote
f233d4d73f
Merge pull request #5499 from G-Chubinidze/gc_SCI_8448 
breadcrumb css issue & archive projects url fix [SCI-8448]
 2023-05-29 10:22:22 +02:00
sboursen-scinote
6240dd0a5f Fix hound [SCI-8546] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-29 09:55:31 +02:00
Martin Artnik
a5fe01a07a Add 'no actions' message to action toolbar [SCI-8525] 2023-05-29 09:33:18 +02:00
Giga Chubinidze
59bdd7d8d2 Empty screen revamp [SCI-8385] 2023-05-29 01:42:26 +04:00
sboursen-scinote
65cad3fedd Fix duplicated items created in inventories [SCI-8546] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-28 22:36:52 +02:00
Giga Chubinidze
fc045389b8 Broken assigned inventory item to task table [SCI-8523] 2023-05-28 02:59:34 +04:00
aignatov-bio
876987bc70
Merge pull request #5490 from aignatov-bio/ai-sci-8504-css-issues-on-task 
Fix css issues on task [SCI-8504]
 2023-05-26 17:10:09 +02:00
sboursen-scinote
2e580705ae Fix hound [SCI-8347] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-26 14:52:53 +02:00
Giga Chubinidze
038226fa19 removed test code 2023-05-26 13:44:11 +04:00
Soufiane
cb14333fca
Issues with the "Assign item to task" modal part 1 [SCI-8513] (#5486) 
* Fix Select bounding box calculations [SCI-8513]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Abbreviate very long select text [SCI-8513]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Remove gap when dropdown is open [SCI-8513]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Fix hound [SCI-8513]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Add small refactor [SCI-8513]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

---------

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-26 11:41:47 +02:00
sboursen-scinote
a77ee62f8e Fix hover effect depending on the type of the navigator link [SCI-8509] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-26 11:19:27 +02:00
aignatov-bio
603418d888
Merge pull request #5484 from aignatov-bio/ai-sci-8501-revert-images-to-inline 
Revert images to inline [SCI-8501]
 2023-05-26 11:14:50 +02:00
aignatov-bio
642932bbcc
Merge pull request #5475 from rekonder/aj_SCI_8490 
Add empty states for PET [SCI-8490]
 2023-05-26 11:14:38 +02:00
aignatov-bio
9018bf00df
Merge pull request #5483 from aignatov-bio/ai-sci-8529-fix-experiment-header-name-container 
Fix project/experiment name container size [SCI-8529]
 2023-05-26 11:13:28 +02:00
aignatov-bio
e25f91daf7
Merge pull request #5482 from aignatov-bio/ai-sci-8483-fix-toolbar-and-pagination 
Unify datatables layout [SCI-8583]
 2023-05-26 11:13:18 +02:00
Anton
6716a5880e Fix css issues on task [SCI-8504] 2023-05-26 11:12:47 +02:00
Giga Chubinidze
5e11e3a874 fixed mymodule breadcrumb 2023-05-26 03:45:16 +04:00
Giga Chubinidze
81db122a08 Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147] 2023-05-26 03:14:27 +04:00
Giga Chubinidze
d72653aff2 Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098] 2023-05-26 02:59:19 +04:00
Soufiane
fc1ce332de
Issue with scrollbar in smart annotation pop-up [SCI-8420] (#5479) 
* Fix issues in smart annotation pop-up

- Initialize perfectScrollBar on the current atWho container.
- Close AtWho pop-up when tinyMCE editor is closed.

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Fix hound [SCI-8420]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Close smart annotation pop-up after tinyMCE save [SCI-8420]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

---------

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-25 16:01:36 +02:00
Giga Chubinidze
acabba32e5 made it nicer 2023-05-25 15:46:33 +04:00
Anton
a0fc7aeef8 Revert images to inline [SCI-8501] 2023-05-25 13:35:04 +02:00
G-Chubinidze
2e21e286b7
Merge branch 'develop' into gc_SCI_8464 2023-05-25 15:32:00 +04:00
Anton
c005825b47 Fix project/experiment name container size [SCI-8529] 2023-05-25 13:22:30 +02:00
Anton
e755eb73a3 Unify datatables layout [SCI-8583] 2023-05-25 13:12:27 +02:00
Anton
ce7f50908d Inventory css fixes [SCI-8510] 2023-05-25 12:14:41 +02:00
Giga Chubinidze
9d9b454dc4 CSS: inventory items top toolbar issues [SCI-8464] 2023-05-25 11:18:47 +04:00
Giga Chubinidze
b0e93b4666 removed rounded borders * included user info flyout 2023-05-25 10:52:49 +04:00
Andrej
9164534548 Add empty states for PET [SCI-8490] 2023-05-24 18:15:41 +02:00
aignatov-bio
9470313899
Merge pull request #5473 from aignatov-bio/ai-sci-8518-multiple-css-fixes 
Multiple small css fixes [SCI-8518]]SCI-8529]
 2023-05-24 12:11:11 +02:00
aignatov-bio
29713d01f4
Merge pull request #5468 from G-Chubinidze/gc_SCI_8448 
CSS: Breadcrumbs css issues [SCI-8448]
 2023-05-24 12:07:41 +02:00
aignatov-bio
1da074bc2a
Merge pull request #5461 from G-Chubinidze/gc_SCI_8370 
Revamp of (top) toolbar - Reports [SCI-8370]
 2023-05-24 12:07:17 +02:00
aignatov-bio
4a3520883b
Merge pull request #5416 from G-Chubinidze/gc_SCI_8299 
Implement the bottom action toolbar - inventories [SCI-8299]
 2023-05-24 12:06:47 +02:00
Anton
007eae16cc Multiple small css fixes [SCI-8518]]SCI-8529] 2023-05-24 12:03:47 +02:00
Giga Chubinidze
5cd32d5cfa hound fix 2023-05-24 13:48:32 +04:00
Giga Chubinidze
34d64f6f44 hound fix 2023-05-24 13:39:38 +04:00
Giga Chubinidze
378bf37ba4 changed with mixin 2023-05-24 13:34:59 +04:00
Anton
5a7530cdfb Fix label templates pagination [SCI-8483] 2023-05-24 11:24:02 +02:00
aignatov-bio
3f218785e1
Merge pull request #5470 from sboursen-scinote/sb_SCI-8449 
Drop down gets out of page at scrolling page [SCI-8449]
 2023-05-24 10:51:34 +02:00
Soufiane
f21dc998b9
Add filtering for project/experiment filter for assignable tasks [SCI-8442] (#5441) 
* Remove object without  edit permission in P/E/T filters [SCI-8442]

* Leave only experiments and projects with active tasks [SCI-8442]
 2023-05-24 10:47:27 +02:00
Soufiane
c7fcd0a52f
Activate assign items button in Results page [SCI-8419] (#5469) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-24 10:35:58 +02:00
Giga Chubinidze
379ef7a9cc moved to develop, fixed pagination style 2023-05-24 11:57:06 +04:00
sboursen-scinote
bb9a466d61 Fix hound [SCI-8449] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-24 02:34:42 +02:00
sboursen-scinote
b63bf04454 Fix projects and eperiments tables headers [SCI-8449] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-24 02:31:02 +02:00
sboursen-scinote
34032d54a2 Fix dropdown menu z-index in experiments and projects pages [SCI-8449] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-24 01:37:09 +02:00
sboursen-scinote
118cf1fe81 Update the values of z-index after Amanda overhaul [SCI-8347] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-23 23:26:32 +02:00
sboursen-scinote
61f19df51f Merge branch 'develop' into sb_SCI-8347 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-23 23:11:57 +02:00
sboursen-scinote
1f83679e5e Merge branch 'develop' into sb_SCI-8347 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-23 23:08:20 +02:00
Giga Chubinidze
f99c1db551 CSS: Breadcrumbs css issues [SCI-8448] 2023-05-24 00:52:39 +04:00
aignatov-bio
6b020f1316
Merge pull request #5467 from G-Chubinidze/gc_SCI_8473 
Position of opened drop down [SCI-8473]
 2023-05-23 21:14:44 +02:00
aignatov-bio
1a9eab09c3
Merge pull request #5463 from aignatov-bio/ai-sci-8426-fix-tiny-mce-in-safari 
Fix tinyMCE layout in safari [SCI-8426]
 2023-05-23 21:13:21 +02:00
Giga Chubinidze
f77bafad66 Position of opened drop down [SCI-8473] 2023-05-23 22:31:36 +04:00
Giga Chubinidze
d43f10bc6a 'Save PDF to inventory' uppercase word in the button & double modal [SCI-8496] 2023-05-23 22:21:34 +04:00
Soufiane
136fff1f09
Using more than one way of adding file results file title is lost [SCI-8346] (#5354) 
Persist uploaded items names when adding new ones [SCI-8346]
 2023-05-23 17:30:37 +02:00
Giga Chubinidze
1b060893e7 moved toolbar 2023-05-23 18:03:10 +04:00
ajugo
040b3bddce
Add state switch to experiment level for archived experiments [SCI-8503] (#5464) 2023-05-23 15:29:14 +02:00
Anton
043ce88434 Fix tinyMCE layout in safari [SCI-8426] 2023-05-23 13:28:31 +02:00
aignatov-bio
cdec8023ba
Merge pull request #5448 from aignatov-bio/ai-sci-8413-fix-action-toolbar-init 
Fix action toolbar init [SCI-8413]
 2023-05-23 12:20:16 +02:00
Anton
c107a48d61 Fix action toolbar init [SCI-8413] 2023-05-23 12:08:04 +02:00
aignatov-bio
2bbeef0775
Merge pull request #5457 from G-Chubinidze/gc_SCI_8302 
Reports bottom action toolbar position update [SCI-8302]
 2023-05-23 12:02:55 +02:00
Giga Chubinidze
31807eb4ab updated padding of table & toolbar 2023-05-23 13:15:19 +04:00
aignatov-bio
ae6e44ee27
Merge pull request #5446 from G-Chubinidze/gc_SCI_8473 
Position of opened drop down [SCI-8473]
 2023-05-23 10:39:12 +02:00
aignatov-bio
9c20916d8a
Merge pull request #5453 from aignatov-bio/ai-sci-8515-refactor-inventories-scrolling 
Fix inventory page layout [SCI-8515]
 2023-05-23 10:34:47 +02:00
ajugo
3036c24be3
Prevent double click on protocol creation modal [SCI-8466] (#5458) 2023-05-23 09:50:34 +02:00
Anton
ecbd900362 Fix inventory page layout [SCI-8515] 2023-05-22 15:47:59 +02:00
aignatov-bio
607386d186
Merge pull request #5450 from aignatov-bio/ai-sci-8483-fix-action-toolbar-and-pagination 
Fix action toolbar position [SCI-8483]
 2023-05-22 12:50:53 +02:00
Anton
7c9142de5e Fix action toolbar init [SCI-8413] 2023-05-22 11:31:46 +02:00
Anton
d0c031e072 Fix task page background size [SCI-8497] 2023-05-22 10:35:29 +02:00
Giga Chubinidze
2acbae71c4 Position of opened drop down [SCI-8473] 2023-05-22 11:07:56 +04:00
aignatov-bio
2f372fd871
Merge pull request #5440 from aignatov-bio/ai-sci-8427-fix-mobile-view 
Fix mobile view [SCI-8427]
 2023-05-19 11:41:58 +02:00
Anton
45609461ce Fix mobile view [SCI-8427] 2023-05-19 10:24:44 +02:00
artoscinote
47d2b4ab6a
Merge pull request #5431 from aignatov-bio/ai-sci-8456-fix-users-css-in-invite-modal 
Fix elements alignment in dropdown tags [SCI-8456]
 2023-05-18 16:47:14 +02:00
artoscinote
ad64628c8c
Merge pull request #5435 from aignatov-bio/ai-sci-8480-fix-protocols-icons-position 
Fix protocol icons position [SCI-8480]
 2023-05-18 16:46:02 +02:00
Martin Artnik
e0fb01f164 Remove unecessary view mode button text update [SCI-8436] 2023-05-18 16:43:11 +02:00
ajugo
7e771d457e
Fix assigning items from smart annotation with one team inventory [SCI-8484] (#5434) 2023-05-18 16:23:00 +02:00
Soufiane
351ba06840
FIX: new relic CSP [SCI-8118][SCI-8119] (#5430) 
Switch to newRelic manual browser agent using a nonce [SCI-8118][SCI-8119]
 2023-05-18 14:20:20 +02:00
Anton
c57188853e Fix protocol icons position 
[SCI-8480]
 2023-05-18 14:00:05 +02:00
Anton
201117298b Fix elements alignment in dropdown tags [SCI-8456] 2023-05-18 13:29:13 +02:00
Martin Artnik
b18e0c8c53 Add missing icon [SCI-8489] 2023-05-18 11:38:16 +02:00
Andrej
100eab9cb0 Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/plate_templates 2023-05-18 10:56:10 +02:00
artoscinote
cabd6bbed5
Merge pull request #5423 from sboursen-scinote/sb_SCI-8252 
Button in the toolbar for assigning items to task from the inventory [SCI-8252]
 2023-05-18 09:59:49 +02:00
artoscinote
557b422935
Revert "Revamp of (top) toolbar - Reports [SCI-8370]" 2023-05-18 09:46:28 +02:00
artoscinote
8bd6759d5d
Merge pull request #5387 from G-Chubinidze/gc_SCI_8370 
Revamp of (top) toolbar - Reports [SCI-8370]
 2023-05-18 09:46:03 +02:00
artoscinote
ef0bf65c19
Merge pull request #5424 from G-Chubinidze/gc_SCI_8302 
Implement the bottom action toolbar - reports [SI-8302]
 2023-05-18 09:44:53 +02:00
Alex Kriuchykhin
0cc253172f
Merge pull request #5326 from rekonder/aj_SCI_8082 
Reverse table header/row numbering for plate templates [SCI-8082]
 2023-05-18 09:34:19 +02:00
aignatov-bio
31bb1210af
Merge pull request #5422 from aignatov-bio/ai-sci-8438-navigation-css-fixes 
Update navigation css [SCI-8438]
 2023-05-18 08:58:48 +02:00
Giga Chubinidze
f161354f1b Implement the bottom action toolbar - reports [SI-8302] 2023-05-18 00:42:16 +04:00
sboursen-scinote
316952034e Fix hound [SCI-8252] 2023-05-17 19:07:47 +02:00
sboursen-scinote
478b731830 Fix the search_select outline [SCI-8252] 2023-05-17 18:19:31 +02:00
sboursen-scinote
16ccd9703f Implement the assign to task button [SCI-8252] 2023-05-17 16:18:11 +02:00
artoscinote
20593f087e
Merge pull request #5421 from artoscinote/ma_SCI_8399 
Implement new toolbar for protocols [SCI-8399]
 2023-05-17 15:00:38 +02:00
Anton
3bdd903623 Update navigation css [SCI-8438] 2023-05-17 14:18:16 +02:00
Martin Artnik
eb5fb16b1b Implement new toolbar for protocols [SCI-8399] 2023-05-17 14:12:40 +02:00
aignatov-bio
23f4b01c8e
Merge pull request #5418 from aignatov-bio/ai-sci-update-scinote-icon-font 
Update SciNote icon font
 2023-05-17 12:30:13 +02:00
Anton
a33b1b0da7 Update scinote icon font 2023-05-17 12:00:59 +02:00
Alex Kriuchykhin
5a06f649d6
Merge pull request #5417 from scinote-eln/features/sa-item-assigning 
Features/sa item assigning
 2023-05-17 11:45:13 +02:00
artoscinote
aeb84e18d0
Implement bottom action toolbar for repository items [SCI-8300] 
Implement bottom action toolbar for repository items [SCI-8300]
 2023-05-17 11:27:55 +02:00
Andrej
32d8fc3e0c Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/sa-item-assigning 2023-05-16 14:26:12 +02:00
G-Chubinidze
49454fd8c8
Merge branch 'develop' into gc_SCI_8305 2023-05-16 16:19:46 +04:00
artoscinote
f9a41a9203
Merge pull request #5413 from aignatov-bio/ai-sci-8430-navigator-css-fix 
Navigator CSS fixes [SCI-8430][SCI-8439]
 2023-05-16 14:16:49 +02:00
Anton
15a6f72894 Navigator CSS fixes [SCI-8430][SCI-8439] 2023-05-16 14:05:56 +02:00
Martin Artnik
c8521cd9c4 Make search icon right-alinged [SCI-8301] 2023-05-16 12:30:32 +02:00
Martin Artnik
c8994573fd Add bottom action toolbar to label templates [SCI-8301] 2023-05-16 11:40:07 +02:00
artoscinote
fc6f443b1e
Merge pull request #5410 from rekonder/fix_conflicts 
Resolve conflicts after navigator merge
 2023-05-16 10:59:44 +02:00
Andrej
e1a90348d5 Resolve conflicts after navigator merge 2023-05-16 10:49:40 +02:00
artoscinote
a856759c08
Merge pull request #5379 from sboursen-scinote/sb_SCI-8378 
Select/Unselect all does not update visibility of buttons [SCI-8378]
 2023-05-16 10:40:06 +02:00
ajugo
c6f5219043
Display all protocol templates for team admin [SCI-8379] (#5391) 2023-05-16 10:29:00 +02:00
Anton
9b2ae96a43 Merge branch 'develop' into features/navigation-refactor-v2 2023-05-16 10:22:11 +02:00
Soufiane
c28f86d46d
Refactor inline events [SCI-8434] (#5403) 
Refactor inline events in task results [SCI-8434]
 2023-05-16 09:34:36 +02:00
Anton
8be2a02d9b Fix my module layout 2023-05-15 15:38:44 +02:00
aignatov-bio
e16ffc08d5
Merge pull request #5404 from aignatov-bio/ai-sci-8421-refactor-my-module-page-layout 
Refactor Module page layout [SCI-8421]
 2023-05-15 14:22:16 +02:00
Anton
e2a14c1853 Refactor Module page layout [SCI-8421] 2023-05-15 14:17:41 +02:00
artoscinote
df8a380a87
Merge pull request #5386 from sboursen-scinote/sb_SCI-8371 
CSS: label printer part 1 [SCI-8371]
 2023-05-15 13:17:17 +02:00
Giga Chubinidze
8830729db8 removed unnecessary css 2023-05-15 11:16:23 +04:00
Giga Chubinidze
405897c564 updated code to fit new state dropdown logic + updated card view 2023-05-15 11:12:07 +04:00
Soufiane
9c3f6812bd
CSS: label printer part 2 [SCI-8374] (#5381) 
* Fix pin and checkbox alignment in the header [SCI-8374]

* Fix hound [SCI-8374]
 2023-05-15 09:00:37 +02:00
Soufiane
935a63fc26
Fix smart annotation user avatar style [SCI-7798] (#5352) 2023-05-15 08:49:12 +02:00
ajugo
e0b742b336
Fix assigning of inventory items from inventory card [SCI-8416] (#5397) 2023-05-11 13:18:19 +02:00
G-Chubinidze
7173ee3ee6
Merge pull request #5392 from G-Chubinidze/gc_SCI_8402 
CSS - top action bar missing border on dropdown fields [SCI-8402]
 2023-05-11 14:42:31 +04:00
Giga Chubinidze
3d968073ae changed color hash to color constant 2023-05-11 14:40:56 +04:00
aignatov-bio
3b7c3a6f5b
Merge pull request #5390 from artoscinote/ma_SCI_8369 
Label templates to toolbar copy [SCI-8369]
 2023-05-11 11:30:31 +02:00
aignatov-bio
168fa0a4bc
Merge pull request #5394 from aignatov-bio/ai-sci-8283-add-barcode-search-field 
Add barcode search field [SCI-8283]
 2023-05-11 11:26:48 +02:00
artoscinote
566b302ce1
Merge pull request #5378 from artoscinote/ma_SCI_8324 
Fix main navigation issues [SCI-8324]
 2023-05-11 11:26:30 +02:00
Anton
8f5560b016 Add barcode search field [SCI-8283] 2023-05-11 11:21:50 +02:00
Giga Chubinidze
b48cde19b9 CSS - top action bar missing border on dropdown fields [SCI-8402] 2023-05-11 10:32:52 +04:00
ajugo
74516da01a
Update reports for plate templates and add headers to docx tables [SCI-8375] (#5373) 
Update reports for plate templates and add headers to docx tables [SCI-8375]
 2023-05-10 16:15:14 +02:00
Martin Artnik
33e9057fef Label templates to toolbar copy [SCI-8369] 2023-05-10 15:18:51 +02:00
Oleksii Kriuchykhin
f903ec80e5 Merge branch 'hotfix/1.27.1.2' into develop 2023-05-10 10:35:45 +02:00
Giga Chubinidze
57c0e299e8 Revamp of (top) toolbar - Reports [SCI-8370] 2023-05-10 01:09:05 +04:00
Anton
5ec202e2c4 Update protocol top toolbar [SCI-8386] 2023-05-09 14:59:43 +02:00
sboursen-scinote
1624941c03 Fix CSS issues label printer and label templates and setting pages [SCI-8371] 2023-05-09 14:07:53 +02:00
artoscinote
09c4100115
Merge pull request #5374 from artoscinote/ma_SCI_8393 
Project dropdown menu fixes [SCI-8393]
 2023-05-09 12:43:29 +02:00
aignatov-bio
a19def15f3
Merge pull request #5357 from G-Chubinidze/gc_SCI_8306 
Revamp of (top) toolbar + search field - inventories and items [SCI-8306] [SCI-8307]
 2023-05-09 11:18:05 +02:00
sboursen-scinote
b7cc592a3d Fix the duplicate and delete buttons when select_all is clicked [SCI-8378] 2023-05-08 17:06:15 +02:00
sboursen-scinote
47fde38cde Refactor the onClick on template label names to fit the CSP [SCI-8378] 2023-05-08 17:02:26 +02:00
Martin Artnik
1af7015e8b Fix main navigation issues [SCI-8324] 2023-05-08 14:44:50 +02:00
ajugo
783d5d03ab
Add edit button to label templates and fix last updated by [SCI-8373] (#5376) 2023-05-08 11:27:29 +02:00
sboursen-scinote
32297c3312 Use fixed position for select option and add a fix for modals [SCI-8250] 2023-05-08 11:05:22 +02:00
Andrej
97bde133a8 Fix plate template JSON creation [SCI-8082] 2023-05-08 10:25:50 +02:00
sboursen-scinote
d6a3da2c6f Fix hound [SCI-8250] 2023-05-08 09:57:31 +02:00
sboursen-scinote
5f8eafedf9 Create a modal for item assignment from inventory page [SCI-8250] 
- Fix the behavior of the search_select.
- Fix select options positioning.
- Get the items to assign from selected rows.
- Style the modal.

Style the modal [SCI-8250]

Fix select options positioning [SCI-8250]
 2023-05-08 09:43:18 +02:00
Martin Artnik
cd7b365613 Project dropdown menu fixes [SCI-8393] 2023-05-05 15:47:53 +02:00
aignatov-bio
35d728f783
Merge pull request #5372 from aignatov-bio/ai-sci-8339-new-color-mapping 
New color mapping [SCI-8339]
 2023-05-05 14:15:02 +02:00
aignatov-bio
bb5efde533
Merge pull request #5370 from aignatov-bio/ai-sci-8333-fix-css-for-message-number-in-notifications 
Fix counter css for notifications [SCI-8333]
 2023-05-05 14:06:50 +02:00
Anton
f48e09786e New color mapping [SCI-8339] 2023-05-05 14:05:17 +02:00
Anton
9ac8719d9f Fix counter css for notifications [SCI-8333] 2023-05-05 11:45:43 +02:00
Anton
560ddca839 Add html support to disclaimer body and enable during registration [SCI-8410][SCI-8407] 2023-05-05 10:44:22 +02:00
Martin Artnik
7a6fe5050d Fix project folder delete action [SCI-8391] 2023-05-04 14:59:16 +02:00
artoscinote
ef8a518a83
Merge pull request #5360 from artoscinote/ma_SCI_8298 
Implement task table bottom toolbar [SCI-8298]
 2023-05-04 14:40:53 +02:00
Anton
5a9470f5dd Fix navigator update [SCI-8390] 2023-05-04 14:02:04 +02:00
Andrej
29a9c3781e Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/sa-item-assigning 2023-05-04 13:34:45 +02:00
Martin Artnik
9b875371a4 Implement task table bottom toolbar [SCI-8298] 2023-05-04 11:29:19 +02:00
Anton
36b9bfa734 Fix breadcrumbs overlap issues [SCI-8382] 2023-05-04 10:21:19 +02:00
Giga Chubinidze
efa0ae9534 Revamp of (top) toolbar - items [SCI-8307] 2023-05-03 23:25:13 +04:00
ajugo
2b82b6a74e
Include plate templates metadata to the protocol import/export [SCI-8354] (#5348) 2023-05-03 16:38:07 +02:00
Soufiane
94465ffb93
Unicode issue in Protocol and destroy user modal [SCI-7512] (#5328) 
* Fix unicode issue in destroy team member modal [SCI-7512]
 2023-05-03 16:08:46 +02:00
artoscinote
7aeb1c6adf
Merge pull request #5341 from artoscinote/ma_SCI_8249 
Implement basic select/search-select components in vue [SCI-8249]
 2023-05-03 12:37:47 +02:00
Martin Artnik
863054b044 Implement basic select/search-select components in vue [SCI-8249] 2023-05-03 12:37:14 +02:00
Soufiane
1b34de37ef
CSP and inline js refactor [SCI-8118][SCI-8119] (#5206) 
CSP and inline js refactor [SCI-8118][SCI-8119]
 2023-05-03 11:31:17 +02:00
Soufiane
58782131a8
Flash message for delete draft [SCI-8245] (#5300) 
Add redirect flash message after draft delete and before the location redirect [SCI-8245]
 2023-05-03 11:16:59 +02:00
Soufiane
df0995d867
Move button for archived task in card view [SCI-8253] (#5322) 
Implemet the Move task functionality for archived tasks cards view [SCI-8253]
 2023-05-03 11:15:17 +02:00
Soufiane
314c7cbfd9
Add object IDs to smart annotation search and global search [SCI-8085] (#5151) 
Add object codes to global search [SCI-8085]
 2023-05-03 11:07:18 +02:00
Soufiane
834bf0984d
Move generation of user annotation popover to FE [SCI-7977] (#5124) 
Move user popover to FE [SCI-7977]
 2023-05-03 09:46:18 +02:00
Giga Chubinidze
a83625fbef Revamp of (top) toolbar + search field - inventories [SCI-8306] 2023-05-03 00:58:11 +04:00
aignatov-bio
7a40a7d13f
Merge pull request #5355 from aignatov-bio/ai-sci-color-fix-for-tailwind 
Color fix for tailwind
 2023-04-28 11:24:25 +02:00
Anton
2305fa91a3 Fix colors for tailwind 2023-04-28 10:55:58 +02:00
Martin Artnik
8beb92fc39 Implement new experiments toolbar [SCI-8296] 2023-04-26 15:51:22 +02:00
Martin Artnik
ed04bc6b6a Implement new Projects bottom toolbar [SCI-8295] 2023-04-26 11:25:29 +02:00
Anton
1bc2baf1f3 Add navigator interactions [SCI-8047] 2023-04-26 10:34:02 +02:00
Soufiane
7a798dd92e
Change of color of "x" for task/step comment [SCI-8344] (#5339) 
* Change the color and the hover effect of model close button sitewide [SCI-8344]

* Fix hound [SCI-8344]
 2023-04-25 16:09:38 +02:00
Soufiane
ea2b29ff55
Remove on focus outline from bootstrap btn sitewide [SCI-8344] (#5338) 2023-04-25 16:01:48 +02:00
Soufiane
9fba6a076d
Sync the side bar open/close status with the state of the main content [SCI-7501] (#5323) 2023-04-25 15:32:28 +02:00
ajugo
9b49745194
Fix repository_row call when no repository row is selected [SCI-8281] (#5301) 2023-04-25 15:18:12 +02:00
ajugo
d4abcb4980
Implement assigning items to task when adding a smart annotation [SCI-8208] (#5295) 2023-04-25 15:12:19 +02:00
G-Chubinidze
468a5bd2df
Merge pull request #5340 from G-Chubinidze/gc_SCI_8303 
Revamp of (top) toolbar - projects, experiments [SCI-8303] [SCI-8304]
 2023-04-25 16:51:30 +04:00
Soufiane
ea94cf4581
Bulk editing will display inaccurate changes after saving [SCI-8219] (#5267) 
Fix race condition when submitting all forms [SCI-8219]
 2023-04-25 14:35:45 +02:00
ajugo
0c24360a81
Fix error message for protocol notes and repository item name [SCI-7185] (#5258) 2023-04-25 14:34:14 +02:00
aignatov-bio
af9219b7ae
Assign item through repository item modal [SCI-8141] (#5237) 2023-04-25 14:30:14 +02:00
G-Chubinidze
e9cacc3db1
Open Inventory - Double action fix [SCI-7506] (#5200) 
Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
 2023-04-25 14:21:41 +02:00
Anton
3724c38e7d Add archived state for navigator [SCI-8056] 2023-04-25 13:57:29 +02:00
G-Chubinidze
540de67956
Open the label template in the same tab [SCI-8167] (#5189) 
Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
 2023-04-25 13:12:25 +02:00
sboursen-scinote
d265d543f4 Limit dropdown menu visibility to inside my_module content-pane [SCI-8347] 2023-04-24 16:21:41 +02:00
Giga Chubinidze
5c690c25f6 button wording changes, hound fixes 2023-04-24 16:14:50 +04:00
aignatov-bio
32dc12f4d0
Merge pull request #5336 from aignatov-bio/ai-sci-8233-add-backend-for-navigator 
Add backend for navigator [SCI-8233]
 2023-04-24 12:50:14 +02:00
Anton
cb6b2c3855 Add backend for navigator [SCI-8233] 2023-04-24 12:25:56 +02:00
Giga Chubinidze
a0d863e230 Revamp of (top) toolbar - projects [SCI-8303] 2023-04-24 01:43:47 +04:00
Giga Chubinidze
07f20e0e61 Revamp of (top) toolbar - experiments 2023-04-24 00:34:36 +04:00
G-Chubinidze
c6ab7176b8
Merge pull request #5329 from G-Chubinidze/gc_SCI_8293 
Implement active/archive and view dropdowns (toolbar) [SCI-8293]
 2023-04-20 15:41:45 +04:00
Giga Chubinidze
a25e361e4f Implement active/archive and view dropdowns (toolbar) [SCI-8293] 2023-04-20 15:40:38 +04:00
artoscinote
103ce8e70d
Merge pull request #5331 from scinote-eln/develop 
Merge develop
 2023-04-20 13:31:46 +02:00
Anton
7143c3ed5d Add general layout for navigator [SCI-8046 
]
 2023-04-19 14:19:55 +02:00
Andrej
a33707bd5e Reverse table header/row numbering for plate templates [SCI-8082] 2023-04-19 12:22:22 +02:00
Anton
e8b952f4fd Revert "Revert "Improve breadcrumbs implementation [SCI-8087]"" 
This reverts commit 78d41d10a6.
 2023-04-19 10:53:39 +02:00
aignatov-bio
d7e8f0303f
Merge branch 'features/navigation-refactor-v2' into ai-sci-8016-left-navigation-refactor 2023-04-19 10:33:09 +02:00
G-Chubinidze
5eacd41ca5
Adding well plate table options to "insert step content" select menu [SCI-7931] (#5302) 
* well plate implementation without nested dropdown

* Implement dropdown submenu [SCI-7931]

* minor code cleanup

---------

Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
Co-authored-by: Martin Artnik <martin@scinote.net>
 2023-04-18 15:42:53 +02:00
artoscinote
009bffa77a
Merge pull request #5319 from sboursen-scinote/sb_SCI-8286 
Update config after protocol.io changed page_id [SCI-8286]
 2023-04-18 12:50:31 +02:00
sboursen-scinote
b8b33fe480 Update configuration after protocol.io changed default page_id to 0 [SCI-8286] 2023-04-18 12:43:56 +02:00
aignatov-bio
54cbcb4657
Merge pull request #5317 from aignatov-bio/ai-sci-7926-add-new-buttons-tyle 
Add tailwind [SCI-7926]
 2023-04-18 11:53:02 +02:00
Anton
bc2959dfb4 Add new button styles and tailwind [SCI-7926] 2023-04-18 11:36:12 +02:00
Anton
2bbc98c531 Fix signup page layout 2023-04-18 11:03:00 +02:00
aignatov-bio
20f9b41b78
Merge pull request #5314 from aignatov-bio/ai-sci-8331-small-fixes-for-notifications 
Small fixes for notifications [SCI-8331]
 2023-04-17 15:35:29 +02:00
Anton
1526553467 Small fixes for notificaitions [SCI-8331] 2023-04-17 15:23:52 +02:00
Anton
737a53633e Fix white border at task page and remove teams/users escaping for navigation [SCI-8326] 2023-04-17 11:36:08 +02:00
aignatov-bio
83790be734
Merge pull request #5112 from aignatov-bio/ai-sci-7960-add-disclaimer-to-login-page 
Add disclaimer modal [SCI-7960]
 2023-04-17 11:25:06 +02:00
Anton
8202d2e817 Add disclaimer modal [SCI-7960] 2023-04-17 11:22:50 +02:00
ajugo
b62f1f5405
Add missing flash messages [SCI-8247] (#5308) 2023-04-14 15:10:35 +02:00
Anton
3f0f32113b Fix search page scrolling [SCI-8322] 2023-04-14 13:42:41 +02:00
Anton
acd6413ca3 Fix navigation sidebar [SCI-8288] 2023-04-14 11:38:28 +02:00
aignatov-bio
cbd84b94b4
Merge pull request #5288 from aignatov-bio/ai-sci-8280-add-counters-logic-to-notifications 
Add counters logic for notifications [SCI-8280]
 2023-04-13 15:35:56 +02:00
Anton
cb7f41e516 Add counters logic for notifications [SCI-8280] 2023-04-13 15:35:21 +02:00
ajugo
e85f1f8bbd
Show error message for protocols templates with same name [SCI-8247] (#5266) 2023-04-13 15:34:36 +02:00
artoscinote
19c98653a5
Merge pull request #5299 from sboursen-scinote/sb_SCI-8223 
CSS: Protocol template list of smaller issues (Update) [SCI-8223]
 2023-04-13 15:00:33 +02:00
aignatov-bio
3ad5b779c4
Merge pull request #5298 from aignatov-bio/ai-sci-8289-css-fixes-for-navigator 
Multiple CSS fixes for navigation [SCI-8289][SCI-8313][SCI-8288][SCI-8273][SCI-8309]
 2023-04-13 14:59:39 +02:00
sboursen-scinote
ea384caa60 Fix Hound [SCI-8223] 2023-04-13 14:58:28 +02:00
Anton
caf21959bd Multiple CSS fixes for navigation [SCI-8289][SCI-8313][SCI-8288][SCI-8273][SCI-8309] 2023-04-13 14:54:03 +02:00
sboursen-scinote
14895dd9f1 Change the position of the edit buttons in the versions modal [SCI-8223] 2023-04-13 14:49:30 +02:00
aignatov-bio
9466b119a1
Merge pull request #5297 from scinote-eln/features/navigation-refactor 
Features/navigation refactor
 2023-04-13 13:59:25 +02:00
artoscinote
549ae8dae1
Merge pull request #5296 from G-Chubinidze/gc_SCI_8086 
experiment workflow image border color change
 2023-04-13 12:53:15 +02:00
Giga Chubinidze
f641c56c07 experiment workflow image border color change 2023-04-13 14:51:14 +04:00
artoscinote
d4c5f8a30f
Merge pull request #4988 from sboursen-scinote/sb_SCI-7815 
Wrong selection of select all checkbox for P/E/T, report, protocol templates tables [SCI-7815]
 2023-04-12 15:48:54 +02:00
sboursen-scinote
dcd6f6267d Merge develop in to sb_SCI-7815 [SCI-7815] 2023-04-12 15:46:52 +02:00
aignatov-bio
f357babf25
Merge pull request #5293 from aignatov-bio/ai-sci-8269-fix-horizontal-scroll-bar 
Small fixes for horizontal scrollbar [SCI-8269]
 2023-04-12 15:30:48 +02:00
Anton
5ad0d1c593 Small fixes for horizontal scrollbar [SCI-8269] 2023-04-12 15:23:35 +02:00
artoscinote
862a008f7b
Merge pull request #5246 from G-Chubinidze/gc_SCI_8140 
Change of color and hover effect of x - action button for closing the modals [SCI-8140]
 2023-04-12 15:09:28 +02:00
artoscinote
3785f22d01
Merge pull request #5275 from G-Chubinidze/gc_SCI_8271 
Fix task page - secondary navigation offset [SCI-8271]
 2023-04-12 15:08:58 +02:00
Giga Chubinidze
d33b499052 hound fix 2023-04-12 17:06:12 +04:00
artoscinote
447f9dc993
Merge pull request #5245 from G-Chubinidze/gc_SCI_8205 
Wrong wording for access button [SCI-8205]
 2023-04-12 14:40:55 +02:00
artoscinote
9769a70e08
Merge pull request #5282 from G-Chubinidze/gc_SCI_8211 
Label "(Draft)" in front of the protocol template name [SCI-8211]
 2023-04-12 14:37:15 +02:00
aignatov-bio
78d41d10a6
Revert "Improve breadcrumbs implementation [SCI-8087]" 2023-04-12 14:04:20 +02:00
artoscinote
fa64c8bb5c
Merge pull request #5283 from sboursen-scinote/sb_SCI-8223 
CSS: Protocol template list of smaller issues [SCI-8223]
 2023-04-12 12:58:25 +02:00
artoscinote
e431056ef1
Merge pull request #5289 from artoscinote/ma_SCI_8292 
Fix project pages JS selectors [SCI-8292]
 2023-04-12 12:57:00 +02:00
artoscinote
25b3889d4b
Merge pull request #5286 from G-Chubinidze/gc_SCI_8290 
No action when clicking on top buttons in single inventory [SCI-8290]
 2023-04-12 12:42:35 +02:00
Martin Artnik
eb243ca772 Fix project pages JS selectors [SCI-8292] 2023-04-12 12:33:45 +02:00