Commit graph

446 commits

Author SHA1 Message Date
Ivan Kljun
ca35e13893 Merge remote-tracking branch 'upstream/features/september-release' into SCI-8925-show-paragraphs-checklist 2023-08-18 11:12:49 +02:00
Anton
16eedcdade Revamp modals across app [SCI-8978] 2023-08-17 14:01:26 +02:00
Oleksii Kriuchykhin
6cf7403b21 Merge branch 'develop' into features/protocol-parsing 2023-08-07 12:55:20 +02:00
Ivan Kljun
9a37b75001 Applied hound linter suggestions 2023-07-31 15:45:39 +02:00
Ivan Kljun
d9df37745f Support paragraphs for checklist items in print protocol and pdf/docx report [SCI-8925] 2023-07-31 15:12:04 +02:00
Martin Artnik
5cc087835a Merge branch 'develop' into features/august-release 2023-07-19 11:21:24 +02:00
ivanscinote
a483699d73
CSS: Protocol templates UI issues [SCI-8790] (#5736)
* CSS: Protocol templates UI issues [SCI-8790]

* Reorder css properties

* Remove whitespace in scss

* Adding flexible class to protocols-show
2023-07-14 12:31:54 +02:00
Oleksii Kriuchykhin
092e451f2e Merge branch 'develop' into features/protocol-parsing 2023-07-13 13:59:10 +02:00
Oleksii Kriuchykhin
fca9aea4a8 Merge branch 'features/rails-upgrade' into develop 2023-07-13 13:10:59 +02:00
artoscinote
4a8582ebc8
Initial implementation of protocol processing modal [SCI-8661] (#5683)
* Initial implementation of protocol processing modal [SCI-8661]

* Prepare placeholder jobs and integrate notifications [SCI-8661]
2023-07-11 09:27:15 +02:00
Soufiane
d8658991d6
Fix task page issues after rails upgrade [SCI-8821] (#5745) 2023-07-11 09:21:22 +02:00
Soufiane
e8c62d6cd8
Fix protocol template issues after rails upgrade [SCI-8822] (#5740) 2023-07-10 13:57:13 +02:00
artoscinote
85ad167998
Merge pull request #5660 from artoscinote/ma_SCI_8506
Make label print modal work globally [SCI-8506]
2023-07-05 09:53:56 +02:00
Anton
586d9eaf4b CSS fixes [SCI-8758][SCI-8759] 2023-06-27 20:31:25 +02:00
Martin Artnik
9364d139e0 Make label print modal work globally [SCI-8506] 2023-06-22 14:52:47 +02:00
Oleksii Kriuchykhin
66b361c689 Upgrade Rails to version 7.0.5 [SCI-8632] 2023-06-21 14:38:32 +02:00
G-Chubinidze
a88adf7630
changed tooltips (#5639) 2023-06-21 10:00:46 +02:00
Anton
4e972de096 UI CSS fixes 2023-06-19 15:58:17 +02:00
Giga Chubinidze
96ff988c77 Buttons title (tooltip on hover) - top action toolbar [SCI-8645] 2023-06-19 10:04:58 +04:00
Anton
c4f82cc756 Css fixes [SCI-8671] 2023-06-15 15:12:51 +02:00
Anton
d795f996f2 Merge branch 'develop' into features/ui-revamp 2023-06-14 15:18:50 +02:00
Giga Chubinidze
a777fd5584 New icons implementation [SCI-8366] 2023-06-08 10:33:37 +04:00
Giga Chubinidze
a27c2b2cd3 (A) label (instead of icons) in front of titles of archived elements 2023-06-02 04:03:41 +04:00
ajugo
790653351a
Fix medium size preview for print file [SCI-8593] (#5540) 2023-06-01 16:18:15 +02:00
ajugo
3036c24be3
Prevent double click on protocol creation modal [SCI-8466] (#5458) 2023-05-23 09:50:34 +02:00
Martin Artnik
eb5fb16b1b Implement new toolbar for protocols [SCI-8399] 2023-05-17 14:12:40 +02:00
ajugo
43f571c154
Enable Manage access for archived protocols [SCI-8453] (#5411) 2023-05-16 13:25:33 +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
Anton
5ec202e2c4 Update protocol top toolbar [SCI-8386] 2023-05-09 14:59:43 +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
artoscinote
103ce8e70d
Merge pull request #5331 from scinote-eln/develop
Merge develop
2023-04-20 13:31:46 +02:00
Anton
e8b952f4fd Revert "Revert "Improve breadcrumbs implementation [SCI-8087]""
This reverts commit 78d41d10a6.
2023-04-19 10:53:39 +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
aignatov-bio
3ad5b779c4
Merge pull request #5298 from aignatov-bio/ai-sci-8289-css-fixes-for-navigator
Multiple CSS fixes for navigation [SCI-8289][SCI-8313][SCI-8288][SCI-8273][SCI-8309]
2023-04-13 14:59:39 +02:00
Anton
caf21959bd Multiple CSS fixes for navigation [SCI-8289][SCI-8313][SCI-8288][SCI-8273][SCI-8309] 2023-04-13 14:54:03 +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
aignatov-bio
78d41d10a6
Revert "Improve breadcrumbs implementation [SCI-8087]" 2023-04-12 14:04:20 +02:00
Soufiane
0f8918e9f6
Revision notes written in version modal are not seen/saved [SCI-8279] (#5272)
* Load latest protocol version comment in publish modal [SCI-8279]

* Check publish permission before updating the draft comment [SCI-8279]
2023-04-11 12:50:14 +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
Giga Chubinidze
3fc2afde3c Label '(Draft)' in front of the protocol template name [SCI-8211] 2023-03-31 18:30:26 +04:00
Anton
ed1c4bcb69 Replace webpacker with jsbundling-rails [SCI-7926] 2023-03-30 13:39:57 +02:00
artoscinote
3173b9f96e
Merge pull request #5216 from artoscinote/ma_SCI_8202
Fix print for linked protocols [SCI-8202]
2023-03-29 09:58:49 +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
e819c730e7 Fix print for linked protocols [SCI-8202] 2023-03-28 12:08:55 +02:00
ajugo
26879f200d
Fix CSS for protocol versioning modal [SCI-8194] (#5197) 2023-03-27 13:28:00 +02:00
Alex Kriuchykhin
e7bd133895
Merge pull request #5191 from aignatov-bio/ai-sci-8160-update-front-end-permission-for-version-comment
Update front end permission check for version comment [SCI-8160]
2023-03-24 13:14:03 +01:00
Anton
9818e41353 Update front end permission check for version comment [SCI-8160] 2023-03-24 13:11:14 +01:00
Anton
0b560f5b05 Protocol screen css fixes [SCI-8190] 2023-03-24 12:01:47 +01:00