Commit graph

3984 commits

Author SHA1 Message Date
Andrej
9164534548 Add empty states for PET [SCI-8490] 2023-05-24 18:15:41 +02:00
G-Chubinidze
3ea85cb2ef
Remove old client_api code [SCI-8144] (#5223)
Remove obsolete client_api code
2023-05-24 12:45:31 +02:00
aignatov-bio
9470313899
Merge pull request #5473 from aignatov-bio/ai-sci-8518-multiple-css-fixes
Multiple small css fixes [SCI-8518]]SCI-8529]
2023-05-24 12:11:11 +02:00
aignatov-bio
1da074bc2a
Merge pull request #5461 from G-Chubinidze/gc_SCI_8370
Revamp of (top) toolbar - Reports [SCI-8370]
2023-05-24 12:07:17 +02:00
aignatov-bio
4a3520883b
Merge pull request #5416 from G-Chubinidze/gc_SCI_8299
Implement the bottom action toolbar - inventories [SCI-8299]
2023-05-24 12:06:47 +02:00
Anton
007eae16cc Multiple small css fixes [SCI-8518]]SCI-8529] 2023-05-24 12:03:47 +02:00
aignatov-bio
5c3ebc2509
Merge pull request #5459 from G-Chubinidze/gc_SCI_8404
(A) label for archived projects, inventories and protocol tempates in breadcrumbs [SCI-8404]
2023-05-24 10:53:23 +02:00
Soufiane
c7fcd0a52f
Activate assign items button in Results page [SCI-8419] (#5469)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-24 10:35:58 +02:00
Giga Chubinidze
379ef7a9cc moved to develop, fixed pagination style 2023-05-24 11:57:06 +04:00
Giga Chubinidze
e553909755 moved logic to controllers & concern 2023-05-24 02:52:26 +04:00
sboursen-scinote
61f19df51f Merge branch 'develop' into sb_SCI-8347
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-23 23:11:57 +02:00
sboursen-scinote
1f83679e5e Merge branch 'develop' into sb_SCI-8347
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-23 23:08:20 +02:00
aignatov-bio
1a9eab09c3
Merge pull request #5463 from aignatov-bio/ai-sci-8426-fix-tiny-mce-in-safari
Fix tinyMCE layout in safari [SCI-8426]
2023-05-23 21:13:21 +02:00
Giga Chubinidze
1b060893e7 moved toolbar 2023-05-23 18:03:10 +04:00
ajugo
040b3bddce
Add state switch to experiment level for archived experiments [SCI-8503] (#5464) 2023-05-23 15:29:14 +02:00
Anton
043ce88434 Fix tinyMCE layout in safari [SCI-8426] 2023-05-23 13:28:31 +02:00
aignatov-bio
9c20916d8a
Merge pull request #5453 from aignatov-bio/ai-sci-8515-refactor-inventories-scrolling
Fix inventory page layout [SCI-8515]
2023-05-23 10:34:47 +02:00
Giga Chubinidze
7b158d7935 (A) label for archived projects, inventories and protocol tempates in breadcrumbs [SCI-8404] 2023-05-23 11:57:50 +04:00
ajugo
3036c24be3
Prevent double click on protocol creation modal [SCI-8466] (#5458) 2023-05-23 09:50:34 +02:00
ajugo
cf6a901b67
Fix display of table in search results [SCI-8409] (#5454) 2023-05-22 17:07:18 +02:00
Anton
ecbd900362 Fix inventory page layout [SCI-8515] 2023-05-22 15:47:59 +02:00
aignatov-bio
cbecd56122
Merge pull request #5452 from G-Chubinidze/gc_SCI_8488
Archived breadcrumbs fix [SCI-8488] [SCI-8404]
2023-05-22 12:54:17 +02:00
aignatov-bio
607386d186
Merge pull request #5450 from aignatov-bio/ai-sci-8483-fix-action-toolbar-and-pagination
Fix action toolbar position [SCI-8483]
2023-05-22 12:50:53 +02:00
Giga Chubinidze
be7dc74105 Archived breadcrumbs fix [SCI-8488] [SCI-8404] 2023-05-22 14:09:14 +04:00
Soufiane
8593132a35
CSP FIX: MarvinJS, AWS and New Relic [SCI-8500] (#5449)
* Use the actual value of the nonce for New relic [SCI-8500]

* Whitelist MarvinJs [SCI-8500]

* Whitelist used AWS bucket [SCI-8500]
2023-05-22 11:43:19 +02:00
Anton
7c9142de5e Fix action toolbar init [SCI-8413] 2023-05-22 11:31:46 +02:00
aignatov-bio
2f372fd871
Merge pull request #5440 from aignatov-bio/ai-sci-8427-fix-mobile-view
Fix mobile view [SCI-8427]
2023-05-19 11:41:58 +02:00
Anton
45609461ce Fix mobile view [SCI-8427] 2023-05-19 10:24:44 +02:00
artoscinote
112bb8bec6
Merge pull request #5439 from G-Chubinidze/gc_SCI_8332
File drop area font size is incorrect [SCI-8332]
2023-05-19 09:59:21 +02:00
Giga Chubinidze
9ee1dd695f changed font weight to normal 2023-05-19 01:00:38 +04:00
artoscinote
2a2b0f9a47
Merge pull request #5433 from aignatov-bio/ai-sci-8477-fix-navigator-button
Fix navigator button style [SCI-8477]
2023-05-18 16:46:33 +02:00
artoscinote
ad64628c8c
Merge pull request #5435 from aignatov-bio/ai-sci-8480-fix-protocols-icons-position
Fix protocol icons position [SCI-8480]
2023-05-18 16:46:02 +02:00
Soufiane
351ba06840
FIX: new relic CSP [SCI-8118][SCI-8119] (#5430)
Switch to newRelic manual browser agent using a nonce [SCI-8118][SCI-8119]
2023-05-18 14:20:20 +02:00
Anton
c57188853e Fix protocol icons position
[SCI-8480]
2023-05-18 14:00:05 +02:00
Anton
753372f9e4 Fix navigator button style [SCI-8477] 2023-05-18 13:43:26 +02:00
Andrej
100eab9cb0 Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/plate_templates 2023-05-18 10:56:10 +02:00
artoscinote
557b422935
Revert "Revamp of (top) toolbar - Reports [SCI-8370]" 2023-05-18 09:46:28 +02:00
artoscinote
8bd6759d5d
Merge pull request #5387 from G-Chubinidze/gc_SCI_8370
Revamp of (top) toolbar - Reports [SCI-8370]
2023-05-18 09:46:03 +02:00
artoscinote
ef0bf65c19
Merge pull request #5424 from G-Chubinidze/gc_SCI_8302
Implement the bottom action toolbar - reports [SI-8302]
2023-05-18 09:44:53 +02:00
Alex Kriuchykhin
0cc253172f
Merge pull request #5326 from rekonder/aj_SCI_8082
Reverse table header/row numbering for plate templates [SCI-8082]
2023-05-18 09:34:19 +02:00
aignatov-bio
31bb1210af
Merge pull request #5422 from aignatov-bio/ai-sci-8438-navigation-css-fixes
Update navigation css [SCI-8438]
2023-05-18 08:58:48 +02:00
Giga Chubinidze
f161354f1b Implement the bottom action toolbar - reports [SI-8302] 2023-05-18 00:42:16 +04:00
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
Anton
3bdd903623 Update navigation css [SCI-8438] 2023-05-17 14:18:16 +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
ajugo
43f571c154
Enable Manage access for archived protocols [SCI-8453] (#5411) 2023-05-16 13:25:33 +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
2b848733b4
Fix assigning repository items through smart annotation pop-up to task [SCI-8417] (#5401) 2023-05-16 11:08:13 +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
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
405897c564 updated code to fit new state dropdown logic + updated card view 2023-05-15 11:12:07 +04:00
ajugo
e0b742b336
Fix assigning of inventory items from inventory card [SCI-8416] (#5397) 2023-05-11 13:18:19 +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
Anton
8f5560b016 Add barcode search field [SCI-8283] 2023-05-11 11:21:50 +02:00
ajugo
74516da01a
Update reports for plate templates and add headers to docx tables [SCI-8375] (#5373)
Update reports for plate templates and add headers to docx tables [SCI-8375]
2023-05-10 16:15:14 +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
Giga Chubinidze
57c0e299e8 Revamp of (top) toolbar - Reports [SCI-8370] 2023-05-10 01:09:05 +04: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
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
Giga Chubinidze
2ad5a5ed7e File drop area font size is incorrect [SCI-8332] 2023-05-09 01:39:12 +04: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
ajugo
783d5d03ab
Add edit button to label templates and fix last updated by [SCI-8373] (#5376) 2023-05-08 11:27:29 +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
Anton
2ae1d545c9 Fix css for invite user modal [SCI-8394] 2023-05-05 11:20:32 +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
sboursen-scinote
443cd21090 WIP: Create a modal for inventory item assignment from inventory page [SCI-8250] 2023-05-05 08:44:40 +02:00
Martin Artnik
7a6fe5050d Fix project folder delete action [SCI-8391] 2023-05-04 14:59:16 +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
Giga Chubinidze
efa0ae9534 Revamp of (top) toolbar - items [SCI-8307] 2023-05-03 23:25:13 +04: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
Martin Artnik
bfaa5c991b Action toolbar init improvement [SCI-8296] 2023-04-28 10:33:44 +02:00
artoscinote
334f111eba
Merge pull request #5351 from artoscinote/ma_SCI_8296
Implement new experiments toolbar [SCI-8296]
2023-04-28 10:32:22 +02:00
Martin Artnik
7744183a6e Edit form fix [SCI-8296] 2023-04-28 10:29:38 +02:00
Martin Artnik
8beb92fc39 Implement new experiments toolbar [SCI-8296] 2023-04-26 15:51:22 +02:00
Martin Artnik
ed04bc6b6a Implement new Projects bottom toolbar [SCI-8295] 2023-04-26 11:25:29 +02:00
Anton
1bc2baf1f3 Add navigator interactions [SCI-8047] 2023-04-26 10:34:02 +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
b01fc03101
Merge pull request #5333 from G-Chubinidze/gc_SCI_8337
Remove screen / code for the page **/system_notifications [SCI-8337]
2023-04-25 16:56:24 +04: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
sboursen-scinote
a1ff64e3f2 Fix missing translation in my_module archived results [SCI-8347] 2023-04-24 16:42:49 +02: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
Giga Chubinidze
74f8abecab Remove screen / code for the page **/system_notifications 2023-04-24 14:29:45 +04: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
Martin Artnik
7af146a580 Fix team dropdown on automatic team change [SCI-8352] 2023-04-21 12:25:42 +02: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
artoscinote
103ce8e70d
Merge pull request #5331 from scinote-eln/develop
Merge develop
2023-04-20 13:31:46 +02:00
Anton
7143c3ed5d Add general layout for navigator [SCI-8046
]
2023-04-19 14:19:55 +02:00
Andrej
a33707bd5e Reverse table header/row numbering for plate templates [SCI-8082] 2023-04-19 12:22:22 +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
artoscinote
009bffa77a
Merge pull request #5319 from sboursen-scinote/sb_SCI-8286
Update config after protocol.io changed page_id [SCI-8286]
2023-04-18 12:50:31 +02:00
sboursen-scinote
b8b33fe480 Update configuration after protocol.io changed default page_id to 0 [SCI-8286] 2023-04-18 12:43:56 +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
Anton
8202d2e817 Add disclaimer modal [SCI-7960] 2023-04-17 11:22:50 +02:00
Anton
acd6413ca3 Fix navigation sidebar [SCI-8288] 2023-04-14 11:38:28 +02:00
Anton
cb7f41e516 Add counters logic for notifications [SCI-8280] 2023-04-13 15:35:21 +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
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
aignatov-bio
9466b119a1
Merge pull request #5297 from scinote-eln/features/navigation-refactor
Features/navigation refactor
2023-04-13 13:59:25 +02:00
Anton
5ad0d1c593 Small fixes for horizontal scrollbar [SCI-8269] 2023-04-12 15:23:35 +02:00
aignatov-bio
78d41d10a6
Revert "Improve breadcrumbs implementation [SCI-8087]" 2023-04-12 14:04:20 +02:00
Martin Artnik
867a2795e0 Fix remaining _pack asset helpers [SCI-8291] 2023-04-12 11:10:01 +02:00
Soufiane
0f8918e9f6
Revision notes written in version modal are not seen/saved [SCI-8279] (#5272)
* Load latest protocol version comment in publish modal [SCI-8279]

* Check publish permission before updating the draft comment [SCI-8279]
2023-04-11 12:50:14 +02:00
artoscinote
b3275feedb
Merge pull request #5276 from G-Chubinidze/gc_SCI_7633_v2
updated device table stylings
2023-04-11 10:18:59 +02:00
artoscinote
8a7667432c
Merge pull request #5234 from G-Chubinidze/gc_SCI_8211
Label '(Draft)' in front of the protocol template name [SCI-8211]
2023-04-11 10:14:17 +02:00
Giga Chubinidze
1d44eea8cf updated device table stylings 2023-04-10 23:57:43 +04:00
artoscinote
f6902ea0ef
Merge pull request #5265 from aignatov-bio/ai-sci-8272-fix-archived-results
Fix results archived page [SCI-8272]
2023-04-07 09:56:39 +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
sboursen-scinote
287b63f2c5 Remove uneeded data and classes [SCI-8087] 2023-04-06 17:20:49 +02:00
Anton
46b3791125 Fix results archived page [SCI-8272] 2023-04-06 17:16:43 +02:00
Oleksii Kriuchykhin
60579465ab Refactor user_notifications controller, remove unused code [SCI-8207] 2023-04-06 14:57:00 +02:00
sboursen-scinote
7a3d5e03f4 Refactore after review [SCI-8087] 2023-04-06 12:23:33 +02:00
sboursen-scinote
55be84cda7 Remove missed old breadcrumbs [SCI-8087] 2023-04-05 16:29:37 +02:00
artoscinote
bd02b71efe
Merge pull request #5157 from sboursen-scinote/sb_SCI-7670
Pressing Enter button cancels adding of a image on task result [SCI-7670]
2023-04-05 15:27:22 +02:00
artoscinote
0f8c73771a
Merge pull request #5001 from sboursen-scinote/sb_SCI-7783
CSS - inventory [SCI-7783]
2023-04-05 15:24:18 +02:00
Anton
52aac69488 Add final version for left menu [SCI-8016] 2023-04-03 13:29:24 +02:00
Alex Kriuchykhin
bed256cd37
Merge pull request #5231 from artoscinote/ma_SCI_8131
Handle removal of last owner public group [SCI-8131]
2023-04-03 13:02:38 +02:00
Martin Artnik
132593c854 Prevent removal of last manually assigned user manager [SCI-8131] 2023-04-03 11:46:32 +02:00
sboursen-scinote
d40fa5972c Remove old implementation in projects and experiments [SCI-8087] 2023-04-02 19:11:25 +02:00
sboursen-scinote
6d34ea41d2 Style the new breadcrumbs [SCI-8087] 2023-04-02 18:42:21 +02:00
sboursen-scinote
8ae354b180 Merge branch 'features/navigation-refactor' into sb_SCI-8087 2023-04-02 17:33:23 +02:00