Commit graph

565 commits

Author SHA1 Message Date
Anton
1bc2baf1f3 Add navigator interactions [SCI-8047] 2023-04-26 10:34:02 +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
78d41d10a6
Revert "Improve breadcrumbs implementation [SCI-8087]" 2023-04-12 14:04:20 +02: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
Anton
46b3791125 Fix results archived page [SCI-8272] 2023-04-06 17:16:43 +02:00
sboursen-scinote
55be84cda7 Remove missed old breadcrumbs [SCI-8087] 2023-04-05 16:29:37 +02:00
Anton
0c76d7a9b1 Merge branch 'develop' into features/navigation-refactor 2023-03-31 20:31:30 +02:00
Anton
ed1c4bcb69 Replace webpacker with jsbundling-rails [SCI-7926] 2023-03-30 13:39:57 +02:00
Anton
4a5e0de54f Fix css for task protocol [SCI-8214] 2023-03-28 14:53:47 +02: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
d82470aa03
Improve handling and escaping of special characters in input fields [SCI-8125] (#5135) 2023-03-13 18:00:30 +01:00
Giga Chubinidze
b59f922143 CSS: Pixel-perfect issues for Protocol templates [SCI-8100] 2023-03-13 14:25:04 +04:00
sboursen-scinote
a419943e4e Merge 'protocol_versioning' into sb_SCI-8045 2023-03-09 16:29:40 +01:00
artoscinote
bc6afa5efa
Merge pull request #5114 from artoscinote/ma_SCI_8109
Fix protocol link and step delete modal styling [SCI-8109]
2023-03-09 14:53:21 +01:00
Martin Artnik
ca4a5360ed Fix protocol link and step delete modal styling [SCI-8109] 2023-03-09 13:53:52 +01:00
Martin Artnik
69dbc036de Display ID of original protocol in linked protocol info [SCI-8106] 2023-03-08 15:48:03 +01:00
Alex Kriuchykhin
f8a4e7ee65
Update logic for linked protocol templates with task [SCI-7973] (#5058) 2023-03-07 13:03:01 +01:00
sboursen-scinote
5e89f1f829 Update my_module protocol status dropdown [SCI-7991] 2023-03-07 05:48:20 +01:00
ajugo
b24c823597
Add linked_at to the Protocols [SCI-7964] (#5042)
* Add linked_at to the Protocols [SCI-7964]

* Add activity subject_type constrain for migration query [SCI-7964]
2023-03-01 11:33:32 +01:00
Martin Artnik
165e012d23 Replace highlight.js with prism.js [SCI-7974] 2023-02-28 16:22:35 +01:00
ajugo
96cf2f1d38
Update protocol templates update action on task [SCI-7903] (#5009)
* Update protocol templates update action on task [SCI-7903]

* Simplify logic for update from parent [SCI-7903]
2023-02-28 14:17:34 +01:00
Martin Artnik
c24b0fa5ab Refactor access modals [SCI-7978] 2023-02-23 14:57:38 +01:00
Anton
a95ca75362 Add new protocol modal [SCI-7810] 2023-02-21 14:15:53 +01:00
ajugo
166208f186
Update i flyouts of protocols (task screen) [SCI-7861] (#5003) 2023-02-21 13:44:26 +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
ea9d2d8291 Merge branch 'develop' into features/protocol_versioning 2023-02-14 11:07:58 +01:00
ajugo
d66dc98300
Update print protocol modal [SCI-7830] (#4932) 2023-02-06 14:23:56 +01:00
aignatov-bio
5cbaf83067
Merge pull request #4845 from aignatov-bio/ai-sci-7758-fix-user-designation-on-creation
Fix user designation on task creation [SCI-7758]
2023-01-17 15:12:46 +01:00
aignatov-bio
8a4599bed1
Merge pull request #4831 from aignatov-bio/ai-sci-7722-fix-new-task-modal-error-handling
Fix error handling new task modal and completed task duplication [SCI-7722][SCI-7730]
2023-01-17 13:34:13 +01:00
Anton
3b6590b8c7 Fix user designation on task creation [SCI-7758] 2023-01-17 13:33:04 +01:00
Anton
3eb18a7cf4 Fix error handling new task modal and completed task duplication[SCI-7722][SCI-7730] 2023-01-16 13:03:25 +01:00
Anton
e48657768d Hide assigned users for user without permissions [SCI-7758] 2023-01-16 11:28:47 +01:00
artoscinote
80eb1639bc
Merge pull request #4823 from scinote-eln/features/tiny_mce_6
Features/tiny mce 6
2023-01-13 13:53:03 +01:00
ajugo
d8adbb1d3d
Implement completed and due date changes [SCI-7725] (#4816) 2023-01-13 10:18:35 +01:00
aignatov-bio
9216ca2809
Merge pull request #4811 from aignatov-bio/ai-sci-7722-add-new-task-modal-improvments
Experiment table - add new task modal improvements [SCI-7722]
2023-01-13 10:13:22 +01:00
Anton
7930091abb Experiment table - add new task modal improvments [SCI-7722] 2023-01-12 13:48:49 +01:00
Giga Chubinidze
1dc636a49c Manage tags modal improvements [SCI-7724] 2023-01-12 16:01:39 +04:00
Martin Artnik
19b282cba2 Merge branch 'develop' into features/tiny_mce_6 2023-01-10 11:13:23 +01:00
Anton
7a7d2c0e1b Experiment table - fix new task modal CSS [SCI-7691] 2023-01-06 13:04:29 +01:00
Martin Artnik
4e779e70a4 Merge branch 'develop' into features/tiny_mce_6 2023-01-04 14:21:02 +01:00
Anton
031ba603fc Update tags selection [SCI-7645] 2022-12-22 17:39:51 +01:00
aignatov-bio
ea661f3c19
Merge branch 'develop' into features/new_experiment_views 2022-12-22 13:33:25 +01:00
Giga Chubinidze
1a84c60c74 FE | BE Add new task modal field for Tags [SCI-7449] 2022-12-19 14:55:38 +04:00
Anton
0736a02741 Fix protocol id on task page [SCI-7583] 2022-12-09 12:56:24 +01:00
artoscinote
a3e8000360
Merge branch 'develop' into features/exposed_ids 2022-12-08 15:58:11 +01:00
Martin Artnik
c828d02b99 Merge branch 'develop' into features/tiny_mce_6 2022-12-07 14:07:43 +01:00
Martin Artnik
df4654189b Revert "Revert "Add task IDs to canvas view [SCI-7177][SCI-7178]""
This reverts commit 50e7531ffa.
2022-12-06 12:43:30 +01:00
ajugo
4b83f77c5b
Add new task modal field for Assign users for experiment views [SCI-7450] (#4670)
* Add new task modal field for Assign users for experiment views [SCI-7450]

* Fix loading users assigned to the experiment [SCI-7450]

* Fix task creation on experiment if none exists [SCI-7450]
2022-12-05 12:55:57 +01:00