scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 14:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity
12930 commits 69 branches 179 tags 165 MiB
Commit graph

10086 commits

Author SHA1 Message Date
Andrej e1a90348d5 Resolve conflicts after navigator merge 2023-05-16 10:49:40 +02:00
artoscinote cf13160c4f
Merge pull request #5398 from aignatov-bio/ai-sci-8405-improve-navigation-in-archive-state 
Improve navigation in archive state [SCI-8405]
 2023-05-16 10:38:37 +02:00
artoscinote 1d30389298
Merge pull request #5407 from G-Chubinidze/gc_SCI_8441 
CSS: Smaller visual bugs; Inventory & Tasks [SCI-8441]
 2023-05-16 10:38:04 +02:00
ajugo c6f5219043
Display all protocol templates for team admin [SCI-8379] (#5391) 2023-05-16 10:29:00 +02:00
ajugo d8945cc627
Fix large asset preview [SCI-8433] (#5408) 2023-05-16 10:24:08 +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
Giga Chubinidze dee32d8986 CSS: Smaller visual bugs; Inventory & Tasks [SCI-8441] 2023-05-16 11:22:46 +04: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
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
Anton 08652e9dde Improve navigation in archive state [SCI-8405] 2023-05-11 13:14:56 +02:00
aignatov-bio 7682054481
Merge pull request #5395 from aignatov-bio/ai-sci-8400-fix-navigator-sorting 
Fix navigator sorting [SCI-8400]
 2023-05-11 13:03:07 +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
Anton 8b901cb485 Fix navigator sorting [SCI-8400] 2023-05-11 12:38:54 +02:00
aignatov-bio cc181f1da7
Merge pull request #5369 from aignatov-bio/ai-sci-8394-fix-inivte-user-modal 
Fix css for invite user modal [SCI-8394]
 2023-05-11 11:35:53 +02:00
aignatov-bio 8c0eb993d5
Merge pull request #5384 from G-Chubinidze/gc_SCI_8395 
Error with 500 status code for several pages in Settings [SCI-8395]
 2023-05-11 11:35:00 +02: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
artoscinote dae4697585
Merge pull request #5383 from artoscinote/ma_SCI_8315 
Track user full name update in navigation [SCI-8315]
 2023-05-11 11:27:12 +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
aignatov-bio 4737a2d4bc
Merge pull request #5382 from aignatov-bio/ai-sci-8386-refactor-protocol-toolbar 
Update protocol top toolbar [SCI-8386]
 2023-05-10 11:39:38 +02:00
Oleksii Kriuchykhin f903ec80e5 Merge branch 'hotfix/1.27.1.2' into develop 2023-05-10 10:35:45 +02:00
G-Chubinidze fa84365404
Merge pull request #5380 from G-Chubinidze/gc_SCI_8332 
File drop area font size is incorrect [SCI-8332]
 2023-05-10 00:54:57 +04:00
Alex Kriuchykhin ab318df1af
Update permissions for team owner to see all protocols and can manage users [SCI-8380] (#5371) 2023-05-09 16:23:29 +02:00
Giga Chubinidze 05b16c17d7 Error with 500 status code for several pages in Settings [SCI-8395] 2023-05-09 17:37:02 +04:00
Martin Artnik 27e34ab407 Track user full name update in navigation [SCI-8315] 2023-05-09 15:21:07 +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
G-Chubinidze 82d0657593
Merge branch 'features/navigation-refactor-v2' into gc_SCI_8389 2023-05-09 13:41:51 +04: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
Giga Chubinidze 2ad5a5ed7e File drop area font size is incorrect [SCI-8332] 2023-05-09 01:39:12 +04:00
Giga Chubinidze a462765cdb code cleanup 2023-05-09 00:06:37 +04: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
Giga Chubinidze f680fc43b9 Navigator elements not displaying tooltips on hover [SCI-8389] 2023-05-08 01:52:05 +04: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 2ae1d545c9 Fix css for invite user modal [SCI-8394] 2023-05-05 11:20:32 +02:00