Commit graph

2989 commits

Author SHA1 Message Date
ajugo 0c24360a81
Fix error message for protocol notes and repository item name [SCI-7185] (#5258) 2023-04-25 14:34: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
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
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