scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-18 15:13:21 +08:00
Code Issues Projects Releases Packages Wiki Activity
12262 commits 31 branches 181 tags 166 MiB
Commit graph

12262 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
aignatov-bio
a901b3db59
Merge pull request #4688 from aignatov-bio/ai-sci-7521-add-new-actions-toolbar-to-datatable 
Add actions toolbar to protocol repository [SCI-7521]
 2022-12-07 14:49:45 +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
dependabot[bot]
5bddc1f577
Bump minimatch from 3.0.4 to 3.0.8 
Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.0.8.
- [Release notes](https://github.com/isaacs/minimatch/releases)
- [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md)
- [Commits](https://github.com/isaacs/minimatch/compare/v3.0.4...v3.0.8)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-07 12:27:07 +00:00
dependabot[bot]
7b0318077b
Bump express from 4.17.1 to 4.18.2 
Bumps [express](https://github.com/expressjs/express) from 4.17.1 to 4.18.2.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.17.1...4.18.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-07 12:27:07 +00:00
dependabot[bot]
253011f2cc
Bump qs from 6.5.2 to 6.5.3 
Bumps [qs](https://github.com/ljharb/qs) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.5.2...v6.5.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-07 12:27:06 +00:00
Alex Kriuchykhin
e3d38e2c9c
Merge pull request #4682 from scinote-eln/dependabot/npm_and_yarn/decode-uri-component-0.2.2 
Bump decode-uri-component from 0.2.0 to 0.2.2
 2022-12-07 13:26:31 +01:00
Oleksii Kriuchykhin
95baaefd7a Add img2zpl gem for ZPL image code generation [SCI-7551] 2022-12-07 11:59:27 +01:00
Giga Chubinidze
864e92e03b hound styling fix 2022-12-07 14:36:32 +04:00
Giga Chubinidze
96987977d1 fixed default visible column logic 2022-12-07 14:35:25 +04:00
Giga Chubinidze
3c23465114 Merge branch 'gc_SCI_7442' of github.com:G-Chubinidze/scinote-web into gc_SCI_7442 2022-12-07 13:52:18 +04:00
G-Chubinidze
cb65c3af7d
Merge pull request #4690 from G-Chubinidze/gc_SCI_7558 
CSS: sorting, experiment card, task card[SCI-7558]
 2022-12-07 13:27:12 +04:00
Giga Chubinidze
13972e6c33 CSS: sorting, experiment card, task card[SCI-7558] 2022-12-07 10:22:29 +04:00
Giga Chubinidze
c9a6af8de4 logic update | removed automatic redirection 2022-12-06 22:06:34 +04:00
G-Chubinidze
c2ae4e3a02
single quoted 2022-12-06 20:21:47 +04:00
Giga Chubinidze
e19ab4213c single quoted 2022-12-06 20:20:30 +04:00
G-Chubinidze
d696128ae1
Merge branch 'features/new_experiment_views' into gc_SCI_7442 2022-12-06 20:15:14 +04:00
Giga Chubinidze
0bad40c00d styling changes 2022-12-06 19:58:59 +04:00
Anton
2a8aaed7d1 Add actions toolbar to protocol repository [SCI-7521] 2022-12-06 15:54:50 +01:00
Giga Chubinidze
420ec69f20 BE: Column display switch (Task data display) [SCI-7442] 2022-12-06 17:51:11 +04:00
Martin Artnik
df4654189b Revert "Revert "Add task IDs to canvas view [SCI-7177][SCI-7178]"" 
This reverts commit 50e7531ffa.
 2022-12-06 12:43:30 +01:00
Giga Chubinidze
082745a3dc The View flyout in the Archived tasks view 2022-12-06 03:23:22 +04:00
Alex Kriuchykhin
813c15838e
Merge pull request #4678 from okriuchykhin/ok_SCI_7543 
Improve sorting of task results [SCI-7543]
 2022-12-05 16:10:12 +01:00
aignatov-bio
2bb11af170
Merge pull request #4685 from aignatov-bio/ai-sci-7560-update-protocol-repository-layout 
Update protocols layout [SCI-7515]
 2022-12-05 15:05:43 +01:00
Anton
fdeb22c6cd Update protocols layout [SCI-7515] 2022-12-05 14:02:13 +01:00
ajugo
4b83f77c5b
Add new task modal field for Assign users for experiment views [SCI-7450] (#4670) 
* Add new task modal field for Assign users for experiment views [SCI-7450]

* Fix loading users assigned to the experiment [SCI-7450]

* Fix task creation on experiment if none exists [SCI-7450]
 2022-12-05 12:55:57 +01:00