Commit graph

4340 commits

Author SHA1 Message Date
Anton a33b1b0da7 Update scinote icon font 2023-05-17 12:00:59 +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
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
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
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
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
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
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