Commit graph

1005 commits

Author SHA1 Message Date
Alex Kriuchykhin
975a197716
Merge pull request #5987 from ivanscinote/SCI-9034-shared-task-issues
Fix moment.js import and showing preview thumbnail img at shared task [SCI-9034]
2023-08-16 15:34:57 +02:00
Ivan Kljun
1880723c8c Fix moment.js import and showing preview thumbnail img at shared task [SCI-9034] 2023-08-16 10:49:34 +02:00
artoscinote
083bd4b1e2
Merge pull request #5827 from aignatov-bio/ai-sci-8843-fix-notification-infinite-scroll
Fix infinite scroll for notifications [SCI-8843]
2023-08-16 10:27:07 +02:00
Anton
a46674b3a3 Fix small bootstrap issues [SCI-9051] 2023-08-11 11:34:11 +02:00
Alex Kriuchykhin
c6a545d8b3
Fix Turbolinks redirects with ajax requests, add JQuery migration library [SCI-9031] (#5961) 2023-08-10 16:25:04 +02:00
aignatov-bio
acab34679d
Merge pull request #5960 from aignatov-bio/ai-test-jquery-pr
Restore bootstrap overrides
2023-08-10 14:43:12 +02:00
Anton
3c0ccc730f Restore bootstrap overrides 2023-08-10 14:36:06 +02:00
Martin Artnik
4d4eebd78e Fix glitchy dropdowns on Safari [SCI-8946] 2023-08-10 11:46:31 +02:00
Soufiane
aedd3e0b6d
Fix multiple issues for Shared tasks feature [SCI-8985] (#5936)
- Centre vertically all related modals
- Convert task header tabs to sentence case
2023-08-10 09:43:31 +02:00
Anton
2da83f460f Test moving jquery 2023-08-09 14:43:17 +02:00
wandji
a1e6392a45
Fix bugs with jquery3 upgrade [SCI-8973] (#5933)
* Fix bugs with jquery3 upgrade [SCI-8973]

* Remove deprecated jquery method (.error, .completed, .success) [SCI-8973]

* Fix linter error [SCI-8973]
2023-08-09 10:33:58 +02:00
ajugo
c8fbdacf22
Merge pull request #5921 from rekonder/aj_SCI_8986
Copy shareable link when you enable sharing for task [SCI-8986]
2023-08-07 15:17:49 +02:00
Alex Kriuchykhin
dacc6b48aa
Merge pull request #5924 from scinote-eln/features/protocol-parsing
Merge features/protocol-parsing to develop
2023-08-07 13:00:56 +02:00
Oleksii Kriuchykhin
6cf7403b21 Merge branch 'develop' into features/protocol-parsing 2023-08-07 12:55:20 +02:00
Anton
89c526103d Merge branch 'develop' into features/remove-front-end-gems 2023-08-07 11:23:21 +02:00
Andrej
84233506c0 Copy shareable link when you enable sharing for task [SCI-8986] 2023-08-07 09:47:44 +02:00
Alex Kriuchykhin
b365553a14
Merge pull request #5917 from scinote-eln/features/august-release
Merge features/august release to develop
2023-08-04 14:01:44 +02:00
sboursen-scinote
40f78f4a28 Fix shareable links CSS [SCI-8975]
- Fix the style of the toggle button globally.
- Fix permissions on who can toggle team shareable links.
- Change wrong translations in shareable links modal.
- Remove placeholder text for start-date
2023-08-04 12:34:04 +02:00
Oleksii Kriuchykhin
b49b7c4a80 Merge branch 'develop' into features/shareable-links 2023-08-02 16:05:21 +02:00
ajugo
fa187f3b31
Add shared assets download and fix loading of the shareable button on task [SCI-8754] (#5878)
* Add shared assets download and fix loading of the shareable button on task [SCI-8754]

* Add additional check before asset loading [SCI-8754]

* Add additional check before asset loading [SCI-8754]

* Load asset for specific task [SCI-8754]
2023-08-01 16:46:41 +02:00
wandji
2680b317e5
Fix issue when toggling repository items search fields [SCI-8874] (#5855)
* Fix issue when toggling repository items search fields [SCI-8874]

* Refactor outside click directive and make it available for all components [SCI-8874]
2023-08-01 10:41:58 +02:00
ajugo
e71d5805ca
Refactored settings for Label templates feature and Zebra printing [SCI-8918] (#5895)
* Refactored settings for Label templates feature and Zebra printing [SCI-8918]

* Add check for label template [SCI-8918]
2023-08-01 10:30:57 +02:00
Martin Artnik
3978d9efef Merge branch 'develop' into features/august-release 2023-07-26 11:22:49 +02:00
Anton
9393f3cc0f Fix navigator console errors [SCI-8890] 2023-07-25 11:11:55 +02:00
Giga Chubinidze
ab41b5e219 Some icons have the checkboard pattern applied to the background [SCI-5605] 2023-07-25 11:52:31 +04:00
Oleksii Kriuchykhin
de69b1b100 Merge branch 'develop' into features/shareable-links 2023-07-25 09:47:47 +02:00
ajugo
f44f083b0b
Merge pull request #5846 from sboursen-scinote/sb_SCI-8239
Save as new protocol template from task - read the protocol name [SCI-8239]
2023-07-25 09:34:49 +02:00
Soufiane
effdc9563a
Improve Breadcrumbs responsiveness [SCI-8494] (#5778)
- Refactor Breadcrumbs using VUE.
- Implement responsiveness breakpoints
2023-07-25 09:24:49 +02:00
sboursen-scinote
634d4b6066 Prefill the protocol name in modal when saving from template [SCI-8239] 2023-07-25 09:23:32 +02:00
Martin Artnik
ebfaca6966 Clear wopi file length error on input, css fix [SCI-8877] 2023-07-24 12:46:45 +02:00
artoscinote
ff83b97d7b
Merge pull request #5841 from artoscinote/ma_SCI_8894
Fix tinymce loading placeholders for text elements [SCI-8894]
2023-07-24 10:39:14 +02:00
Soufiane
5a44400fbb
Fix zebra printer CSP issue [SCI-8859] (#5806) 2023-07-21 16:54:57 +02:00
Martin Artnik
30e07ff1e9 Fix tinymce loading placeholders for text elements [SCI-8894] 2023-07-21 16:25:44 +02:00
Anton
0163d56186 Fix infinite scroll for notifications [SCI-8843] 2023-07-20 11:04:17 +02:00
Andrej
f493ec0da1 Merge branch 'develop' into features/shareable-links 2023-07-19 12:57:20 +02:00
Martin Artnik
5cc087835a Merge branch 'develop' into features/august-release 2023-07-19 11:21:24 +02:00
Anton
f540b3dc8d Fix js error in console log [SCI-8890] 2023-07-19 09:55:27 +02:00
Anton
1087f67228 Merge branch 'develop' into features/remove-front-end-gems 2023-07-18 14:36:40 +02:00
aignatov-bio
b18421ec4b
Merge pull request #5762 from aignatov-bio/ai-sci-8735-add-error-modal-for-protocol-parsing
Added error handling for protocol import [SCI-8735]
2023-07-18 10:21:11 +02:00
artoscinote
5a65b94ce3
Merge pull request #5714 from wandji20/wb-SCI-8744
Set blank default date for added_on repository filters [SCI-8744]
2023-07-18 08:41:14 +02:00
ajugo
d71351fcbc
Fix scrollTo for inventory filter [SCI-8869] (#5782) 2023-07-17 15:39:19 +02:00
wandji
2698681548
Fix Not correct naming for label in global activity filter (#5776)
* Update translation for label_repository and sort template label names in label print modal

* Rename label_repository to label_templates in translation file and initializer/extends) [SCI-8808]
2023-07-17 15:38:28 +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
ivanscinote
5519cfe75f
Fix label templates, inline edit, checklist and step [SCI-8792] (#5766)
* Fix label templates, inline edit, checklist and step [SCI-8792]

* Add mouse selection to protocol name on task and protocol desc.

* Fix css hound suggestions
2023-07-14 12:31:15 +02:00
wandji20
a63e6f20b4 Remove redundant check [SCI-8744] 2023-07-13 18:28:51 +01:00
wandji20
8bacfa4158 Set blank default date for added_on repository filters(Fix llinter errors) [SCI-8744] 2023-07-13 18:28:51 +01:00
wandji20
20fb1e9285 Set blank default date for added_on repository filters(Fix llinter errors) [SCI-8744] 2023-07-13 18:28:51 +01:00
wandji20
973d65ca00 Set blank default date for added_on repository filters [SCI-8744] 2023-07-13 18:28:51 +01:00
Oleksii Kriuchykhin
a95aab85e2 Merge branch 'develop' into features/shareable-links 2023-07-13 15:04:27 +02:00
Oleksii Kriuchykhin
092e451f2e Merge branch 'develop' into features/protocol-parsing 2023-07-13 13:59:10 +02:00