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

2126 commits

Author SHA1 Message Date
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
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
Anton 15a6f72894 Navigator CSS fixes [SCI-8430][SCI-8439] 2023-05-16 14:05:56 +02:00
Andrej e1a90348d5 Resolve conflicts after navigator merge 2023-05-16 10:49:40 +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
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
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
Martin Artnik 1af7015e8b Fix main navigation issues [SCI-8324] 2023-05-08 14:44:50 +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
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
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
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
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