scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-16 22:25:30 +08:00
Code Issues Projects Releases Packages Wiki Activity
11981 commits 31 branches 181 tags 167 MiB
Commit graph

11981 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alex Kriuchykhin
f44cb2a1bb
Merge pull request #4716 from okriuchykhin/ok_SCI_7577_v2 
Improve handling of unaccessible inventories in snapshot versions sidebar [SCI-7422]
 2022-12-19 10:33:52 +01:00
Giga Chubinidze
ae8efa8e1a changed if else logic, added back placeholders 2022-12-16 17:22:06 +04:00
ajugo
41892e35c6
Fix docx report generator for links in activity [SCI-7598] (#4720) 2022-12-15 10:54:24 +01:00
artoscinote
fcc3a9b5d9
Merge pull request #4719 from artoscinote/ma_SCI_7569 
Fix table scroll wrapping [SCI-7569]
 2022-12-14 14:41:56 +01:00
Martin Artnik
3ea059529d Fix table scroll wrapping [SCI-7569] 2022-12-14 14:32:23 +01:00
Alex Kriuchykhin
4212fa93cd
Merge pull request #4718 from scinote-eln/dependabot/bundler/rails-html-sanitizer-1.4.4 
Bump rails-html-sanitizer from 1.4.3 to 1.4.4
 2022-12-14 09:56:40 +01:00
dependabot[bot]
28ffba3372
Bump rails-html-sanitizer from 1.4.3 to 1.4.4 
Bumps [rails-html-sanitizer](https://github.com/rails/rails-html-sanitizer) from 1.4.3 to 1.4.4.
- [Release notes](https://github.com/rails/rails-html-sanitizer/releases)
- [Changelog](https://github.com/rails/rails-html-sanitizer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/rails-html-sanitizer/compare/v1.4.3...v1.4.4)

---
updated-dependencies:
- dependency-name: rails-html-sanitizer
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-14 08:55:40 +00:00
Alex Kriuchykhin
7b652acad2
Merge pull request #4717 from scinote-eln/dependabot/bundler/loofah-2.19.1 
Bump loofah from 2.18.0 to 2.19.1
 2022-12-14 09:54:41 +01:00
dependabot[bot]
b1fdb94a58
Bump loofah from 2.18.0 to 2.19.1 
Bumps [loofah](https://github.com/flavorjones/loofah) from 2.18.0 to 2.19.1.
- [Release notes](https://github.com/flavorjones/loofah/releases)
- [Changelog](https://github.com/flavorjones/loofah/blob/main/CHANGELOG.md)
- [Commits](https://github.com/flavorjones/loofah/compare/v2.18.0...v2.19.1)

---
updated-dependencies:
- dependency-name: loofah
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-13 19:45:29 +00:00
Alex Kriuchykhin
766255e493
Merge pull request #4713 from okriuchykhin/ok_SCI_7577 
Improve user team invitation logic [SCI-7324]
 2022-12-13 16:14:48 +01:00
Oleksii Kriuchykhin
9900b62e03 Improve hadling of unaccessible inventories in snapshot versions sidebar [SCI-7577] 2022-12-13 16:12:08 +01:00
aignatov-bio
96aea292fb
Merge pull request #4714 from aignatov-bio/ai-sci-7579-experiment-card-fixes 
Fix experiment cards views [SCI-7579]
 2022-12-13 15:09:07 +01:00
aignatov-bio
d5be8e42d4
Merge pull request #4712 from aignatov-bio/ai-sci-7586-fix-archive-icons-and-divider 
Fix divider on project/experiment view [SCI-7586]
 2022-12-13 15:08:57 +01:00
Anton
8e1e95b219 Add new step text notification [SCI-7559] 2022-12-13 14:47:53 +01:00
Anton
66d21e9c4f Fix experiment cards views [SCI-7579] 2022-12-13 13:14:51 +01:00
Oleksii Kriuchykhin
89258ce2ae Improve user team invitation logic [SCI-7577] 2022-12-13 11:34:56 +01:00
Anton
d85e1e9d6c Fix divider on project/experiment view [SCI-7586] 2022-12-13 10:01:38 +01:00
aignatov-bio
fa6311382e
Merge pull request #4709 from aignatov-bio/ai-sci-7572-fix-label-template-error-handling 
Fix label template error handling [SCI-7572]
 2022-12-13 09:05:16 +01:00
Giga Chubinidze
556431a0da changed code for develop branch 2022-12-12 19:17:57 +04:00
aignatov-bio
ff6471ce14
Merge pull request #4708 from aignatov-bio/ai-sci-7586-css-fixes-for-exposed-id 
CSS fixes for exposed ID [SCI-7586]
 2022-12-12 15:21:44 +01:00
Anton
abee54699d Fix label template error handling [SCI-7572] 2022-12-12 15:21:15 +01:00
G-Chubinidze
0b27f0d973
Merge branch 'features/new_experiment_views' into gc_SCI_7496 2022-12-12 17:53:22 +04:00
G-Chubinidze
10f31c8796
Merge pull request #4687 from G-Chubinidze/gc_SCI_7442 
BE: Column display switch (Task data display) [SCI-7442]
 2022-12-12 17:51:58 +04:00
Giga Chubinidze
477066f85e code logic cleanup 2022-12-12 17:51:05 +04:00
Alex Kriuchykhin
adbd5a5b63
Merge pull request #4695 from scinote-eln/dependabot/npm_and_yarn/minimatch-3.0.8 
Bump minimatch from 3.0.4 to 3.0.8
 2022-12-12 13:06:34 +01:00
Alex Kriuchykhin
19b7f797e2
Merge pull request #4694 from scinote-eln/dependabot/npm_and_yarn/express-4.18.2 
Bump express from 4.17.1 to 4.18.2
 2022-12-12 13:05:09 +01:00
Alex Kriuchykhin
462e347dbf
Merge pull request #4693 from scinote-eln/dependabot/npm_and_yarn/qs-6.5.3 
Bump qs from 6.5.2 to 6.5.3
 2022-12-12 13:00:57 +01:00
Anton
6b6105dfe6 CSS fixes for exposed ID [SCI-7586] 2022-12-12 11:45:59 +01:00
aignatov-bio
d596746893
Merge pull request #4702 from aignatov-bio/ai-sci-7581-fix-long-protocol-name-in-task-flyout 
Fix long protocol name in task protocol flyout [SCI-7581]
 2022-12-12 11:09:52 +01:00
Alex Kriuchykhin
67e4a7f658
Merge pull request #4706 from okriuchykhin/ok_SCI_7393 
Remove underscore escaping for ZPL templates previews [SCI-7393]
 2022-12-12 11:00:37 +01:00
Alex Kriuchykhin
67b6cd6ae9
Merge pull request #4700 from okriuchykhin/ok_SCI_7564 
Fix search by ID for project cards [SCI-7564]
 2022-12-12 10:34:39 +01:00
Oleksii Kriuchykhin
925d7e5c45 Remove underscore escaping for ZPL templates previews [SCI-7393] 2022-12-12 10:28:35 +01:00
aignatov-bio
d3fee7eee0
Merge pull request #4691 from okriuchykhin/ok_SCI_7551 
Add img2zpl gem for ZPL image code generation [SCI-7551]
 2022-12-09 14:28:15 +01:00
aignatov-bio
c2e8abb4a4
Merge pull request #4705 from aignatov-bio/ai-sci-7583-fix-protocol-id-on-task-page 
Fix protocol id on task page [SCI-7583]
 2022-12-09 14:07:20 +01:00
aignatov-bio
66b0968b66
Merge pull request #4696 from aignatov-bio/ai-sci-7552-add-company-logo-to-label-templates 
Add logo to label templates [SCI-7552]
 2022-12-09 13:36:27 +01:00
Anton
c5d91b061b Add logo to label templates 2022-12-09 13:33:10 +01:00
aignatov-bio
d3c0baee40
Merge pull request #4703 from aignatov-bio/ai-sci-7578-update-exposed-id-css-issues 
Fix expose ids css fixes [SCI-7578]
 2022-12-09 12:56:52 +01:00
Anton
0736a02741 Fix protocol id on task page [SCI-7583] 2022-12-09 12:56:24 +01:00
Martin Artnik
de9f06a1fc Upgrade TinyMCE to 6.3, fix issues [SCI-7574] 2022-12-09 12:52:18 +01:00
Anton
de35386f29 Fix long protocol name in task protocol flyout [SCI-7581] 2022-12-09 12:48:37 +01:00
Anton
a3045a79a9 Fix expose ids css fixes [SCI-7578] 2022-12-09 09:59:51 +01:00
Oleksii Kriuchykhin
c35df9a762 Fix search by ID for project cards [SCI-7564] 2022-12-08 21:24:21 +01:00
artoscinote
08b9ec24f0
Merge pull request #4699 from scinote-eln/features/exposed_ids 
Features/exposed ids
 2022-12-08 15:58:43 +01:00
artoscinote
a3e8000360
Merge branch 'develop' into features/exposed_ids 2022-12-08 15:58:11 +01:00
ajugo
e3cc9c9105
Update experiment name field [SCI-7539] (#4689) 2022-12-08 10:16:37 +01:00
Alex Kriuchykhin
6771f34fb8
Merge pull request #4697 from scinote-eln/dependabot/bundler/nokogiri-1.13.10 
Bump nokogiri from 1.13.9 to 1.13.10
 2022-12-08 09:53:59 +01:00
dependabot[bot]
0f001b9c5b
Bump nokogiri from 1.13.9 to 1.13.10 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.9 to 1.13.10.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.9...v1.13.10)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-08 04:01:51 +00:00
ajugo
add6554732
Connect experiment options to the table view [SCI-7554] (#4692) 2022-12-07 14:51:48 +01:00
Martin Artnik
0aee4e00ce Update yarn.lock 2022-12-07 14:49:35 +01:00
Martin Artnik
c828d02b99 Merge branch 'develop' into features/tiny_mce_6 2022-12-07 14:07:43 +01:00