scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 23:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
11541 commits 70 branches 179 tags 165 MiB
Commit graph

11541 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
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
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
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
Oleksii Kriuchykhin 0788072df1 ump version to 1.26.3.1 2022-11-30 12:14:19 +01:00
Alex Kriuchykhin 25e6a51be8
Merge pull request #4667 from rekonder/fix_session_end 
Fix session end for remember me [SCI-7502
 2022-11-30 12:12:45 +01:00
Andrej a2dbf79716 Fix session end for remember me 2022-11-30 12:03:27 +01:00
Oleksii Kriuchykhin 8ba9e93cc8 Bump version to 1.26.3 2022-11-30 10:27:56 +01:00
Giga Chubinidze b695903ea4 added frozen string literal 2022-11-30 11:39:28 +04:00
ajugo ea7f447190
Fix ovelaping checkbox on experiment card view [SCI-7546] (#4663) 2022-11-29 15:08:47 +01:00
artoscinote c4ba723998
Merge pull request #4662 from artoscinote/ma_SCI_7534 
Make deferred SmartAnnotation loading optional [SCI-7534]
 2022-11-29 13:51:28 +01:00
Martin Artnik 76de2d1380 Make deferred SmartAnnotation loading optional [SCI-7534] 2022-11-29 13:47:52 +01:00
Giga Chubinidze 8d97641110 Add IDs to pdf and docx reports [SCI-7200] 2022-11-29 11:38:08 +04:00
G-Chubinidze fdc8d8ef24
Merge pull request #4654 from G-Chubinidze/gc_SCI_7175 
Update sorting on Projects and Experiments pages [SCI-7175]
 2022-11-28 15:57:46 +04:00
artoscinote 7cc09faa94
Merge pull request #4657 from artoscinote/ma_SCI_7534 
Move atwho initialization to when a field is focused [SCI-7534]
 2022-11-28 12:39:45 +01:00
Martin Artnik f231c69a02 Move atwho initialization to when a field is focused [SCI-7534] 2022-11-28 11:44:25 +01:00
ajugo d255e40ba2
Fix printers instructions toggle [SCI-7535] (#4656) 2022-11-28 10:35:01 +01:00
aignatov-bio ecde2fae0d
Merge pull request #4655 from aignatov-bio/ai-sci-7472-fix-tooltip-for-clear-reminders 
Fix tooltip for clear reminders [SCI-7472]
 2022-11-28 10:15:00 +01:00
Anton 8ef5a742f6 Fix tooltip for clear reminders [SCI-7472] 2022-11-28 10:11:06 +01:00