Commit graph

12959 commits

Author SHA1 Message Date
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
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
ajugo
43f571c154
Enable Manage access for archived protocols [SCI-8453] (#5411) 2023-05-16 13:25:33 +02:00
artoscinote
9d98f81875
Merge pull request #5389 from artoscinote/ma_SCI_8301
Add bottom action toolbar to label templates [SCI-8301]
2023-05-16 12:52:52 +02:00
Martin Artnik
c8521cd9c4 Make search icon right-alinged [SCI-8301] 2023-05-16 12:30:32 +02:00
Martin Artnik
503099e331 Added edit buttons, updates to wording [SCI-8301] 2023-05-16 12:27:28 +02:00
Martin Artnik
c8994573fd Add bottom action toolbar to label templates [SCI-8301] 2023-05-16 11:40:07 +02:00
ajugo
f7087a7c24
Switch team for label template opening [SCI-8377] (#5402) 2023-05-16 11:23:32 +02:00
Soufiane
19cad569b3
Cache the values of formulas of HOT tables in meta data [SCI-8173] (#5406) 2023-05-16 11:19:56 +02:00
Soufiane
dda3d1bc6b
Fix typo [SCI-8250] (#5393) 2023-05-16 11:19:19 +02:00
ajugo
2b848733b4
Fix assigning repository items through smart annotation pop-up to task [SCI-8417] (#5401) 2023-05-16 11:08:13 +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
artoscinote
069d9e4708
Merge pull request #5396 from aignatov-bio/ai-sci-8340-add-new-tags-colors
Add new tags colors [SCI-8340]
2023-05-16 10:38:55 +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
aignatov-bio
57d736cbe4
Merge pull request #5409 from scinote-eln/features/navigation-refactor-v2
Features/navigation refactor v2
2023-05-16 10:23:38 +02:00
Anton
f52fb14bc3 Merge branch 'features/navigation-refactor-v2' of github.com:scinote-eln/scinote-web into features/navigation-refactor-v2 2023-05-16 10:22:46 +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
aignatov-bio
582c83d454
Merge pull request #5405 from aignatov-bio/ai-sci-fix-my-module-layout
Fix my module layout
2023-05-15 18:03:04 +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
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
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
Anton
9b0d9be2ff Add new tags colors [SCI-8340] 2023-05-11 13:02:41 +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
Soufiane
57466a06eb
Merge pull request #5377 from sboursen-scinote/sb_SCI-8250
Create a modal for item assignment from inventory page [SCI-8250]
2023-05-11 09:19:02 +02:00
Giga Chubinidze
b48cde19b9 CSS - top action bar missing border on dropdown fields [SCI-8402] 2023-05-11 10:32:52 +04:00
Soufiane
b1ccd5839b
Implement backend for inventory item assignment to tasks [SCI-8248] (#5367)
Implement backend for inventory item assignment to tasks [SCI-8248]
2023-05-10 16:12:20 +02:00
Martin Artnik
33e9057fef Label templates to toolbar copy [SCI-8369] 2023-05-10 15:18:51 +02:00