scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 23:16:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
11856 commits 70 branches 179 tags 165 MiB
Commit graph

287 commits

Author SHA1 Message Date
Oleksii Kriuchykhin a9ac8452f2 Add dynamic form elements in report wizard step 1 [SCI-5591] 2021-04-06 13:56:24 +02:00
Miha Mencin 352f3004b3
Update mimemagic to 0.3.8 2021-03-25 18:47:21 +01:00
Oleksii Kriuchykhin f7c865974d Switch to graphviz gem [SCI-5596] 2021-03-25 17:42:57 +01:00
Oleksii Kriuchykhin 943c01cada Remove simple_token_authentication [SCI-5595] 2021-03-25 14:55:22 +01:00
Miha Mencin 2873424e7d
Update mimemagic version 2021-03-24 16:09:03 +01:00
Oleksii Kriuchykhin 58ddfe80e4 Improve visibility of experiment workflow image [SCI-5458] 2021-02-02 22:23:11 +01:00
Oleksii Kriuchykhin 75da67b937 Update Rails to 6.1.1, ruby to 2.7.2 [SCI-5459] 2021-01-28 14:43:45 +01:00
dependabot[bot] 9a6bfb9309
Bump nokogiri from 1.10.9 to 1.11.0 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.9 to 1.11.0.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.9...v1.11.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-01-08 07:16:23 +00:00
Urban Rotnik aa1520bfb8 Merge branch 'develop' into jg_sci_2228 2020-10-22 14:21:39 +02:00
Alex Kriuchykhin d5499168f3
Merge pull request #2896 from biosistemika/features/pwa 
Merge features/pwa to develop
 2020-10-13 16:34:57 +02:00
