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

2854 commits

Author SHA1 Message Date
Alex Kriuchykhin 2efab1c3b6
Update placeholder text for empty projects [SCI-8580] (#5526) 2023-05-31 13:12:47 +02:00
Giga Chubinidze 68a0be9218 changed empty screen title 2023-05-31 02:09:21 +04:00
Soufiane 46fc3d17e6
Broken modal for sharing inventories [SCI-8548] (#5506) 
* Fix share_modal js loading [SCI-8548]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Fix hound [SCI-8548]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Fix hound [SCI-8548]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

---------

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-30 16:15:20 +02:00
artoscinote 98a27b083a
Merge pull request #5344 from sboursen-scinote/sb_SCI-8347 
FIle/step dropdown is out of task border [SCI-8347]
 2023-05-30 13:46:10 +02:00
artoscinote 01b54763a2
Merge pull request #5477 from G-Chubinidze/gc_SCI_8464 
CSS: inventory items top toolbar issues [SCI-8464]
 2023-05-29 11:32:16 +02:00
Martin Artnik a5fe01a07a Add 'no actions' message to action toolbar [SCI-8525] 2023-05-29 09:33:18 +02:00
Soufiane 1a689c9329
Add no-options placehoder to experiments dropdown [SCI-8517] (#5495) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-26 21:10:53 +02:00
ajugo 10453aefb6
Add routes for protocol template API endpoints [SCI-7456] (#5494) 2023-05-26 16:48:59 +02:00
Soufiane e5dc1f365b
Add a no-options placeholder for projects selector [SCI-8544] (#5492) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-26 11:47:35 +02:00
G-Chubinidze 2e21e286b7
Merge branch 'develop' into gc_SCI_8464 2023-05-25 15:32:00 +04:00
Giga Chubinidze 9d9b454dc4 CSS: inventory items top toolbar issues [SCI-8464] 2023-05-25 11:18:47 +04:00
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 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
Soufiane f21dc998b9
Add filtering for project/experiment filter for assignable tasks [SCI-8442] (#5441) 
* Remove object without  edit permission in P/E/T filters [SCI-8442]

* Leave only experiments and projects with active tasks [SCI-8442]
 2023-05-24 10:47:27 +02:00
Giga Chubinidze 379ef7a9cc moved to develop, fixed pagination style 2023-05-24 11:57:06 +04: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 09501c9472
Merge pull request #5443 from sboursen-scinote/sb_SCI-8461 
Fix label case elements [SCI-8461]
 2023-05-23 10:39:49 +02:00
Soufiane b4a8fccaa8
Whitelist New Relic srcs [SCI-8500] (#5456) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-23 09:30:59 +02:00
Soufiane 9b675ba2d8
Fix CSP [SCI-8500] (#5451) 
* Move aws logic to security policy initializer [SCI-8500]

* Use if block in initializer [SCI-8500]
 2023-05-22 13:04:13 +02: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
G-Chubinidze 165aa38247
'Save PDF to inventory' uppercase word in the button & double modal [SCI-8496] (#5445) 2023-05-22 10:37:08 +02:00
sboursen-scinote f35d4f304c Fix capitalisation typos in translations [SCI-8461] 2023-05-19 14:38:58 +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
Alex Kriuchykhin 1a430a77fd
Add filtering option for active/archived PET listing API endpoints, add linked tasks to protocol serializer [SCI-7091] (#4381) 2023-05-19 11:34:31 +02:00
Soufiane 9e2ac9db28
Report preview is not loaded (CSP fix) [SCI-8500] (#5436) 
Whitelist AWS [SCI-8500]
 2023-05-19 11:26:46 +02:00
Anton 45609461ce Fix mobile view [SCI-8427] 2023-05-19 10:24:44 +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
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 cabd6bbed5
Merge pull request #5423 from sboursen-scinote/sb_SCI-8252 
Button in the toolbar for assigning items to task from the inventory [SCI-8252]
 2023-05-18 09:59:49 +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
Giga Chubinidze f161354f1b Implement the bottom action toolbar - reports [SI-8302] 2023-05-18 00:42:16 +04:00
sboursen-scinote 16ccd9703f Implement the assign to task button [SCI-8252] 2023-05-17 16:18:11 +02:00
Soufiane adaa2b6a48
Extend flash messages for direct task items assignment [SCI-8443] (#5414) 
Update item assigment modal flash messages [SCI-8443]
 2023-05-17 16:17:19 +02:00
Martin Artnik eb5fb16b1b Implement new toolbar for protocols [SCI-8399] 2023-05-17 14:12:40 +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
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
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 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 31b42dc875
Add metadata to table API endpoints [SCI-8376] (#5388) 2023-05-16 10:26:09 +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 e2a14c1853 Refactor Module page layout [SCI-8421] 2023-05-15 14:17:41 +02:00
Giga Chubinidze 405897c564 updated code to fit new state dropdown logic + updated card view 2023-05-15 11:12:07 +04:00
Anton 9b0d9be2ff Add new tags colors [SCI-8340] 2023-05-11 13:02:41 +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
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
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
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
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
G-Chubinidze 8f657710ad
Merge pull request #5385 from G-Chubinidze/gc_SCI_8303 
create folder name change [SCI-8303]
 2023-05-09 17:44:54 +04:00
Giga Chubinidze b2fa631888 create folder name change 2023-05-09 17:43:32 +04:00
Anton 5ec202e2c4 Update protocol top toolbar [SCI-8386] 2023-05-09 14:59:43 +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 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
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
Anton f48e09786e New color mapping [SCI-8339] 2023-05-05 14:05:17 +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
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 58782131a8
Flash message for delete draft [SCI-8245] (#5300) 
Add redirect flash message after draft delete and before the location redirect [SCI-8245]
 2023-05-03 11:16:59 +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 32c483316f
Enable searching by ID when smart annotating [SCI-7944] (#5055) 
Add objects search by ID in smart annotations [SCI-7944]
 2023-05-03 11:05:29 +02:00
Martin Artnik 223631b8dc Add missing entry point to webpack.config.js [SCI-8296] 2023-04-28 10:15:20 +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
Soufiane 342b581259
Replace the table header comment icon with text [SCI-8342] (#5332) 2023-04-25 15:38:10 +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
Soufiane f94d9cc0f2
Direct inventory item assignment to the current task from the item card BE [SCI-8142] (#5163) 
Implement controller action to directly assign item to task [SCI-8142]
 2023-04-25 14:00:55 +02:00
sboursen-scinote a1ff64e3f2 Fix missing translation in my_module archived results [SCI-8347] 2023-04-24 16:42:49 +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
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
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