Commit graph

11556 commits

Author SHA1 Message Date
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
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 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 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
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
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
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
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
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
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
G-Chubinidze bc43b3af98
Merge pull request #4683 from G-Chubinidze/gc_SCI_7199
fixed id sorting on reports removed model duplicate code [SCI-7199]
2022-12-05 13:22:52 +04:00
ajugo 369fffc467
Fix building of circular protocols for protocols.io [SCI-7388] (#4665) 2022-12-05 10:21:12 +01:00
Giga Chubinidze 769fe7ebd8 fixed id sorting on reports removed model duplicate code 2022-12-05 13:17:15 +04:00
dependabot[bot] a66d00013e
Bump decode-uri-component from 0.2.0 to 0.2.2
Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2.
- [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases)
- [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2)

---
updated-dependencies:
- dependency-name: decode-uri-component
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-03 09:17:44 +00:00
G-Chubinidze 756e81c091
Merge pull request #4588 from G-Chubinidze/gc_SCI_7176
expose experiment ids in active / archived card views [SCI-7176] [SCI-7202]
2022-12-02 20:16:40 +04:00
G-Chubinidze df4ac4d5b3
Merge pull request #4429 from G-Chubinidze/gc_SCI_7172
Expose project IDs in tables & cards view [SCI-7172]  [SCI-7173] [SCI-7201]
2022-12-02 20:16:05 +04:00
Giga Chubinidze eff5d12253 removed last-page class by default 2022-12-02 20:10:03 +04:00
artoscinote 6f60a7cd4f
Merge pull request #4673 from artoscinote/ma_SCI_7238
Make overflowing tables in TinyMCE scrollable [SCI-7238]
2022-12-02 16:24:45 +01:00
artoscinote 28304668e7
Merge pull request #4679 from artoscinote/ma_SCI_7192
Properly format Excell dates in import preview [SCI-7192]
2022-12-02 16:02:38 +01:00
Oleksii Kriuchykhin 78660fb1aa Improve sorting of task results [SCI-7543] 2022-12-02 14:58:36 +01:00
Martin Artnik b600ca9771 Properly format Excell dates in import preview [SCI-7192] 2022-12-02 14:17:50 +01:00
Giga Chubinidze 76884bafc1 code cleanup 2022-12-02 15:53:22 +04:00
Giga Chubinidze 36b99fa2cb code cleanup 2022-12-02 14:51:22 +04:00
ajugo 847280489a
Add report id to the report datatable [SCI-7199] (#4453)
* Add report id to the report datatable [SCI-7199]

* Remove report id migration [SCI-7199]
2022-12-02 11:41:32 +01:00
ajugo 7525ffeede
Add IDs to task cards in the canvas edit mode [SCI-7523] (#4666) 2022-12-02 11:40:57 +01:00
Alex Kriuchykhin efa05ca390
Merge pull request #4589 from okriuchykhin/ok_SCI_7208
Introduce searchability by ID in global search field [SCI-7208]
2022-12-02 11:37:53 +01:00
Oleksii Kriuchykhin 0d6c6ccd9e Introduce searchability by ID in global search field [SCI-7208] 2022-12-02 11:16:18 +01:00
artoscinote a0682f962a
Merge pull request #4674 from G-Chubinidze/gc_SCI_7542
Add the time to the existing timestamp in the comments side panel [SCI-7542]
2022-12-02 10:18:08 +01:00
artoscinote eaf9017def
Merge pull request #4643 from artoscinote/ma_SCI_7206
Add exposed IDs to recent work [SCI-7206]
2022-12-02 10:16:51 +01:00
Giga Chubinidze 22248d4fed Add the time to the existing timestamp in the comments side panel [SCI-7542] 2022-12-02 10:49:06 +04:00
Martin Artnik 13cf136ca4 Make overflowing tables in TinyMCE scrollable [SCI-7238] 2022-12-01 15:20:23 +01:00
G-Chubinidze 42a670726b
Merge pull request #4660 from G-Chubinidze/gc_SCI_7200
Add IDs to pdf and docx reports [SCI-7200]
2022-11-30 15:29:06 +04:00