Oleksii Kriuchykhin 1603ec6d1a Switch to a new version of Yomu gem 2020-09-29 13:11:50 +02:00
Urban Rotnik 2de1f901e6 Fix rubocop at hound supported version 2020-09-16 14:14:04 +02:00
Oleksii Kriuchykhin 7668e16419 Enable CORS for PWA [SCI-4979] 2020-09-04 11:47:45 +02:00
Urban Rotnik a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +02:00
aignatov-bio 13f7653667 Merge branch 'develop' into features/2fa 2020-07-07 13:05:45 +02:00
aignatov-bio 4b9881e31e Add 2fa to user settings page 2020-07-01 13:25:06 +02:00
dependabot[bot] 8e07148c49
Bump rack from 2.2.2 to 2.2.3 
Bumps [rack](https://github.com/rack/rack) from 2.2.2 to 2.2.3.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/v2.2.2...2.2.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-06-24 17:53:32 +00:00
Urban Rotnik 88f54b16d7 Add 2fa fields to user 2020-06-24 17:58:58 +02:00
Oleksii Kriuchykhin bee4f2d948 Update uglifier to 4.2.0 2020-06-24 15:20:24 +02:00
dependabot[bot] b3912d5c69
Bump sanitize from 5.1.0 to 5.2.1 
Bumps [sanitize](https://github.com/rgrove/sanitize) from 5.1.0 to 5.2.1.
- [Release notes](https://github.com/rgrove/sanitize/releases)
- [Changelog](https://github.com/rgrove/sanitize/blob/master/HISTORY.md)
- [Commits](https://github.com/rgrove/sanitize/compare/v5.1.0...v5.2.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-06-16 22:11:34 +00:00
dependabot[bot] 3ed3e2501e
Bump websocket-extensions from 0.1.4 to 0.1.5 
Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-ruby) from 0.1.4 to 0.1.5.
- [Release notes](https://github.com/faye/websocket-extensions-ruby/releases)
- [Changelog](https://github.com/faye/websocket-extensions-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-ruby/compare/0.1.4...0.1.5)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-06-05 15:00:29 +00:00
dependabot[bot] a7864ea235
Bump kaminari from 1.1.1 to 1.2.1 
Bumps [kaminari](https://github.com/kaminari/kaminari) from 1.1.1 to 1.2.1.
- [Release notes](https://github.com/kaminari/kaminari/releases)
- [Changelog](https://github.com/kaminari/kaminari/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kaminari/kaminari/compare/v1.1.1...v1.2.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-05-28 22:01:17 +00:00
dependabot[bot] b1a0f53546
Bump puma from 4.3.3 to 4.3.5 
Bumps [puma](https://github.com/puma/puma) from 4.3.3 to 4.3.5.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-05-22 15:11:42 +00:00
aignatov-bio 820514789d Update tinymce gem version 2020-05-17 17:36:26 +02:00
Urban Rotnik a2ade6e0ec Merge branch 'develop' into features/new-task-layout 2020-05-15 14:27:56 +02:00
Oleksii Kriuchykhin 17cd991868 Update Canaid and Rails [SCI-4597] 2020-05-08 10:58:36 +02:00
dependabot[bot] 9d0b73b0d2
Bump doorkeeper from 5.1.0 to 5.1.1 
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.1.0 to 5.1.1.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases)
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.1.0...v5.1.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-05-07 21:13:39 +00:00
Oleksii Kriuchykhin a518bfe023 Enable time fraction for task due date [SCI-4408] 2020-03-16 17:55:35 +01:00
Miha Mencin 62b934f012 Merge branch 'develop' into features/dashboard 2020-03-09 09:56:32 +01:00
dependabot[bot] 526228b2d0
Bump puma from 4.3.1 to 4.3.3 
Bumps [puma](https://github.com/puma/puma) from 4.3.1 to 4.3.3.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v4.3.1...v4.3.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-03-03 20:34:39 +00:00
Oleksii Kriuchykhin 73623da02c Merge branch 'develop' into features/dashboard 2020-02-28 16:46:56 +01:00
dependabot[bot] cac9580d99
Bump nokogiri from 1.10.4 to 1.10.8 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.4 to 1.10.8.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.4...v1.10.8)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-02-25 04:38:49 +00:00
aignatov-bio 01868fff23 Add calendar front-end 2020-02-19 15:57:06 +01:00
Oleksii Kriuchykhin b0c785f4fb Extend inventory import to support new data types [SCI-4220] 2020-02-03 15:20:01 +01:00
Oleksii Kriuchykhin 522ae12f08 Merge branch 'develop' into ok_SCI_3988 2020-01-07 17:07:22 +01:00
Oleksii Kriuchykhin d9b9243da7 Merge branch 'develop' into features/new-column-types 2020-01-07 16:03:33 +01:00
Oleksii Kriuchykhin 1b902ff4b3 Merge branch 'develop' into ok_SCI_3988 2020-01-07 15:26:30 +01:00
Urban Rotnik 400c109592 Refactor StatusesJS for new dropdown 2019-12-23 14:34:11 +01:00
dependabot[bot] fd0816ec7e
Bump rack from 2.0.7 to 2.0.8 
Bumps [rack](https://github.com/rack/rack) from 2.0.7 to 2.0.8.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/2.0.7...2.0.8)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-12-19 00:22:41 +00:00
Alex Kriuchykhin 792e6f2eb9
Merge pull request #2263 from okriuchykhin/ok_SCI_4142 
Implement SSO with Azure AD [SCI-4142]
 2019-12-12 16:12:40 +01:00
dependabot[bot] 3940f4ccf8
Bump puma from 4.1.1 to 4.3.1 
Bumps [puma](https://github.com/puma/puma) from 4.1.1 to 4.3.1.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v4.1.1...v4.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-12-12 12:09:51 +00:00
Oleksii Kriuchykhin 1aa334fdaa Merge branch 'develop' into release-1-17-8 2019-12-11 10:55:00 +01:00
Oleksii Kriuchykhin ff4ef818fb Implement SSO with Azure AD [SCI-4142] 2019-12-10 17:24:53 +01:00
aignatov-bio ac545a7775 Fix GemFile lock 2019-12-05 11:26:42 +01:00
aignatov-bio 6c057a86c9 Update git version 2019-12-03 13:31:13 +01:00
Alex Kriuchykhin 722958a716
Merge pull request #2213 from biosistemika/dependabot/bundler/json-jwt-1.11.0 
Bump json-jwt from 1.10.2 to 1.11.0
 2019-11-18 14:31:54 +01:00
Urban Rotnik 0dc1daa7c6 Add gem Down, File size validation before and during download 2019-11-18 14:28:19 +01:00
Oleksii Kriuchykhin b2862b6c9e Remove Paperclip DB columns and fix experiment templates [SCI-3988] 2019-11-18 14:16:28 +01:00
dependabot[bot] 057e7738d4
Bump json-jwt from 1.10.2 to 1.11.0 
Bumps [json-jwt](https://github.com/nov/json-jwt) from 1.10.2 to 1.11.0.
- [Release notes](https://github.com/nov/json-jwt/releases)
- [Commits](https://github.com/nov/json-jwt/compare/v1.10.2...v1.11.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-11-14 15:27:45 +00:00
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
Luka Murn a568d39f4c Remove commit_param_routing Gem 
This Gem was only used for certain sample controller actions.
 2019-07-26 10:18:31 +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