Commit graph

13916 commits

Author SHA1 Message Date
artoscinote
6f5ef60ab1
Merge pull request #5733 from G-Chubinidze/gc_SCI_8727
Project card permission with not assigned team admin [SCI-8727]
2023-08-21 12:19:28 +02:00
G-Chubinidze
afdfec5f71
Update projects_service.rb 2023-08-21 14:13:00 +04:00
Giga Chubinidze
a391e6e6e1 changed loop 2023-08-21 14:08:17 +04:00
artoscinote
d8da463dc2
Merge pull request #5956 from ivanscinote/SCI-9008-share-task-modal
Move blur event to whole modal at Share task [SCI-9008]
2023-08-21 12:04:54 +02:00
artoscinote
00167e30b0
Merge pull request #6029 from artoscinote/ma_SCI_8422
Fix filtering of template tags [SCI-8422]
2023-08-21 11:56:28 +02:00
Ivan Kljun
5902ee28e1 Remove blur event function as it is redundant 2023-08-21 11:52:57 +02:00
Martin Artnik
fc18c76efd Fix filtering of template tags [SCI-8422] 2023-08-21 11:44:01 +02:00
ajugo
95e6006c6a
Merge pull request #6026 from rekonder/aj_SCI_9077
Fix scrolling of the shareable links layout [SCI-9077]
2023-08-21 11:36:44 +02:00
aignatov-bio
58eaaf98b9
Merge pull request #6028 from aignatov-bio/ai-sci-8536-fix-long-task-names
Fix long task names [SCI-8536]
2023-08-21 11:18:53 +02:00
Anton
d135c86f70 Fix long task names [SCI-8536] 2023-08-21 11:17:09 +02:00
artoscinote
de61c37a4e
Merge pull request #5706 from wandji20/wb-SCI-8559
Fix CSS Issues[SCI-8559]
2023-08-21 11:05:38 +02:00
Andrej
ef4d360be8 Fix scrolling of the shareable links layout [SCI-9077] 2023-08-21 10:38:54 +02:00
artoscinote
22bf9eaced
Merge pull request #5979 from wandji20/wb-SCI-9018
Fix CSS issues in protocols, and quick start(new task) [SCI-9018]
2023-08-21 10:28:53 +02:00
wandji20
5e6138fa18 Replace unecessary margin value with tailwind value [SCI-9018] 2023-08-21 09:27:28 +01:00
wandji20
0ae44eb3a7 Use default tailwind size for task assigned protocol description [SCI-9018] 2023-08-21 09:27:28 +01:00
wandji20
7c07befd3e Fix CSS issues in protocols, and quick start(new task) [SCI-9018] 2023-08-21 09:27:28 +01:00
aignatov-bio
33476403a5
Merge pull request #6025 from aignatov-bio/ai-sci-9085-fix-report-css
Fix report css [SCI-9085]
2023-08-21 10:12:31 +02:00
Anton
ded0ac1b9f Fix report css [SCI-9085] 2023-08-21 09:54:35 +02:00
Ivan Kljun
022c2ee9de Merge remote-tracking branch 'upstream/develop' into SCI-9008-share-task-modal 2023-08-21 09:53:28 +02:00
artoscinote
2dc76f3a2f
Merge pull request #6024 from sboursen-scinote/sb_SCI-9076
Fix shared task view issues [SCI-9076]
2023-08-21 09:35:37 +02:00
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
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
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