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

3290 commits

Author SHA1 Message Date
Giga Chubinidze 038226fa19 removed test code 2023-05-26 13:44:11 +04:00
aignatov-bio 642932bbcc
Merge pull request #5475 from rekonder/aj_SCI_8490 
Add empty states for PET [SCI-8490]
 2023-05-26 11:14:38 +02:00
aignatov-bio e25f91daf7
Merge pull request #5482 from aignatov-bio/ai-sci-8483-fix-toolbar-and-pagination 
Unify datatables layout [SCI-8583]
 2023-05-26 11:13:18 +02:00
Giga Chubinidze 81db122a08 Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147] 2023-05-26 03:14:27 +04:00
Giga Chubinidze d72653aff2 Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098] 2023-05-26 02:59:19 +04:00
Soufiane fc1ce332de
Issue with scrollbar in smart annotation pop-up [SCI-8420] (#5479) 
* Fix issues in smart annotation pop-up

- Initialize perfectScrollBar on the current atWho container.
- Close AtWho pop-up when tinyMCE editor is closed.

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

* Fix hound [SCI-8420]

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

* Close smart annotation pop-up after tinyMCE save [SCI-8420]

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

---------

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-25 16:01:36 +02:00
G-Chubinidze 2e21e286b7
Merge branch 'develop' into gc_SCI_8464 2023-05-25 15:32:00 +04:00
Anton e755eb73a3 Unify datatables layout [SCI-8583] 2023-05-25 13:12:27 +02: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
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
Giga Chubinidze 5cd32d5cfa hound fix 2023-05-24 13:48:32 +04:00
Giga Chubinidze 34d64f6f44 hound fix 2023-05-24 13:39:38 +04:00
Anton 5a7530cdfb Fix label templates pagination [SCI-8483] 2023-05-24 11:24:02 +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 d43f10bc6a 'Save PDF to inventory' uppercase word in the button & double modal [SCI-8496] 2023-05-23 22:21:34 +04:00
Soufiane 136fff1f09
Using more than one way of adding file results file title is lost [SCI-8346] (#5354) 
Persist uploaded items names when adding new ones [SCI-8346]
 2023-05-23 17:30:37 +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
aignatov-bio cdec8023ba
Merge pull request #5448 from aignatov-bio/ai-sci-8413-fix-action-toolbar-init 
Fix action toolbar init [SCI-8413]
 2023-05-23 12:20:16 +02:00
Anton c107a48d61 Fix action toolbar init [SCI-8413] 2023-05-23 12:08:04 +02:00
aignatov-bio 2bbeef0775
Merge pull request #5457 from G-Chubinidze/gc_SCI_8302 
Reports bottom action toolbar position update [SCI-8302]
 2023-05-23 12:02:55 +02:00
Giga Chubinidze 31807eb4ab updated padding of table & toolbar 2023-05-23 13:15:19 +04: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
ajugo 3036c24be3
Prevent double click on protocol creation modal [SCI-8466] (#5458) 2023-05-23 09:50:34 +02:00
Anton ecbd900362 Fix inventory page layout [SCI-8515] 2023-05-22 15:47:59 +02:00
Anton 7c9142de5e Fix action toolbar init [SCI-8413] 2023-05-22 11:31:46 +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
Martin Artnik e0fb01f164 Remove unecessary view mode button text update [SCI-8436] 2023-05-18 16:43:11 +02:00
ajugo 7e771d457e
Fix assigning items from smart annotation with one team inventory [SCI-8484] (#5434) 2023-05-18 16:23:00 +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
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 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
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
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
Martin Artnik c8521cd9c4 Make search icon right-alinged [SCI-8301] 2023-05-16 12:30:32 +02:00
Martin Artnik c8994573fd Add bottom action toolbar to label templates [SCI-8301] 2023-05-16 11:40:07 +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 e2a14c1853 Refactor Module page layout [SCI-8421] 2023-05-15 14:17:41 +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
ajugo e0b742b336
Fix assigning of inventory items from inventory card [SCI-8416] (#5397) 2023-05-11 13:18:19 +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
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
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
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
sboursen-scinote b7cc592a3d Fix the duplicate and delete buttons when select_all is clicked [SCI-8378] 2023-05-08 17:06:15 +02: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
Andrej 97bde133a8 Fix plate template JSON creation [SCI-8082] 2023-05-08 10:25:50 +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 560ddca839 Add html support to disclaimer body and enable during registration [SCI-8410][SCI-8407] 2023-05-05 10:44:22 +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
Anton 5a9470f5dd Fix navigator update [SCI-8390] 2023-05-04 14:02:04 +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
ajugo 2b82b6a74e
Include plate templates metadata to the protocol import/export [SCI-8354] (#5348) 2023-05-03 16:38:07 +02:00
Soufiane 94465ffb93
Unicode issue in Protocol and destroy user modal [SCI-7512] (#5328) 
* Fix unicode issue in destroy team member modal [SCI-7512]
 2023-05-03 16:08:46 +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 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 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 9b49745194
Fix repository_row call when no repository row is selected [SCI-8281] (#5301) 2023-04-25 15:18:12 +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
Soufiane ea94cf4581
Bulk editing will display inaccurate changes after saving [SCI-8219] (#5267) 
Fix race condition when submitting all forms [SCI-8219]
 2023-04-25 14:35:45 +02:00
ajugo 0c24360a81
Fix error message for protocol notes and repository item name [SCI-7185] (#5258) 2023-04-25 14:34:14 +02:00
aignatov-bio af9219b7ae
Assign item through repository item modal [SCI-8141] (#5237) 2023-04-25 14:30:14 +02:00
G-Chubinidze e9cacc3db1
Open Inventory - Double action fix [SCI-7506] (#5200) 
Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
 2023-04-25 14:21:41 +02:00
Anton 3724c38e7d Add archived state for navigator [SCI-8056] 2023-04-25 13:57:29 +02:00
G-Chubinidze 540de67956
Open the label template in the same tab [SCI-8167] (#5189) 
Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
 2023-04-25 13:12:25 +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
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
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
Andrej a33707bd5e Reverse table header/row numbering for plate templates [SCI-8082] 2023-04-19 12:22:22 +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
sboursen-scinote b8b33fe480 Update configuration after protocol.io changed default page_id to 0 [SCI-8286] 2023-04-18 12:43:56 +02:00
Anton 1526553467 Small fixes for notificaitions [SCI-8331] 2023-04-17 15:23:52 +02:00
aignatov-bio 83790be734
Merge pull request #5112 from aignatov-bio/ai-sci-7960-add-disclaimer-to-login-page 
Add disclaimer modal [SCI-7960]
 2023-04-17 11:25:06 +02:00
Anton 8202d2e817 Add disclaimer modal [SCI-7960] 2023-04-17 11:22:50 +02:00
ajugo b62f1f5405
Add missing flash messages [SCI-8247] (#5308) 2023-04-14 15:10:35 +02:00
Anton acd6413ca3 Fix navigation sidebar [SCI-8288] 2023-04-14 11:38:28 +02:00
ajugo e85f1f8bbd
Show error message for protocols templates with same name [SCI-8247] (#5266) 2023-04-13 15:34:36 +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
sboursen-scinote dcd6f6267d Merge develop in to sb_SCI-7815 [SCI-7815] 2023-04-12 15:46:52 +02:00
Anton 5ad0d1c593 Small fixes for horizontal scrollbar [SCI-8269] 2023-04-12 15:23:35 +02:00
artoscinote 9769a70e08
Merge pull request #5282 from G-Chubinidze/gc_SCI_8211 
Label "(Draft)" in front of the protocol template name [SCI-8211]
 2023-04-12 14:37:15 +02:00
Martin Artnik eb243ca772 Fix project pages JS selectors [SCI-8292] 2023-04-12 12:33:45 +02:00
Giga Chubinidze 9d7fb94758 added condition check, now it only fires on inline_edit field 2023-04-11 18:47:01 +04:00
aignatov-bio 82333bdc18
Merge pull request #5222 from sboursen-scinote/sb_SCI-8134 
Role dropdown on protocols.io import to SciNote [SCI-8134]
 2023-04-11 11:22:50 +02:00
artoscinote 94b319f16d
Merge pull request #5277 from sboursen-scinote/sb_SCI-8286 
Protocols.io search appending results at the end of the list [SCI-8286]
 2023-04-11 11:02:47 +02:00
sboursen-scinote 6d984d8dfc Fix protocol.io search [SCI-8286] 
- Reduce the number of displayed publications to 20 for speed
- Clear the search result each time a new key (search sentence) is used
 2023-04-11 10:30:58 +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
artoscinote f2df505cfe
Merge pull request #5263 from okriuchykhin/ok_SCI_8207 
Refactor user_notifications controller, remove unused code [SCI-8207]
 2023-04-06 16:03:40 +02:00
Martin Artnik fd4bfc9ae6 Fix sidebar hiding [SCI-8270] 2023-04-06 14:57:57 +02:00
Oleksii Kriuchykhin 60579465ab Refactor user_notifications controller, remove unused code [SCI-8207] 2023-04-06 14:57:00 +02:00
Giga Chubinidze 2657c8c172 hound fixes 2023-04-06 16:31:07 +04:00
ajugo 3ad1d384ee
Raise character limit for rich text fields and reword limit text error [SCI-7959] (#5221) 2023-04-05 15:34:48 +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
Anton 0c76d7a9b1 Merge branch 'develop' into features/navigation-refactor 2023-03-31 20:31:30 +02:00
Giga Chubinidze 3fc2afde3c Label '(Draft)' in front of the protocol template name [SCI-8211] 2023-03-31 18:30:26 +04:00
ajugo 562577e960
Add flash message for removing all users [SCI-8238] (#5232) 2023-03-31 12:14:26 +02:00
sboursen-scinote 2dfcb56748 Fix dropdown direction in modals [SCI-8134] 2023-03-28 17:19:37 +02:00
Martin Artnik 6412a65d7e Fix new protocol default role, fix reload of protocol access modal [SCI-8217] 2023-03-28 16:22:38 +02:00
Martin Artnik 9904c7aae3 Add error flash when assignment update fails [SCI-8131] 2023-03-27 12:38:01 +02:00
aignatov-bio d8083b84b6
Merge pull request #5184 from aignatov-bio/ai-sci-8185-css-fixes 
Fix tables css [SCI-8185]
 2023-03-24 13:14:38 +01:00
artoscinote 00191e41de
Merge pull request #5192 from scinote-eln/features/token-revocation 
Features/token revocation
 2023-03-24 11:13:38 +01:00
ajugo e065098082
Fix protocol templates rows selection flickering [SCI-8105] (#5185) 
* Fix protocol templates rows selection flickering [SCI-8105]

* Fix double initialization of row selection [SCI-8105]
 2023-03-23 13:40:21 +01:00
Anton 4edad3f41c Fix tables css [SCI-8185] 2023-03-23 13:05:37 +01:00
ajugo 4c42748e40
Add protocolsIO import preview [SCI-8187] (#5183) 2023-03-23 12:18:30 +01:00
Giga Chubinidze 24da5a8a11 Update sidebar interactions [SCI-8128] 2023-03-23 12:54:14 +04:00
ajugo 8eb04c50c2
Add removing connected device [SCI-8146] (#5174) 2023-03-21 16:44:24 +01:00
artoscinote 44098ece5d
Revert "Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098]" 2023-03-21 15:26:06 +01:00
artoscinote e2dc2e31ee
Revert "Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147]" 2023-03-21 15:24:40 +01:00
artoscinote a43c941b50
Merge pull request #5170 from G-Chubinidze/gc_SCI_8147 
Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147]
 2023-03-21 15:18:37 +01:00
artoscinote 634b4145fd
Merge pull request #5169 from G-Chubinidze/gc_SCI_8098 
Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098]
 2023-03-21 15:17:55 +01:00
Giga Chubinidze 9dcd2f1500 Cursor position improvements, focused fields - part 2 [SCI-8147] 2023-03-21 13:17:44 +04:00
Giga Chubinidze b7490ebcca Cursor position improvements, focused fields - part 1 [SCI-8098 2023-03-21 11:14:44 +04:00
Oleksii Kriuchykhin 7fff3e8f78 Merge branch 'hotfix/1.26.6.2' into develop 2023-03-20 15:36:49 +01:00
Oleksii Kriuchykhin b67691acb5 Merge branch 'develop' into features/protocol_versioning 2023-03-17 13:53:30 +01:00
Anton da36b7268f Clean old protocol code [SCI-8154] 2023-03-16 14:37:19 +01:00
sboursen-scinote 0526bfaae1 Fix the result asset cancel behavior when clicking enter [SCI-7670] 2023-03-16 14:19:24 +01:00
Anton 5a242021e3 Fix handson table metadata issue [SCI-8138] 2023-03-16 12:02:20 +01:00
aignatov-bio fedd9e040e
Fix escaping for protocol keyword [SCI-8137] (#5147) 2023-03-15 16:04:33 +01:00
Alex Kriuchykhin 483a7aad5b
Improve special character escaping in data attributes [SCI-8137] (#5149) 2023-03-15 16:01:01 +01:00
aignatov-bio 44823da268
Fix escaping for dropdown options and keywords escaping [SCI-8137] (#5145) 2023-03-15 12:55:28 +01:00
Alex Kriuchykhin 00c63b280e
Fix displaying of escaped fields [SCI-8137] (#5141) 2023-03-15 11:14:52 +01:00
sboursen-scinote c6bb9850ea Merge feature/protocol_versioning into sb_SCI-8007 [SCI-8007] 2023-03-15 09:24:45 +01:00
aignatov-bio 9a3b056d32
Fix access modal for protocol [SCI-8063] (#5128) 2023-03-14 14:49:11 +01:00
ajugo 917269a8e9
Add micro-interactions for protocol repository modals [SCI-8091] (#5102) 2023-03-14 14:20:03 +01:00
ajugo 8acbf0b4f1
Fix revert protocol action for linked task changes [SCI-8110] (#5125) 2023-03-14 13:03:37 +01:00
Soufiane 1d396e57ab
Update of a Task Filters on a dashboard (Clear/Close function, Show results) [SCI-7607] (#4873) 
* Change the position of the clear button and update the Apply button text [SCI-7607]

* Add a clos button in the header of the dropdown [SCI-7607]

* Fix scss style issue [SCI-7607]

* Change gap to margin-right [SCI-7607]
 2023-03-14 12:53:27 +01:00
aignatov-bio e6c204a246
Fix save as new protocol modal [SCI-8003] (#5129) 2023-03-14 10:22:09 +01:00
Alex Kriuchykhin d82470aa03
Improve handling and escaping of special characters in input fields [SCI-8125] (#5135) 2023-03-13 18:00:30 +01:00
aignatov-bio 40f223deca
Fix XSS for tasks table titles [SCI-8133] (#5134) 2023-03-13 15:19:59 +01:00
aignatov-bio 946ea47d55
Fix xss for titles in tags labels [SCI-8133] (#5130) 2023-03-13 14:39:12 +01:00
ajugo 1b9b10ccfb
Fix clickaway filtering for empty filter states [SCI-8103] (#5122) 2023-03-13 13:04:23 +01:00
sboursen-scinote 55ebb4817e Fix hound [SCI-8007] 2023-03-10 09:16:50 +01:00
sboursen-scinote 506c750eee Use datatable ajax to send version param [SCI-8007] 2023-03-09 21:59:14 +01:00
sboursen-scinote c4bdbdec9a Merge branch 'features/protocol_versioning' into sb_SCI-8007 2023-03-09 16:35:36 +01:00
Soufiane 9b444cd8fb
Merge pull request #5110 from sboursen-scinote/sb_SCI-8045 
CSS bugs for "Protocol templates" [SCI-8045]
 2023-03-09 16:30:46 +01:00
sboursen-scinote a419943e4e Merge 'protocol_versioning' into sb_SCI-8045 2023-03-09 16:29:40 +01:00
sboursen-scinote e314dd4f51 Use I18n [SCI-8045] 2023-03-09 16:07:24 +01:00
aignatov-bio 376aa26ac5
Clear name on protocol create modal open [SCI-8003] (#5113) 2023-03-09 15:57:05 +01:00
ajugo b1468df3e1
Fix checkboxes at the protocol template table [SCI-8099] (#5108) 2023-03-09 15:01:21 +01:00
Martin Artnik ca4a5360ed Fix protocol link and step delete modal styling [SCI-8109] 2023-03-09 13:53:52 +01:00
Alex Kriuchykhin 87153b8899
Improve filtering of user supplied data in the input and text fields [SCI-8095] (#5106) 2023-03-09 11:38:47 +01:00
sboursen-scinote 7e58eff8de Fix hound [SCI-8045] 2023-03-08 20:56:22 +01:00
sboursen-scinote 45f3d05fdc Fix hound [SCI-8007] 2023-03-08 16:31:24 +01:00
sboursen-scinote b3f7c41548 Update the filter dropDown globaly [SCI-8007] 2023-03-08 16:25:10 +01:00
sboursen-scinote 4ec15ede61 Implement the linked_children dropdown and update the modal [SCI-8007] 2023-03-08 15:15:41 +01:00
Anton 2a794b68ac Fix protocol duplication table reload [SCI-8074] 2023-03-07 14:31:15 +01:00
Soufiane f22f00f856
Merge pull request #5067 from sboursen-scinote/sb_SCI-8032 
Old buttons at importing protocols.io protocol [SCI-8032]
 2023-03-07 14:13:02 +01:00
Soufiane d801677392
Merge branch 'develop' into sb_SCI-7562 2023-03-07 12:52:05 +01:00
Anton ece09ee9a5 Add empty state for protocol actions toolbar [SCI-8077] 2023-03-07 11:44:03 +01:00
artoscinote 5407943bfd
Merge pull request #5083 from artoscinote/ma_SCI_8039 
Protocol/general user assignment changes and fixes [SCI-8039][SCI-8037]
 2023-03-07 10:55:37 +01:00
aignatov-bio 1d9785efbe
Fix version button at action toolbar [SCI-8065] (#5085) 2023-03-07 09:52:31 +01:00
Martin Artnik 2f29477e02 Protocol/general user assignment changes and fixes [SCI-8039] 2023-03-06 16:43:46 +01:00
sboursen-scinote 587606803b Update search placeholder [SCI-8045] 2023-03-06 09:28:21 +01:00
sboursen-scinote 676eb96d00 Fix linked tasks column title [SCI-8045] 2023-03-06 08:25:46 +01:00
aignatov-bio da31883ac3
Add error handling to actions in protocol controller [SCI-8073] (#5074) 2023-03-03 15:33:08 +01:00
ajugo 8b1bc51950
Fix loading of i icon on protocol [SCI-8051] (#5061) 2023-03-03 09:55:42 +01:00
sboursen-scinote c93c8b4c5b Update full-preview-panel data id on protocol-card change [SCI-8032] 2023-03-03 09:00:12 +01:00
sboursen-scinote 8460fe3693 Implement the grant access to all team members functionality [SCI-8032] 2023-03-03 08:58:41 +01:00
Martin Artnik 165e012d23 Replace highlight.js with prism.js [SCI-7974] 2023-02-28 16:22:35 +01:00
Soufiane 53f2bc3be0
Merge pull request #4977 from sboursen-scinote/sb_SCI-7910 
Protocol templates - revert action and alert message [SCI-7910]
 2023-02-28 15:33:05 +01:00
artoscinote fab7d9c3d6
Merge pull request #5038 from artoscinote/ma_SCI_7990 
Fix protocol duplication in table [SCI-7990]
 2023-02-28 14:28:08 +01:00
Martin Artnik a3ffb38d2b Refactor cloning feature to better prepare for bulk clone [SCI-7990] 2023-02-28 14:22:02 +01:00
sboursen-scinote 1c9d9d8082 Add a small refactor [SCI-7910] 2023-02-28 14:13:18 +01:00
aignatov-bio 68cb18133f
Merge pull request #5027 from sboursen-scinote/sb_SCI-7991 
Versions button is not connected to the actions toolbar [SCI-7991]
 2023-02-28 12:09:14 +01:00
sboursen-scinote 66edffe53a Use I18n [SCI-7910] 2023-02-28 12:03:00 +01:00
sboursen-scinote b99d9c485c Revert "Update the style of the unlink protocol modal [SCI-7909]" 
This reverts commit 0f9dcda99b.
 2023-02-28 11:51:42 +01:00
sboursen-scinote 24e0fb6b48 Make it DRY [SCI-7991] 2023-02-28 10:39:56 +01:00
ajugo 0328a32e09
Update import/export for protocol templates [SCI-7986] (#5032) 2023-02-27 13:22:01 +01:00
sboursen-scinote 548cdf9457 Open protocol versions modal when actions-toolbar button is clicked [sb_SCI-7991] 2023-02-24 16:23:23 +01:00
Anton 826cb162da Add save as draft action 2023-02-22 14:59:48 +01:00
ajugo 0be0aa7629
Implement filters for protocol template datatable [SCI-7605] (#4918) 
Implement filters for protocol template datatable [SCI-7605]
 2023-02-21 14:57:43 +01:00
Anton a95ca75362 Add new protocol modal [SCI-7810] 2023-02-21 14:15:53 +01:00
aignatov-bio ae607839c1
Merge pull request #5002 from aignatov-bio/ai-sci-7715-update-protocol-io-front-end 
Update protocolsIo front-end [SCI-7715]
 2023-02-21 14:06:42 +01:00
ajugo 166208f186
Update i flyouts of protocols (task screen) [SCI-7861] (#5003) 2023-02-21 13:44:26 +01:00
Anton c775a92914 Update protocolsIo front-end [SCI-7715] 2023-02-21 11:06:54 +01:00
ajugo 461d06dad9
Fix import protocol [SCI-7915] (#4980) 2023-02-20 10:14:32 +01:00
ajugo 2c079cc918
Update protocol duplication [SCI-7900] (#4992) 2023-02-18 09:09:33 +01:00
aignatov-bio c92faeb48c
Merge pull request #4987 from aignatov-bio/ai-sci-7948-fix-cell-allignment-step-tables 
Add step table metadata during import/export and copy [SCI-7948]
 2023-02-18 08:44:37 +01:00
sboursen-scinote 063b125778 Fix hound issues [SCI-7815] 2023-02-17 15:47:37 +01:00
Martin Artnik fbf7e69100 Fix MarvinJS image toolbar [SCI-7934] 2023-02-17 15:43:57 +01:00
sboursen-scinote 9dbced7b39 Fix select-all behavior for task table [SCI-7815] 2023-02-17 15:39:24 +01:00
Anton df8579d52f Add step table metadata during import/export and copy [SCI-7948] 2023-02-17 14:50:45 +01:00
sboursen-scinote 2df05776c2 Update select-all on action-bottons [SCI-7815] 2023-02-17 12:50:26 +01:00
sboursen-scinote ed9aab8ee9 Fix select-all behavior for experiment table [SCI-7815] 2023-02-17 12:39:04 +01:00
sboursen-scinote b5c8879e57 Fix the behavior of the select-all checkbox in projects table [SCI-7815] 2023-02-17 09:18:32 +01:00
sboursen-scinote 9dd5c4d024 Add a small refactor [SCI-7815] 2023-02-16 23:18:35 +01:00
sboursen-scinote 0f606352fb Refactor reports_datatable and fix the select-all-checkbox functionality [SCI-7815] 2023-02-16 23:17:32 +01:00
sboursen-scinote 9852c4507e Fix typo [SCI-7815] 2023-02-16 20:21:46 +01:00
sboursen-scinote b0d8d80b1d Fix the behavior of the select-all checkbox in protocol template datatables [SCI-7815] 2023-02-16 20:04:34 +01:00
ajugo 9a57071d7a
Update restore action for protocol templates [SCI-7634] (#4969) 
* Update restore action for protocol templetes [SCI-7634]

* Move protocol table reload to methond [SCI-7634]
 2023-02-16 18:03:11 +01:00
Alex Kriuchykhin ed76fac640
Speed up loading of current tasks widget [SCI-7885] (#4982) 2023-02-16 13:57:17 +01:00
Anton a4e622b903 Update export action in protocol repository [SCI-7901] 2023-02-16 11:39:54 +01:00
Anton 568ab0ff66 Fix tab button on name edit fields [SCI-7922] 2023-02-14 18:24:50 +01:00
ajugo aa3ea584a9
Fix visibility of archived by and on column in repository [SCI-7674][7924] (#4973) 2023-02-14 16:27:17 +01:00
sboursen-scinote 0f9dcda99b Update the style of the unlink protocol modal [SCI-7909] 2023-02-14 16:26:06 +01:00
sboursen-scinote 4b264db343 Update the text of the inlink protocol modal [SCI-7909] 2023-02-14 14:59:05 +01:00
ajugo cb332f163f
Update the Load protocol template to task modal [SCI-7591] (#4870) 
* Update the Load protocol template to task modal [SCI-7591]

* Update the Load protocol template to task modal [SCI-7591]

* Load last protocol version from repository to task [SCI-7591]

* Fix find_by for load_table [SCI-7591]
 2023-02-14 13:19:24 +01:00
Anton 7f58440b0e Fix infinite scroll [SCI-7836] 2023-02-14 12:29:43 +01:00
Anton ea9d2d8291 Merge branch 'develop' into features/protocol_versioning 2023-02-14 11:07:58 +01:00
Anton dc5cfb9fc3 Add publish and delete action [SCI-7905] 2023-02-13 14:45:22 +01:00
ajugo dc8b147282
Add handson table metadata to reports [SCI-7835] (#4956) 
* Add handson table metadata to reports [SCI-7835]

* Fix step table loading for empty metadata [SCI-7835]
 2023-02-13 11:32:18 +01:00
artoscinote 8313572df4
Merge pull request #4953 from sboursen-scinote/sb_SCI-7625 
Assign users to task - dropdown not refreshed after removing user  [SCI-7625]
 2023-02-09 16:44:47 +01:00
Anton b55f68c0dc Update archive action for protocol templates [SCI-7898] 2023-02-09 14:10:07 +01:00
sboursen-scinote b0505adc4d Fix hound issues [SCI-7625] 2023-02-09 12:37:35 +01:00
sboursen-scinote dc333f77d5 Update the Selector when a user is selected/deselected [SCI-7625] 2023-02-09 12:30:51 +01:00
aignatov-bio 23e50cf710
Merge pull request #4882 from aignatov-bio/ai-sci-7608-update-archive-view-for-protoco-templates 
Add archive view for protocols template [SCI-7608]
 2023-02-09 11:40:47 +01:00
Anton 1a0b28c74e Add archive view for protocols template 2023-02-09 11:38:27 +01:00
aignatov-bio 193ff7bc46
Merge pull request #4891 from aignatov-bio/ai-sci-7520-implement-version-modals-interactions 
Add manage actions to version modal [SCI-7520]
 2023-02-07 13:38:33 +01:00
artoscinote b9be286802
Merge pull request #4908 from sboursen-scinote/sb_SCI-7674 
Inventories: archived by and archived on seen on active item list [SCI-7674]
 2023-02-07 10:23:28 +01:00
artoscinote db75d1cb34
Merge pull request #4938 from sboursen-scinote/sb_SCI-7831 
No warning message on modal, when importing existing protocol from protocols.io into My Protocols [SCI-7831]
 2023-02-06 16:59:08 +01:00
aignatov-bio bfb035d339
Merge pull request #4936 from aignatov-bio/ai-sci-7834-save-handson-table-metadata 
Save handson table metadata [SCI-7834]
 2023-02-06 14:24:51 +01:00
Anton 3849b1a7a1 Save handson table metadata [SCI-7834] 2023-02-06 14:21:55 +01:00
sboursen-scinote c39b660fe3 Format error before sending it from back-end [SCI-7831] 2023-02-06 13:29:15 +01:00
artoscinote d9beafd9a7
Merge pull request #4903 from sboursen-scinote/sb_SCI-7676 
CSS: error messages at moving experiment [SCI-7676]
 2023-02-06 11:12:45 +01:00
sboursen-scinote 43680f1295 Remove the key prefix (e.g. Name:) from the form-control error message [SCI-7831] 2023-02-06 11:12:32 +01:00
Soufiane 937c8564f0
Update Invite new user to team modal [SCI-6007] (#4854) 
Update Invite new user to team modal [SCI-6007]
 2023-02-01 16:27:50 +01:00