Commit graph

9893 commits

Author SHA1 Message Date
Martin Artnik
0fbe45252f Reset file_processing when new file is upladed [SCI-5870] 2021-07-08 12:02:41 +02:00
Miha Mencin
d240c9f769
Merge pull request #3421 from artoscinote/ma_SCI_5870
Added pdf viewer js pack to my_module archive view, fixed issue with files getting stuck in processing [SCI-5870]
2021-07-08 12:01:31 +02:00
Oleksii Kriuchykhin
549fc8e5a0 Fix repository cell joining and preloading [SCI-5847] 2021-07-07 17:43:51 +02:00
Martin Artnik
fdf9c5f6ae Reset file_processing when new file is upladed [SCI-5870] 2021-07-07 14:57:35 +02:00
Oleksii Kriuchykhin
d1208bad0b Merge branch 'develop' into features/new_permissions 2021-07-07 13:44:36 +02:00
Miha Mencin
34a5464a92
Merge pull request #3261 from ZmagoD/new_perimssions-managing-project-ui
New permissions managing project UI
2021-07-07 13:15:51 +02:00
Miha Mencin
4934b4eb8e
Merge pull request #3420 from artoscinote/ma_SCI_5856
Made 2fa enable modal accessible globally [SCI-5856]
2021-07-07 12:52:14 +02:00
Martin Artnik
42ed28676d Added pdf viewer js pack to my_module archive view [SCI-5870] 2021-07-07 11:34:28 +02:00
Martin Artnik
0c63013d8b Made 2fa enable modal accessible globally [SCI-5856] 2021-07-05 16:50:37 +02:00
artoscinote
52946d18e0
Merge pull request #3416 from artoscinote/ma_SCI_5099
Rework the team invite modal functionality on members page [SCI-5099]
2021-07-05 12:41:04 +02:00
Martin Artnik
5f528fcdb5 Rework the team invite modal functionality on members page [SCI-5099] 2021-07-05 12:39:54 +02:00
Martin Artnik
5f61c6568d Fix report specs [SCI-5859] 2021-07-05 12:34:39 +02:00
Alex Kriuchykhin
677d937e45
Merge pull request #3417 from artoscinote/ma_SCI_5866
Fixed missing archived column in experiment table [SCI-5866]
2021-07-05 10:10:15 +02:00
Martin Artnik
1c98d7cdd2 Fixed missing archived column in experiment table [SCI-5866] 2021-07-02 16:10:35 +02:00
Alex Kriuchykhin
0e813791fe
Merge pull request #3413 from aignatov-bio/ai-sci-5832-issue-in-reports-with-pip-file
Fix file icons in report [SCI-5832]
2021-07-02 10:20:18 +02:00
Alex Kriuchykhin
6450e221a9
Merge pull request #3412 from aignatov-bio/ai-sci-5568-add-missed-activity-for-tag-removing
Add missed activity for tag removing [SCI-5568]
2021-07-02 10:18:26 +02:00
Alex Kriuchykhin
38912b1b38
Merge pull request #3406 from aignatov-bio/ai-sci-5834-update-marvinjs-image-generation
Update marvinJS image generation [SCI-5834]
2021-07-02 10:12:48 +02:00
Alex Kriuchykhin
baa71d6918
Merge pull request #3404 from biosistemika/dependabot/bundler/bindata-2.4.10
Bump bindata from 2.4.8 to 2.4.10
2021-07-02 10:12:09 +02:00
Alex Kriuchykhin
786e072bd7
Merge pull request #3408 from artoscinote/ma_SCI_5822
Fix typos [SCI-5822]
2021-07-02 10:11:46 +02:00
aignatov-bio
d0b4a75095 Fix file icons in report 2021-06-30 14:35:23 +02:00
Alex Kriuchykhin
f835f88e64
Merge pull request #3410 from okriuchykhin/ok_SCI_5097
Update Invite new user to team modal [SCI-5097]
2021-06-30 13:34:06 +02:00
aignatov-bio
bef57eacac Add missed activtiy for tag removing [SCI-5568] 2021-06-30 13:34:02 +02:00
Martin Artnik
3662365cac Small code style tweak SCI-5800 2021-06-30 13:15:08 +02:00
Martin Artnik
15d5bb073d Exclude spec folder from ruby linter 2021-06-30 13:12:19 +02:00
Martin Artnik
618f5cfb53 Code style fixes [SCI-5800] 2021-06-30 13:08:16 +02:00
artoscinote
723b594632
Merge pull request #3398 from artoscinote/ma_SCI_5828
Expose experiment IDs in interface and reports [SCI-5828]
2021-06-30 12:58:25 +02:00
Martin Artnik
524ea05873 Fix migration rollback [SCI-5828] 2021-06-30 10:37:11 +02:00
Martin Artnik
3e1f0fe109 Migration code style fix [SCI-5828] 2021-06-30 10:28:55 +02:00
Martin Artnik
e1b0b65465 Improved code style, fixed bug [SCI-5828] 2021-06-29 15:57:23 +02:00
artoscinote
73c86c8423
Merge pull request #3409 from artoscinote/ma_SCI_5851
Report generation fixes [SCI-5851]
2021-06-29 14:55:26 +02:00
Martin Artnik
b623e2f40f Report generation fixes [SCI-5851] 2021-06-29 13:46:45 +02:00
Oleksii Kriuchykhin
ecec1ce194 Update Invite new user to team modal [SCI-5097] 2021-06-29 13:46:02 +02:00
artoscinote
9804e1bd28
Merge pull request #3400 from artoscinote/ma_SCI_5701
Reworked task view sidebar [SCI-5701]
2021-06-29 11:26:56 +02:00
Martin Artnik
e1d8b76b10 Fix typos [SCI-5822] 2021-06-29 10:45:41 +02:00
zmagoD
9c812e84bd setup logic to group assign all team members and handle the unassignments logic 2021-06-27 13:22:19 +02:00
zmagoD
a678f07b47 update extends and remove format from links 2021-06-27 09:45:32 +02:00
aignatov-bio
53b47412ee Update marvinJS image generation [SCI-5834] 2021-06-24 22:36:51 +02:00
dependabot[bot]
e1310deabe
Bump bindata from 2.4.8 to 2.4.10
Bumps [bindata](https://github.com/dmendel/bindata) from 2.4.8 to 2.4.10.
- [Release notes](https://github.com/dmendel/bindata/releases)
- [Changelog](https://github.com/dmendel/bindata/blob/master/ChangeLog.rdoc)
- [Commits](https://github.com/dmendel/bindata/compare/v2.4.8...v2.4.10)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-23 23:43:51 +00:00
aignatov-bio
786e74e4de
Add BioEddie integration [SCI-5654][SCI-5657][SCI-5658][SCI-5670] (#3391)
* Add backend for bioeddie [SCI-5654]

* Add modal for bioeddie [SCI-5654]

* Add bio eddie editor to steps and results [SCI-5654]

* Fix markup and code styling
2021-06-23 19:48:44 +02:00
Miha Mencin
7ced8621e7
Merge pull request #3403 from biosistemika/develop
Release 1.22.0
2021-06-23 10:57:14 +02:00
Miha Mencin
02cf9fa439
Bump version to 1.22.0 2021-06-23 10:54:23 +02:00
Alex Kriuchykhin
092916ea48
Merge pull request #3402 from artoscinote/ma_SCI_5840
Fixed export all report html generation [SCI-5840]
2021-06-22 15:04:37 +02:00
Martin Artnik
b2e2186d9f Remove unnecessary tasks hash from full export [SCI-5840] 2021-06-22 14:57:07 +02:00
Martin Artnik
c6c5f75262 Remove unncessary newline 2021-06-22 14:53:03 +02:00
Martin Artnik
c4e6b0bbaf Fixed export all report html generation [SCI-5840] 2021-06-22 14:50:47 +02:00
Martin Artnik
d67d53b926 Code style fixes 2021-06-22 13:27:03 +02:00
Martin Artnik
eaa713f5b8 Fix indices [SCI-5829] 2021-06-22 12:51:25 +02:00
artoscinote
fb105f8632
Merge pull request #3401 from artoscinote/ma_SCI_5837
Fixed report docx generation [SCI-5837]
2021-06-21 14:23:19 +02:00
Martin Artnik
a32219b1aa Amend how PDF report generation works [SCI-5837] 2021-06-21 14:20:30 +02:00
Martin Artnik
66d2e65114 Fixed report docx generation [SCI-5837] 2021-06-21 12:52:12 +02:00