Commit graph

11083 commits

Author SHA1 Message Date
Anton
4e32707245 Fix dupicate protocols in activities search [SCI-7171] 2022-09-23 12:38:44 +02:00
artoscinote
e3ca916c2a
Merge pull request #4447 from scinote-eln/ma_SCI_7184
Add y-scroll to step tables [SCI-7184]
2022-09-21 10:29:19 +02:00
aignatov-bio
d4b5754727
Merge pull request #4445 from aignatov-bio/ai-sci-7224-fix-link-interactions-in-step-text
Fix links in locked step texts elements [SCI-7224]
2022-09-21 09:59:22 +02:00
Anton
07f0142789 Fix links in locked step texts elements [SCI-7224] 2022-09-20 15:44:52 +02:00
Martin Artnik
c67213db41 Add y-scroll to step tables [SCI-7184] 2022-09-16 11:16:39 +02:00
artoscinote
b36a91ef85
Merge pull request #4432 from scinote-eln/develop
September cleanup, version 1.26.0.4
2022-09-13 13:37:57 +02:00
artoscinote
e8add30225
Bump version to
1.26.0.4
2022-09-13 13:24:43 +02:00
Alex Kriuchykhin
f62e4e8509
Merge pull request #4423 from okriuchykhin/ok_SCI_7180
Improve speed of group unassignment job as it is executed in foreground [SCI-7180]
2022-09-09 15:58:44 +02:00
Oleksii Kriuchykhin
b8dc0617b2 Improve speed of group unassignment job as it is executed in foreground [SCI-7180] 2022-09-09 13:31:16 +02:00
artoscinote
fa7e39c6a9
Fix experiment page infinite scroll [SCI-7160] (#4422) 2022-09-09 11:42:37 +02:00
artoscinote
6a2037dc00
Fix smart annotations in locked elements [SCI-7135] (#4421) 2022-09-09 11:15:33 +02:00
G-Chubinidze
e179182d21
fix archived repositories show button not showing [SCI-7162] (#4408)
* fix archived repositories show button not showing [SCI-7162]

* fix archived repositories show button not showing [SCI-7162]

Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
2022-09-08 11:51:47 +02:00
Alex Kriuchykhin
c5f0fa3e7f
Merge pull request #4415 from okriuchykhin/ok_SCI_7164
Do not change team if inventory is shared with current one [SCI-7164]
2022-09-07 11:06:51 +02:00
Oleksii Kriuchykhin
3d3fa6e871 Do not change team if inventory is shared with current one [SCI-7164] 2022-09-07 11:01:53 +02:00
artoscinote
95105b86af
Fix ininite scroll [SCI-7160] (#4414) 2022-09-07 10:01:00 +02:00
aignatov-bio
2407b95e37
Merge pull request #4411 from aignatov-bio/ai-sci-7169-remove-scroll-before-page-leave
Remove scroll before page leave [SCI-7169]
2022-09-06 12:44:20 +02:00
artoscinote
d2b022a17d
Remove obsolete code [SCI-7160] (#4412) 2022-09-06 12:10:20 +02:00
artoscinote
21f91089e9
Prevent loading empty next page in P/E infinite scroll [SCI-7160] (#4410) 2022-09-06 11:57:34 +02:00
Anton
90e962ccbf Remove scroll before page leave [SCI-7169] 2022-09-06 11:15:28 +02:00
artoscinote
9126b7fca4
Add missing protocol description activity [SCI-7140] (#4401) 2022-09-06 11:03:13 +02:00
aignatov-bio
b585219be2
Merge pull request #4402 from aignatov-bio/ai-sci-7127-fix-error-handling-for-tinymce
Fix error handling for tinymce [SCI-7127]
2022-09-05 12:36:36 +02:00
Alex Kriuchykhin
bf7582fe1d
Merge pull request #4406 from okriuchykhin/ok_SCI_7158
Make experiment card dropdown menu async [SCI-7158]
2022-09-02 18:16:07 +02:00
Oleksii Kriuchykhin
f85a6b5a2e Make experiment card dropdown menu async [SCI-7158] 2022-09-02 18:15:01 +02:00
Alex Kriuchykhin
d5a3b622c6
Merge pull request #4405 from okriuchykhin/ok_SCI_7157
Make permission checks for card selection async [SCI-7157]
2022-09-02 18:13:39 +02:00
Oleksii Kriuchykhin
e27d063b61 Make permission checks for card selection async [SCI-7157] 2022-09-02 18:10:16 +02:00
Alex Kriuchykhin
0fcedc32ba
Merge pull request #4403 from artoscinote/ma_SCI_7159
Make project action dropdowns async [SCI-7159]
2022-09-02 17:05:35 +02:00
Martin Artnik
a2a5e8c4c8 Add caching and improve dynamic reload [SCI-7159] 2022-09-02 16:54:41 +02:00
artoscinote
27b4f398a4
Merge pull request #4404 from G-Chubinidze/gc_SCI_7161
Fix underline in docx report generator [SCI-7161]
2022-09-02 15:13:13 +02:00
Giga Chubinidze
f8842cd066 Fix underline in docx report generator [SCI-7161] 2022-09-02 17:11:36 +04:00
Giga Chubinidze
85873213b8 Fix underline in docx report generator [SCI-7161] 2022-09-02 16:44:51 +04:00
Martin Artnik
ef9cd21ecf Make project action dropdowns async [SCI-7159] 2022-09-02 13:47:45 +02:00
aignatov-bio
491ff286f6
Merge pull request #4390 from aignatov-bio/ai-sci-7113-fix-assigned-repositry-bell-flyout
Fix bell flyout in assigned repository [SCI-7113]
2022-09-02 11:21:17 +02:00
aignatov-bio
2e190510c4
Merge pull request #4397 from aignatov-bio/ai-sci-7136-fix-rte-toolbar-position
Fix rte toolbar position [SCI-7136]
2022-09-02 11:20:32 +02:00
aignatov-bio
e605471269
Merge pull request #4392 from aignatov-bio/ai-sci-7100-fix-inivitation-modal
Invite user modal fixes [SCI-7100]
2022-09-02 11:20:18 +02:00
Anton
5f21c06b26 Fix error handling for tinymce [SCI-7127] 2022-09-02 11:19:54 +02:00
Alex Kriuchykhin
8a8c168d1b
Merge pull request #4399 from biosistemika/dependabot/bundler/omniauth-1.9.2
Bump omniauth from 1.9.1 to 1.9.2
2022-09-01 12:05:45 +02:00
Alex Kriuchykhin
284bfe106d
Merge pull request #4398 from okriuchykhin/ok_SCI_7133
Optimise PE cards loading [SCI-7133]
2022-09-01 12:05:05 +02:00
Oleksii Kriuchykhin
e276054a80 Optimize PE cards loading [SCI-7133] 2022-09-01 11:59:39 +02:00
artoscinote
87e944c9c4
Merge pull request #4400 from G-Chubinidze/gc_SCI_7141
Fix superscript and subscript  in docx report generator [SCI-7141]
2022-09-01 11:34:08 +02:00
Giga Chubinidze
57c5947d91 Fix superscript and subscript in docx report generator [SCI-7141] 2022-09-01 10:49:17 +04:00
Giga Chubinidze
922652417a Fix superscript and subscript in docx report generator [SCI-7141] 2022-09-01 10:15:31 +04:00
dependabot[bot]
fa8beb9c26
Bump omniauth from 1.9.1 to 1.9.2
Bumps [omniauth](https://github.com/omniauth/omniauth) from 1.9.1 to 1.9.2.
- [Release notes](https://github.com/omniauth/omniauth/releases)
- [Commits](https://github.com/omniauth/omniauth/compare/v1.9.1...v1.9.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-31 19:42:33 +00:00
Alex Kriuchykhin
96b4c31e73
Merge pull request #4396 from biosistemika/dependabot/npm_and_yarn/moment-timezone-0.5.35
Bump moment-timezone from 0.5.25 to 0.5.35
2022-08-31 17:25:53 +02:00
Anton
312f2a1357 Fix rte toolbar position [SCI-7136] 2022-08-31 13:15:08 +02:00
aignatov-bio
17d69131f3
Merge pull request #4383 from aignatov-bio/ai-sci-7124-fix-old-tinymce-big-tables
Fix overflow issue on step text [SCI-7124]
2022-08-31 10:13:27 +02:00
aignatov-bio
042e0330a7
Merge pull request #4386 from aignatov-bio/ai-sci-7117-fix-project-scroll-issue
Fix project/experiment scroll issue [SCI-7117]
2022-08-31 10:13:10 +02:00
artoscinote
ceb3d95e0f
Merge pull request #4394 from artoscinote/ma_SCI_7135
Fix smart annotations for locked tasks [SCI-7135]
2022-08-31 09:58:48 +02:00
Martin Artnik
d3665a940e Fix smart annotations for locked tasks [SCI-7135] 2022-08-31 09:49:47 +02:00
artoscinote
04245c8244
Merge pull request #4393 from artoscinote/ma_SCI_7118
Fix sorting of results by newest/oldest (by updated_at) [SCI-7118]
2022-08-31 09:10:26 +02:00
artoscinote
80072f6bbf
Merge pull request #4391 from artoscinote/ma_SCI_7111
Fix import issues with date formatting [SCI-7111]
2022-08-31 09:08:50 +02:00