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
11699 commits 70 branches 179 tags 165 MiB
Commit graph

11699 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
artoscinote 36af73eb7c
Merge pull request #4749 from artoscinote/ma_SCI_7653 
Fix display of tasks table in archived experiments [SCI-7653]
 2023-01-04 13:14:22 +01:00
artoscinote 710a97a50e
Merge pull request #4751 from artoscinote/ma_SCI_7596 
Don't touch result when comment is created [SCI-7596]
 2023-01-04 13:14:07 +01:00
artoscinote 04f0435d3e
Merge pull request #4750 from artoscinote/ma_SCI_7584 
Do not touch protocol if step or checklist is checked [SCI-7584]
 2023-01-04 13:13:54 +01:00
Alex Kriuchykhin 792785fa43
Merge pull request #4748 from scinote-eln/dependabot/npm_and_yarn/json5-1.0.2 
Bump json5 from 1.0.1 to 1.0.2
 2023-01-04 12:58:31 +01:00
Alex Kriuchykhin c032c8061f
Merge pull request #4746 from scinote-eln/dependabot/bundler/httparty-0.21.0 
Bump httparty from 0.17.3 to 0.21.0
 2023-01-04 12:57:43 +01:00
Martin Artnik 7460cc5b82 Don't touch result when comment is created [SCI-7596] 2023-01-04 12:55:32 +01:00
Martin Artnik 15543d5222 Do not touch protocol if step or checklist is checked [SCI-7584] 2023-01-04 12:33:11 +01:00
Martin Artnik d466db1658 Fix display of tasks table in archived experiments [SCI-7653] 2023-01-04 11:56:25 +01:00
aignatov-bio 9e75a54635
Merge pull request #4428 from aignatov-bio/ai-sci-7167-update-repository-project-logic 
Fix repository selection in reports [SCI-7167]
 2023-01-04 10:08:45 +01:00
aignatov-bio eaa7928617
Merge branch 'develop' into ai-sci-7167-update-repository-project-logic 2023-01-04 10:08:38 +01:00
aignatov-bio fa881253b6
Merge pull request #4672 from aignatov-bio/ai-sci-7531-fix-cross-team-redirections 
Add missed notifications to steps and fix notification for protocol repository [SCI-7531]
 2023-01-04 10:07:36 +01:00
aignatov-bio 9522deef52
Merge pull request #4664 from aignatov-bio/ai-sci-7394-update-protocol-io-import-screen 
CSS update for protocol import screen [SCI-7394]
 2023-01-04 10:07:19 +01:00
aignatov-bio 6af72a28ee
Merge pull request #4715 from aignatov-bio/ai-sci-7559-add-step-text-notification 
Add new step text notification [SCI-7559]
 2023-01-04 10:06:57 +01:00
