scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-24 08:56:17 +08:00
Code Issues Packages Projects Releases Wiki Activity
13083 commits 70 branches 179 tags 166 MiB
Commit graph

2165 commits

Author SHA1 Message Date
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
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
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
ajugo 2b82b6a74e
Include plate templates metadata to the protocol import/export [SCI-8354] (#5348) 2023-05-03 16:38:07 +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 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
Anton 2305fa91a3 Fix colors for tailwind 2023-04-28 10:55:58 +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 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
aignatov-bio af9219b7ae
Assign item through repository item modal [SCI-8141] (#5237) 2023-04-25 14:30:14 +02:00
Anton 3724c38e7d Add archived state for navigator [SCI-8056] 2023-04-25 13:57:29 +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
Anton 7143c3ed5d Add general layout for navigator [SCI-8046 
]
 2023-04-19 14:19:55 +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
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
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
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
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
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 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
Giga Chubinidze e899c59535 No action when clicking on top buttons in single inventory [SCI-8290] 2023-04-12 12:18:38 +04:00
G-Chubinidze 32217475c7
Revert "Revert "Archived experiments UI improvements [SCI-8086]"" 2023-04-12 11:34:54 +04:00
sboursen-scinote 8d3c473898 Fix hound [SCI-8223] 2023-04-11 17:19:26 +02:00
Giga Chubinidze 1d44eea8cf updated device table stylings 2023-04-10 23:57:43 +04:00
Giga Chubinidze 23a057a949 Fix task page - secondary navigation offset [SCI-8271] 2023-04-10 23:30:10 +04:00
sboursen-scinote a7c8460090 Fix versions-modal comment spacing [SCI-8223] 2023-04-07 17:36:09 +02:00
sboursen-scinote 33acbc33d1 Fix filter buttons spacing [SCI-8223] 2023-04-07 16:36:32 +02:00
Anton 7b40c305e8 Add infinite scroll to notifications flyout [SCI-8282] 2023-04-07 14:06:29 +02:00
aignatov-bio 58c84634a6
Merge pull request #5238 from sboursen-scinote/sb_SCI-8087 
Improve breadcrumbs implementation [SCI-8087]
 2023-04-06 19:52:33 +02:00
Giga Chubinidze ceba49acb4 grant access new name, padding update on publish modal 2023-04-06 17:12:56 +04:00
artoscinote fe2d82b944
Merge pull request #5260 from artoscinote/ma_SCI_8270 
Fix experiment canvas sizing and padding [SCI-8270]
 2023-04-06 15:03:10 +02:00