Commit graph

12107 commits

Author SHA1 Message Date
aignatov-bio 78299b64f4
Merge pull request #4756 from aignatov-bio/ai-sci-7646-fix-archived-tasks-logn-experiment-name
Fix long experiment name on archived tasks card view [SCI-7646]
2023-01-05 17:27:03 +01:00
Anton 79209054c4 Fix color of zoom option button [SCI-7680] 2023-01-05 13:29:13 +01:00
Anton 00d8e2dd63 Fix placeholder columns during sorting [SCI-7687] 2023-01-05 13:10:51 +01:00
Anton 637a53cbc6 Add microinteractions to edit experiment name field [SCI-7681] 2023-01-05 12:43:19 +01:00
ajugo f8d2edc2c8
Fix Manage access in the experiment table view [SCI-7648] (#4752) 2023-01-05 12:00:33 +01:00
ajugo 32e9329bcc
Fix user assign modal in experiment archived table view [SCI-7654] (#4742) 2023-01-05 12:00:12 +01:00
Anton ca30c6a094 Fix long experiment name on archived tasks card view [SCI-7646] 2023-01-05 11:54:38 +01:00
ajugo 194c519a9b
Fix experiment table due date initialization [SCI-7649] (#4730)
* Fix experiment table due date initialization [SCI-7649]

* Fix due date overflow [SCI-7649]
2023-01-05 11:14:34 +01:00
Martin Artnik 4e779e70a4 Merge branch 'develop' into features/tiny_mce_6 2023-01-04 14:21:02 +01:00
Alex Kriuchykhin 2ea5000ea5
Merge pull request #4737 from okriuchykhin/ok_SCI_7643
Add missing permissions for inventories and protocols [SCI-7643]
2023-01-04 13:22:33 +01:00
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 07df1c8b9f
Merge pull request #4721 from aignatov-bio/ai-sci-7517-add-protocols-filters-frontend
Add protocols filters front end [SCI-7517]
2023-01-04 10:35:29 +01:00
Anton ba98075690 Add protocols filters front end [SCI-7517] 2023-01-04 10:34:49 +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
Anton 9c488d5a0c Add new access user modal [SCI-7518] 2023-01-03 14:43:03 +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
artoscinote bb766ee0f9
Merge pull request #4704 from artoscinote/ma_SCI_7574
Upgrade TinyMCE to 6.3, fix issues [SCI-7574]
2022-12-23 14:15:43 +01:00
Alex Kriuchykhin 4439d044ab
Merge pull request #4729 from rekonder/aj_SCI_7612
Implement 2fa screen after sign in [SCI-7612]
2022-12-23 11:50:45 +01:00
Andrej e9ddb80443 Remove session redirection [SCI-7612] 2022-12-23 10:40:07 +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
Oleksii Kriuchykhin 06f3c34e3a Add missing permissions for inventories and protocols [SCI-7643] 2022-12-22 16:46:26 +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
Anton d1a68adb22 Add access modal for protocols [SCI-7518] 2022-12-22 13:27:46 +01:00
ajugo b549938f13
Fix print modal css [SCI-7437] (#4648) 2022-12-22 11:09:20 +01:00
Martin Artnik 2010ff091c Styling fixes and cleanup [SCI-7574] 2022-12-22 10:37:47 +01:00