Commit graph

14020 commits

Author SHA1 Message Date
Ivan Kljun
0553b5b0dc Merge remote-tracking branch 'upstream/develop' into SCI-9008-share-task-modal 2023-08-21 09:32:59 +02:00
sboursen-scinote
ca35ad0122 Fix shared task view issues [SCI-9076]
- Fix task header effects when selected
2023-08-21 09:15:46 +02:00
Alex Kriuchykhin
7e0f6ec0ac
Merge pull request #6022 from scinote-eln/dependabot/bundler/puma-6.3.1
Bump puma from 6.3.0 to 6.3.1
2023-08-21 09:12:00 +02:00
Giga Chubinidze
3c588709be changed logic 2023-08-21 06:48:08 +04:00
dependabot[bot]
0208cecb81
Bump puma from 6.3.0 to 6.3.1
Bumps [puma](https://github.com/puma/puma) from 6.3.0 to 6.3.1.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v6.3.0...v6.3.1)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-18 22:16:08 +00:00
artoscinote
3f754710ac
Merge pull request #6021 from ivanscinote/SCI-9007-update-colors
Add .btn-not-started to task status flow modal [SCI-9007]
2023-08-18 17:37:48 +02:00
Ivan Kljun
f71c54dd74 Add .btn-not-started to task status flow modal [SCI-9007] 2023-08-18 17:21:26 +02:00
ajugo
6de239547e
Merge pull request #6020 from sboursen-scinote/sb_SCI-9019
Table header not visible after creating a project/folder [SCI-9019]
2023-08-18 16:34:15 +02:00
sboursen-scinote
2dc82c9ed9 Show table header in folder when creating the first project [SCI-9019] 2023-08-18 16:26:53 +02:00
aignatov-bio
6c67c35a69
Merge pull request #6017 from aignatov-bio/ai-sci-9062-hide-result-title-in-docx
Hide result title in docx [SCI-9062]
2023-08-18 11:45:37 +02:00
Alex Kriuchykhin
e3c23bd474
Merge pull request #6016 from sboursen-scinote/sb_SCI-9059
Fix PDF report generation error [SCI-9059]
2023-08-18 11:37:30 +02:00
Anton
37e1c46152 Hide result title in docx [SCI-9062] 2023-08-18 11:35:24 +02:00
sboursen-scinote
4d7fa93c06 Fix PDF report generation error [SCI-9059] 2023-08-18 11:23:49 +02:00
ajugo
dcdbfefa91
Merge pull request #6011 from sboursen-scinote/sb_SCI-9066
Fix small css issues [SCI-9066]
2023-08-18 11:17:34 +02:00
Alex Kriuchykhin
e9e15f015b
Merge pull request #6015 from okriuchykhin/ok_SCI_9079
Fix move experiment modal form submission [SCI-9079]
2023-08-18 11:13:10 +02:00
artoscinote
71d30ea5c4
Merge pull request #5875 from ivanscinote/SCI-8928-role-selection-at-proj
Fix modal id collision at projects [SCI-8928]
2023-08-18 10:56:04 +02:00
Oleksii Kriuchykhin
c76fca0ab3 Fix move experiment modal form submission [SCI-9079] 2023-08-18 10:55:21 +02:00
Ivan Kljun
6918b3c568 Merge with develop and fix conflict [SCI-8928] 2023-08-18 10:54:07 +02:00
artoscinote
20c20012b2
Merge pull request #5863 from ivanscinote/SCI-8807-notifications
Remove system notifications [SCI-8807]
2023-08-18 10:28:05 +02:00
Alex Kriuchykhin
512753f164
Merge pull request #6010 from okriuchykhin/ok_SCI_9041
Implement fetching of endpoint URLs from OpenID config URL in Azure AD strategy [SCI-9041]
2023-08-18 10:16:20 +02:00
artoscinote
45791a764f
Merge pull request #6014 from wandji20/wb-SCI-9057
Fix bug in new result table event delegation [SCI-9057]
2023-08-18 10:13:36 +02:00
artoscinote
664819a7fc
Merge pull request #6008 from ivanscinote/SCI-9007-update-colors
Update status and shared buttons design to Amanda [SCI-9007]
2023-08-18 10:12:26 +02:00
artoscinote
35c0de4cef
Merge pull request #5882 from G-Chubinidze/gc_SCI_8933
Fixed Inventory Calendar Header [SCI-8933]
2023-08-18 10:07:32 +02:00
artoscinote
c28b54c43b
Merge pull request #5937 from G-Chubinidze/gc_SCI_5605
Some icons have the checkboard pattern applied to the background [SCI-5605]
2023-08-18 10:04:06 +02:00
wandji20
cf3cb707fd Fix bug in new result table event delegation [SCI-9057] 2023-08-18 07:16:01 +01:00
sboursen-scinote
a38158c788 Fix small css issues [SCI-9066] 2023-08-17 22:23:46 +02:00
Oleksii Kriuchykhin
9e2291dc30 Implement fetching of endpoint URLs from OpenID config URL in Azure AD strategy [SCI-9041] 2023-08-17 16:51:46 +02:00
Alex Kriuchykhin
67042ce254
Merge pull request #6003 from okriuchykhin/ok_SCI_9028
Show only default label templates when feature is disabled [SCI-9028]
2023-08-17 16:50:00 +02:00
Ivan Kljun
6c4de5dc71 Add colors to extends.rb, remove myModuleStatus updates for el.sign. 2023-08-17 15:53:41 +02:00
artoscinote
2cc49ec6b5
Merge pull request #6005 from wandji20/wb-SCI-9003
Fix CSS style issues [SCI-9003]
2023-08-17 15:48:07 +02:00
Ivan Kljun
e3f111debc Remove whitespace 2023-08-17 15:31:04 +02:00
Ivan Kljun
b96dc345dd Apply hound linter suggestions 2023-08-17 15:29:22 +02:00
ajugo
dd80b4019b
Merge pull request #5942 from sboursen-scinote/sb_SCI-8987
Fix micro-interactions for shareable links modals [SCI-8987]
2023-08-17 15:28:43 +02:00
sboursen-scinote
ef9368d2cb Fix micro-interactions for shareable links modals [SCI-8987] 2023-08-17 15:22:16 +02:00
Ivan Kljun
400c1cb303 Update status and shared buttons design to Amanda [SCI-9007] 2023-08-17 15:18:46 +02:00
ajugo
032655f4e7
Merge pull request #6002 from rekonder/aj_SCI_8986
Show toast message on successful copy [SCI-8986]
2023-08-17 15:14:05 +02:00
Alex Kriuchykhin
d81e2a0e47
Merge pull request #5995 from aignatov-bio/ai-sci-9062-hide-result-title-if-results-not-selected
Hide results title if results not selected [SCI-9062]
2023-08-17 14:58:21 +02:00
Anton
622a8766bb Hide results title if results not selected [SCI-9062] 2023-08-17 14:51:40 +02:00
Alex Kriuchykhin
fd1b7885f4
Merge pull request #6006 from rekonder/aj_SCI_9064
Add checks for metadata on protocol import [SCI-9064]
2023-08-17 14:31:09 +02:00
Andrej
b07432a444 Add checks for metadata on protocol import [SCI-9064] 2023-08-17 14:20:44 +02:00
wandji20
4a3f8146e3 Fix CSS style issues [wb-SCI-9003] 2023-08-17 13:11:58 +01:00
Alex Kriuchykhin
c356018965
Merge pull request #5918 from sboursen-scinote/sb_SCI-8981
Share button is disabled for locked and archived tasks [SCI-8981]
2023-08-17 14:10:09 +02:00
Oleksii Kriuchykhin
14e49956f7 Show only default label templates when feature is disabled [SCI-9028] 2023-08-17 13:44:22 +02:00
Alex Kriuchykhin
0433d62c17
Merge pull request #6001 from okriuchykhin/ok_SCI_9060
Allow export of archived inventories [SCI-9060]
2023-08-17 12:48:03 +02:00
Andrej
9a09fbc8ce Show toast message on successful copy [SCI-8986] 2023-08-17 11:21:53 +02:00
Oleksii Kriuchykhin
450f5df8ea Allow export of archived inventories [SCI-9060] 2023-08-17 11:20:26 +02:00
artoscinote
0082b858ec
Merge pull request #5983 from sboursen-scinote/sb_SCI-9042
Add space after (A) in shareable links layout [SCI-9042]
2023-08-17 09:00:01 +02:00
artoscinote
d3c0d3491c
Merge pull request #5998 from wandji20/wb-SCI-9057
Move inline JavaScript inclusion for new and edit result table to result_tables.js [SCI-9057]
2023-08-17 08:59:31 +02:00
sboursen-scinote
ffa6e8bc51 Add space after (A) in shareable links layout [SCI-9042] 2023-08-16 21:10:10 +02:00
wandji20
25e6cbdbd8 Move inline JavaScript inclusion for new and edit result table to result_tables.js [SCI-9057] 2023-08-16 17:08:25 +01:00