ajugo 4f55b4a749
Fix advanced filters on PET tables [SCI-7650] (#4747) 2023-01-04 09:59:05 +01:00
dependabot[bot] 037946c8d1
Bump json5 from 1.0.1 to 1.0.2 
Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-03 21:46:48 +00:00
dependabot[bot] 91930a3dd2
Bump httparty from 0.17.3 to 0.21.0 
Bumps [httparty](https://github.com/jnunemaker/httparty) from 0.17.3 to 0.21.0.
- [Release notes](https://github.com/jnunemaker/httparty/releases)
- [Changelog](https://github.com/jnunemaker/httparty/blob/master/Changelog.md)
- [Commits](https://github.com/jnunemaker/httparty/compare/v0.17.3...v0.21.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-03 15:27:45 +00:00
Alex Kriuchykhin 53a2ea6df7
Merge pull request #4649 from okriuchykhin/ok_SCI_7505 
Improve activity records creation in controllers [SCI-7505]
 2023-01-03 15:16:00 +01:00
artoscinote d166e90763
Merge pull request #4745 from G-Chubinidze/gc_SCI_7636 
Display the maintenance illustration: Prepare HTML page [SCI-7636]
 2023-01-03 15:13:32 +01:00
ajugo ae55935002
Add missing microinteractions on step editing [SCI-7575] (#4711) 2023-01-03 12:25:22 +01:00
ajugo 6844144503
Fix experiment table sidebar navigation [SCI-7652] (#4741) 2023-01-03 12:24:56 +01:00
Giga Chubinidze bd8a570a40 Display the maintenance illustration: Prepare HTML page [SCI-7636] 2023-01-03 15:12:57 +04:00
aignatov-bio b43813366e
Merge pull request #4738 from aignatov-bio/ai-sci-7645-update-tags-selector-new-task 
Update tags selection [SCI-7645]
 2023-01-03 11:59:27 +01:00
aignatov-bio 1a161c55f4
Merge pull request #4740 from aignatov-bio/ai-sci-7646-fix-experiment-table-title-width 
Fix experiment table title width [SCI-7646]
 2023-01-03 11:59:16 +01:00
Martin Artnik 1b4c209180 Fix syntax error [SCI-7368] 2022-12-23 15:03:02 +01:00
Anton 30606428e9 Fix experiment table title width [SCI-7646] 2022-12-23 10:35:17 +01:00
Anton 031ba603fc Update tags selection [SCI-7645] 2022-12-22 17:39:51 +01:00
ajugo 67b4ccf634
Add missing text (#4736) 2022-12-22 14:38:22 +01:00
aignatov-bio 0e1f73c69c
Merge pull request #4735 from scinote-eln/features/new_experiment_views 
Features/new experiment views
 2022-12-22 13:33:35 +01:00
aignatov-bio ea661f3c19
Merge branch 'develop' into features/new_experiment_views 2022-12-22 13:33:25 +01:00
ajugo 2920dca900
Clear row selection after experiment table reload [SCI-7647] (#4731) 2022-12-22 13:30:27 +01:00
ajugo b549938f13
Fix print modal css [SCI-7437] (#4648) 2022-12-22 11:09:20 +01:00
aignatov-bio 5528686d7b
Merge pull request #4661 from aignatov-bio/ai-sci-7424-update-cheklist-table-name-copy 
Add suffix for checklist and table duplication [SCI-7424]
 2022-12-22 09:58:12 +01:00
Oleksii Kriuchykhin ccb9212567 Bump version to 1.26.4 2022-12-21 10:51:02 +01:00
aignatov-bio e3036d923b
Merge pull request #4686 from G-Chubinidze/gc_SCI_7496 
The View flyout in the Archived tasks view [SCI-7496]
 2022-12-20 15:19:58 +01:00
artoscinote 41e629d96c
Merge pull request #4728 from artoscinote/ma_SCI_7641 
Fix duplicate entries for recent work [SCI-7641]
 2022-12-20 15:12:58 +01:00
Martin Artnik 45aad7f429 Fix duplicate entries for recent work [SCI-7641] 2022-12-20 14:32:22 +01:00
Alex Kriuchykhin 5aaeee4b16
Merge pull request #4727 from okriuchykhin/ok_SCI_7422_v2 
Fix viewer permissions for inventories [SCI-7422]
 2022-12-20 13:43:36 +01:00
aignatov-bio 952d62a357
Merge pull request #4726 from aignatov-bio/ai-sci-7628-fix-menu-in-archived-experiment-table 
CSS fixes for project/experiments cards [SCI-7628]
 2022-12-20 13:28:29 +01:00
Oleksii Kriuchykhin 72f1cf2704 Fix viewer permissions for inventories [SCI-7422] 2022-12-20 13:26:38 +01:00
Anton 250a4b4602 CSS fixes for project/experiments cards [SCI-7628] 2022-12-20 12:51:44 +01:00
G-Chubinidze f463664885
Merge pull request #4724 from G-Chubinidze/gc_SCI_7449 
FE | BE Add new task modal field for Tags [SCI-7449]
 2022-12-20 15:50:15 +04:00
Giga Chubinidze 377872dda3 hound code cleanup 2022-12-20 10:37:40 +04:00
Giga Chubinidze 1a84c60c74 FE | BE Add new task modal field for Tags [SCI-7449] 2022-12-19 14:55:38 +04:00
aignatov-bio b07e108d94
Merge pull request #4723 from aignatov-bio/ai-sci-7953-revert-modified-date-to-previous-place 
Revert modified date on experiment card
 2022-12-19 11:34:39 +01:00
Anton 2fd2d7300e Revert modified date on experiment card 2022-12-19 11:32:32 +01:00
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
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