Commit graph

187 commits

Author SHA1 Message Date
dependabot[bot] 3bfaae49f6
Bump loofah from 2.2.3 to 2.3.1
Bumps [loofah](https://github.com/flavorjones/loofah) from 2.2.3 to 2.3.1.
- [Release notes](https://github.com/flavorjones/loofah/releases)
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flavorjones/loofah/compare/v2.2.3...v2.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
2019-11-07 23:51:30 +00:00
Alex Kriuchykhin e4ca0cdb5a
Merge pull request #2188 from biosistemika/dependabot/bundler/rubyzip-1.3.0
Bump rubyzip from 1.2.4 to 1.3.0
2019-10-29 10:51:57 +01:00
dependabot[bot] 462c4ed92f
Bump rubyzip from 1.2.4 to 1.3.0
Bumps [rubyzip](https://github.com/rubyzip/rubyzip) from 1.2.4 to 1.3.0.
- [Release notes](https://github.com/rubyzip/rubyzip/releases)
- [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md)
- [Commits](https://github.com/rubyzip/rubyzip/compare/v1.2.4...v1.3.0)

Signed-off-by: dependabot[bot] <support@github.com>
2019-10-29 09:34:45 +00:00
dependabot[bot] 03f5b87b8e
Bump bootstrap-sass from 3.3.7 to 3.4.1
Bumps [bootstrap-sass](https://github.com/twbs/bootstrap-sass) from 3.3.7 to 3.4.1.
- [Release notes](https://github.com/twbs/bootstrap-sass/releases)
- [Changelog](https://github.com/twbs/bootstrap-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/twbs/bootstrap-sass/compare/v3.3.7...v3.4.1)

Signed-off-by: dependabot[bot] <support@github.com>
2019-10-29 09:34:37 +00:00
Oleksii Kriuchykhin 53402c9ce1 Fix images in reports, impove speed of report generation [SCI-3990][SCI-3993] 2019-10-17 13:30:14 +02:00
Oleksii Kriuchykhin ab395f46d0 Add paperclip for backward compatibility [SCI-3949] 2019-10-09 10:28:02 +02:00
Oleksii Kriuchykhin f18941ea19 Update sassc gem version to 2.2.1 [SCI-3949] 2019-10-08 14:32:25 +02:00
Oleksii Kriuchykhin 260fcd6e89 Remove Paperclip from codebase [SCI-3908] 2019-10-02 19:45:14 +02:00
Urban Rotnik e5933091d9 Add rubocop-rails gem 2019-09-17 13:42:43 +02:00
Oleksii Kriuchykhin 0475394b08 Fix test [SCI-3881] 2019-09-16 13:03:41 +02:00
Oleksii Kriuchykhin 3509543e7b Merge branch 'master' into ok_SCI_3881 2019-09-16 11:56:49 +02:00
Oleksii Kriuchykhin bc38c6b29e Fix failing test [SCI-3745] 2019-09-16 10:26:13 +02:00
Oleksii Kriuchykhin c068901b00 Upgrade Rails to 6.0 [SCI-3745] 2019-09-12 17:24:08 +02:00
Luka Murn 82248a6d92 Update canaid Gem reference in Gemfile to use tags, not master 2019-09-10 18:04:04 +02:00
Oleksii Kriuchykhin 3a87296c7b Fix cucumber tests, switch to chromium-driver [SCI-3786] 2019-08-22 13:38:02 +02:00
Oleksii Kriuchykhin e19736427c Fix mime-types version [SCI-3678] 2019-08-08 15:35:25 +02:00
Oleksii Kriuchykhin abd568084d Rollback cucumber-rails version [SCI-3678] 2019-08-08 15:17:39 +02:00
Oleksii Kriuchykhin 9c2cd7bd1c Rollback faker version [SCI-3678] 2019-08-08 14:43:43 +02:00
Oleksii Kriuchykhin d52df56fc4 Fix production build and update packages [SCI-3678] 2019-08-08 14:03:15 +02:00
Oleksii Kriuchykhin 973efa55e1 Merge branch 'master' into ok_SCI_3678 2019-08-08 11:17:07 +02:00
Jure Grabnar d9f6c249f9 Fix CVE-2015-9284 omniauth security precautions
Close SCI-3588
2019-07-31 16:59:38 +02:00
Anton Ignatov a4b2825258 Fix tests for active storage 2019-07-26 15:58:51 +02:00
aignatov-bio 2fae7d8208
Fix issue in report (#1941) 2019-07-19 10:37:44 +02:00
Oleksii Kriuchykhin a1941a21dc Futher refactoring of old Paperclip methods [SCI-3539] 2019-07-09 10:28:15 +02:00
Oleksii Kriuchykhin 028e647f4d Upgrade to Rails 5.2.3 [SCI-3651] 2019-07-03 11:15:13 +02:00
Jure Grabnar 4bdefda2af Upgrade webpacker to ~> 4.0.0 2019-07-02 13:30:13 +02:00
aignatov-bio 2793777463
Features/docx report (#1873)
* Initial setup for docx report

* Add render for project, experiment, my_module

* Implement converter for RTE fields

* Add all report elements

* fix markup

* Change headers, remove empty blocks, refactored repository draw

* Add smart annotations support

* Fix justify fields

* Prepare for addons integration

* Fix markup

* Add comments to GemFile

* Fix TinyMCE error

* Change UI for new report download selector

* Fix file error in inventory cell for docx

* Fix i18n object for header
2019-07-01 10:14:16 +02:00
Oleksii Kriuchykhin ba2daede0b Add migration scripts [SCI-3539] 2019-06-24 15:17:42 +02:00
Oleksii Kriuchykhin 109793c7fb Upgrade to Rails 5.2.3 and add ActiveStorage [SCI-3539] 2019-06-13 12:10:44 +02:00
Jure Grabnar bbfe2b9c89
Merge pull request #1798 from biosistemika/jg_sci_3145_thumbnail_preview
File preview on new attachments layout [SCI-3145]
2019-06-10 17:59:12 +02:00
Urban Rotnik 17f987e7c8 Add rubocop-perfromance after Rubocop has been updated 2019-06-10 12:24:04 +02:00
Oleksii Kriuchykhin e543a849d4 Add document file preview generation with LibreOffice [SCI-3145] 2019-06-05 14:52:30 +02:00
Anton Ignatov 995408e7fc Fix protocol update error, rollback bootstrap gems and fix step name 2019-05-08 17:18:19 +02:00
Anton Ignatov 72a1c9b9bd Fix merge conflict 2019-05-07 13:27:57 +02:00
Anton Ignatov d36160386f Merge branch 'master' into master-with-note-section 2019-05-07 13:26:55 +02:00
Oleksii Kriuchykhin 4522e6bf06 Update Ruby to 2.5.5, Rails to 5.1.7 and Devise to 4.6.2 [SCI-3401] 2019-04-30 17:04:48 +02:00
Oleksii Kriuchykhin d1e869a4c5 Fix build of JS packages [SCI-3377] 2019-04-24 11:26:03 +02:00
Anton Ignatov aa2dab2014 Merge branch 'features/note-section' into master-with-note-section 2019-04-23 10:31:37 +02:00
Oleksii Kriuchykhin 572f28f0b8 Remove unused devise_security_extension dependency [SCI-3347] 2019-04-16 13:08:15 +02:00
aignatov-bio 9fff93ab0e
Merge pull request #1576 from biosistemika/image-editor-prototype
Feature/Image annotation
2019-03-22 16:31:00 +01:00
Oleksii Kriuchykhin a822227383 Add rich text editor to task and protocol description [SCI-3062][SCI-3071] 2019-03-14 16:27:33 +01:00
Oleksii Kriuchykhin 0b0141de5f Update Rails to 5.1.6.2 2019-03-13 20:32:29 +01:00
Anton Ignatov b6480b04a9 Fixed conflicts 2019-03-11 15:36:56 +01:00
Oleksii Kriuchykhin 37dc8298b7 Fix webpack config [SCI-2856] 2019-03-11 15:13:06 +01:00
Oleksii Kriuchykhin 9bbdc8fc89 Include tui image editor with webpack [SCI-2856] 2019-03-11 15:12:38 +01:00
Urban Rotnik d3d9868ba4 Set version for HTTParty dependency, add opts in mailer 2019-02-19 11:23:01 +01:00
Urban Rotnik 5b55860dea Add scheduler 2019-02-13 15:48:15 +01:00
Urban Rotnik 9f3187abdf Add service for sync system notifications 2019-02-13 15:48:15 +01:00
aignatov-bio 5c85595ab4
System Notifications - View All Page [SCI-2956 and SCI-3001] (#1482)
* System notification view and notification partial (SCI 2956 and SCI 3001)
2019-02-13 13:06:14 +01:00
Urban Rotnik 457e9990c5 Add overcommit gem for git hooks (rubocop) 2019-01-18 16:56:28 +01:00