Commit graph

985 commits

Author SHA1 Message Date
Andrej f493ec0da1 Merge branch 'develop' into features/shareable-links 2023-07-19 12:57:20 +02:00
Soufiane 12dd66b6a6
Fix smart annotation popover in tasks [SCI-8867] (#5805) 2023-07-18 15:59:47 +02:00
sboursen-scinote bb7eee9b64 Fix smart annotation popover in tasks [SCI-8866][SCI-8867] 2023-07-18 14:55:19 +02:00
Anton 1087f67228 Merge branch 'develop' into features/remove-front-end-gems 2023-07-18 14:36:40 +02:00
Soufiane 1dfc46e995
Fix comments update action [SCI-8873] (#5786) 2023-07-17 13:04:56 +02:00
Oleksii Kriuchykhin a95aab85e2 Merge branch 'develop' into features/shareable-links 2023-07-13 15:04:27 +02:00
Oleksii Kriuchykhin fca9aea4a8 Merge branch 'features/rails-upgrade' into develop 2023-07-13 13:10:59 +02:00
Soufiane 78d8a54e0d
Remove BMT and bioeddie from Scinote [SCI-8643] (#5760) 2023-07-13 09:45:53 +02:00
Soufiane 6d98b0c235
Reports - Issues after rails upgrade [SCI-8830] (#5758)
* Fix reports issues after rails upgrade [SCI-8830]

* Fix report image assets [SCI-8830]
2023-07-12 15:42:34 +02:00
Soufiane d8658991d6
Fix task page issues after rails upgrade [SCI-8821] (#5745) 2023-07-11 09:21:22 +02:00
Soufiane 6aaa68f320
Fix reports issues after rails upgrade [SCI-8830] (#5748) 2023-07-11 09:20:29 +02:00
Soufiane 33bb79d17a
Implement details and notes sections of shareable links [SCI-8750] (#5710)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-07-06 15:10:26 +02:00
Anton 4b82ba9613 Merge branch 'features/rails-upgrade' into features/remove-front-end-gems 2023-07-06 11:14:48 +02:00
Alex Kriuchykhin 5f1c6bf2f0
Fix multiple issues after Rails upgrade [SCI-8780] (#5716) 2023-07-05 12:43:23 +02:00
Anton b956f9de25 Remove bootstrap form 2023-07-03 12:59:13 +02:00
Oleksii Kriuchykhin 66b361c689 Upgrade Rails to version 7.0.5 [SCI-8632] 2023-06-21 14:38:32 +02:00
Anton 4e972de096 UI CSS fixes 2023-06-19 15:58:17 +02:00
ajugo 89f1efc64e
Update shared status in inventory datatable [SCI-8655] (#5604) 2023-06-15 15:32:01 +02:00
Anton c4f82cc756 Css fixes [SCI-8671] 2023-06-15 15:12:51 +02:00
Martin Artnik dcc30822f5 New icon tweaks & fixes [SCI-8366] 2023-06-08 17:33:50 +02:00
Giga Chubinidze a777fd5584 New icons implementation [SCI-8366] 2023-06-08 10:33:37 +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
Andrej 20052e966a Fix rendering of simple repository view on task [SCI-8418] 2023-05-18 09:08:12 +02:00
Anton 9b2ae96a43 Merge branch 'develop' into features/navigation-refactor-v2 2023-05-16 10:22:11 +02:00
Giga Chubinidze 05b16c17d7 Error with 500 status code for several pages in Settings [SCI-8395] 2023-05-09 17:37:02 +04: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
ajugo aded20752c
Optimize stock cell loading [SCI-8172] (#5345) 2023-05-03 16:21:27 +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 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
aignatov-bio d7e8f0303f
Merge branch 'features/navigation-refactor-v2' into ai-sci-8016-left-navigation-refactor 2023-04-19 10:33:09 +02:00
Anton 8202d2e817 Add disclaimer modal [SCI-7960] 2023-04-17 11:22:50 +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
ajugo b631839f6c
Fix designated user task on task canvas [SCI-8278] (#5279) 2023-04-11 16:29:51 +02:00
Anton 52aac69488 Add final version for left menu [SCI-8016] 2023-04-03 13:29:24 +02:00
Anton 0c76d7a9b1 Merge branch 'develop' into features/navigation-refactor 2023-03-31 20:31:30 +02:00
Oleksii Kriuchykhin 7ef2f68078 Merge branch 'hotfix/1.26.6.3' into develop 2023-03-23 13:26:12 +01:00
Anton 854fc1764b Refactor left/top navigation [SCI-8055] 2023-03-22 14:08:21 +01:00
Oleksii Kriuchykhin 3443a6fb85 Fix create step comments permissions [SCI-8174] 2023-03-22 12:52:08 +01:00
Oleksii Kriuchykhin ba5afe0e6b Check permissions on current user during PDF report generation [SCI-7919] 2023-03-22 10:51:45 +01: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 248b6b6581 Remove additional code 2023-03-17 11:11:59 +01:00
Alex Kriuchykhin 483a7aad5b
Improve special character escaping in data attributes [SCI-8137] (#5149) 2023-03-15 16:01:01 +01:00
sboursen-scinote c6bb9850ea Merge feature/protocol_versioning into sb_SCI-8007 [SCI-8007] 2023-03-15 09:24:45 +01:00
ajugo 0fe3f5f38f
Fix missing tooltip and hover effect for access modal role selection [SCI-8122] (#5140) 2023-03-14 18:41:32 +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
sboursen-scinote e9bdd218fa Sanitize te user_names_with_roles [SCI-8007] 2023-03-10 09:46:45 +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
ajugo 86092e08fb
Remove not needed user roles on protocol access modals [SCI-8031] (#5098) 2023-03-08 12:10:36 +01:00
sboursen-scinote 248b13aa72 Fix hound [SCI-8030] 2023-03-03 14:32:08 +01:00
sboursen-scinote 443ee4350c Fix protocol repository sidebar on archived view [SCI-8030] 2023-03-03 14:11:40 +01:00
Anton f7d7113239 Add new protocol activities [SCI-7717] 2023-02-22 10:46:24 +01:00
Alex Kriuchykhin e020b4a416
Improve tags sanitization in smart annotations (#5008) 2023-02-21 16:53:04 +01:00
Anton ea9d2d8291 Merge branch 'develop' into features/protocol_versioning 2023-02-14 11:07:58 +01:00
Anton a679e0ea62 Add inherit information to access modal [SCI-7882] 2023-02-07 15:19:20 +01:00
Oleksii Kriuchykhin e887e7c82b Merge branch 'develop' into features/sso-improvements 2023-02-01 16:08:56 +01:00
Alex Kriuchykhin 94806047c0
Make SSO feature switchable [SCI-7764] (#4916) 2023-02-01 15:43:20 +01:00
Alex Kriuchykhin e1c4aa9469
Move Okta and Azure AD configurations to application settings [SCI-7609] (#4732) 2023-01-31 11:55:31 +01:00
Alex Kriuchykhin 02da980ab8
Fix task protocol editing with empty description [SCI-7823] (#4897) 2023-01-27 14:15:09 +01:00
Alex Kriuchykhin b3267d7934
Fix multiple inventory reminders issues [SCI-7805][SCI-7808][SCI-7809] (#4876) 2023-01-24 09:36:13 +01:00
Anton 37eb902b25 Refactor access modals P/E/T [SCI-7619] 2023-01-22 22:23:18 +01:00
Alex Kriuchykhin 1ac86b8188
Merge pull request #4832 from okriuchykhin/ok_SCI_7638
Improve loading speed of inventory table [SCI-7638]
2023-01-18 11:39:52 +01:00
Oleksii Kriuchykhin e51cf28ec6 Improve loading speed of inventory table [SCI-7638] 2023-01-18 11:10:43 +01:00
ajugo d8adbb1d3d
Implement completed and due date changes [SCI-7725] (#4816) 2023-01-13 10:18:35 +01:00
ajugo 67dcbb0fa6
Open the correct experiment view [SCI-7662][SCI-7741] (#4798)
* Fix experiment view loading [SCI-7662]

* Fix experiment view loading [SCI-7662]
2023-01-12 11:31:04 +01:00
Anton 9c488d5a0c Add new access user modal [SCI-7518] 2023-01-03 14:43:03 +01:00
aignatov-bio ea661f3c19
Merge branch 'develop' into features/new_experiment_views 2022-12-22 13:33:25 +01:00
Andrej 41362f300e Implement 2fa screen after sign in [SCI-7612] 2022-12-21 11:59:25 +01:00
artoscinote a3e8000360
Merge branch 'develop' into features/exposed_ids 2022-12-08 15:58:11 +01:00
G-Chubinidze df4ac4d5b3
Merge pull request #4429 from G-Chubinidze/gc_SCI_7172
Expose project IDs in tables & cards view [SCI-7172]  [SCI-7173] [SCI-7201]
2022-12-02 20:16:05 +04:00
Oleksii Kriuchykhin 78660fb1aa Improve sorting of task results [SCI-7543] 2022-12-02 14:58:36 +01:00
ajugo 8ff822c7e5
Implement due date column in experiment table view [SCI-7406] (#4646)
* Implement due date column in experiment table view [SCI-7406]

* Fix due date [SCI-7406]

* Move text to translation [SCI-7406]

* Fix table due date partial [SCI-7406]

* Fix table due date partial [SCI-7406]
2022-12-02 11:01:40 +01:00
Anton bd77433fce Add user assignments dropdown for experiment table [SCI-7440] 2022-11-29 13:42:39 +01:00
Giga Chubinidze ba0ebfbe29 Update sorting on Projects and Experiments pages [SCI-7175] 2022-11-26 01:18:54 +04:00
G-Chubinidze 81c5978805
Merge branch 'features/exposed_ids' into gc_SCI_7172 2022-10-28 15:05:38 +04:00
ajugo bdf56ea2a1
Add comments to the experiment table view [SCI-7217] (#4583) 2022-10-27 14:41:35 +02:00
Oleksii Kriuchykhin 173e3b09cd Fix user invitation modal [SCI-7308] 2022-10-06 17:55:51 +02:00
Martin Artnik e99e021479 Fix user smart annotations [SCI-7219] 2022-09-16 16:08:36 +02:00
Giga Chubinidze b31f60026a Expose project IDs in tables & cards view [SCI-7172] [SCI-7173] 2022-09-15 22:20:04 +04:00
Anton 0c596bb701 Merge branch 'develop' into features/label-templates 2022-09-15 10:40:17 +02:00
Anton 75a15310ac Merge branch 'features/team-permissions' into features/label-templates 2022-09-13 14:26:15 +02:00
Oleksii Kriuchykhin fc77adf2bc Fix toggling of checklist items with smart annotations [SCI-7070] 2022-08-10 14:48:47 +02:00
Anton 6131b6c0b7 Add new templates section and navigation [SCI-7017] 2022-07-26 13:53:51 +02:00
Oleksii Kriuchykhin 382d54320e Improve repository table loading speed [SCI-7002] 2022-07-25 15:39:11 +02:00
Martin Artnik 910c36af08 Merge branch 'features/step-editing-improvements' into develop 2022-07-05 10:12:10 +02:00
Oleksii Kriuchykhin 07716e56a5 Improve Inventory table loading time [SCI-6886] 2022-06-08 13:23:39 +02:00
Martin Artnik 9abbe22c26 Merge branch 'develop' into features/step-editing-improvements 2022-06-02 11:26:39 +02:00
Oleksii Kriuchykhin c5c3afa906 Update team users table with new user assignments [SCI-6842] 2022-06-01 15:06:19 +02:00
Anton 7bc5c622a7 Add comments to step [SCI-6837] 2022-05-25 15:06:12 +02:00
Oleksii Kriuchykhin 6febad1b95 Update the exiting permissions helpers so they will check new permissions [SCI-6821] 2022-05-24 10:49:49 +02:00
Oleksii Kriuchykhin cac33bed25 Update user invitations with new user roles [SCI-6823] 2022-05-19 09:04:25 +02:00
Anton 134558355d Add file modal [SCI-6828] 2022-05-18 11:12:53 +02:00
Oleksii Kriuchykhin 03ec4cb319 Setup user assignments relations for team, inventory and protocol [SCI-6818] 2022-05-17 14:32:14 +02:00
Anton 9aaf4a136e Add menu to attachment cards [SCI-6816] 2022-05-17 10:41:34 +02:00
Oleksii Kriuchykhin dfc68b997c Fix display of repository snapshot with stock consumption [SCI-6824] 2022-05-10 22:21:48 +02:00
artoscinote 98ac1c126f
Stock editing and reminder fixes [SCI-6803] (#4078)
* Fix stock editing after adding new value [SCI-6803]

* Don't load reminders for snapshots [SCI-6803]
2022-05-09 11:20:38 +02:00
artoscinote da8250dba8
Stock / stock consumption display fixes [SCI-6771] (#4054) 2022-04-25 15:23:12 +02:00
Alex Kriuchykhin 49bc361dee
Fix formatting of stock consumption on tasks [SCI-6737] (#4050) 2022-04-25 13:08:33 +02:00