Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge to master: AgroPortal release 2.8.0 #41

Merged
merged 69 commits into from
May 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
d312181
Merge pull request #317 from ontoportal-lirmm/fix/bug-redirects-to-th…
syphax-bouazzouni Aug 3, 2023
5725ebf
Fix: Bug missing roots display (#311)
SirineMhedhbi Aug 6, 2023
2b3de27
Merge to master: Release 2.4.7 - Groups and categories administratio…
syphax-bouazzouni Sep 6, 2023
224660b
[ontoportal-bot] Gemfile.lock update
ontoportal-bot-lirmm Sep 6, 2023
18acf08
[ontoportal-bot] Gemfile.lock update
ontoportal-bot-lirmm Sep 12, 2023
2a56df7
[ontoportal-bot] Gemfile.lock update
ontoportal-bot-lirmm Sep 12, 2023
b7cdcbe
Fix: missing roots display (#348)
SirineMhedhbi Oct 3, 2023
215ef30
fix detaching views from parent ontology on update (#354)
syphax-bouazzouni Oct 12, 2023
a91132f
[ontoportal-bot] Gemfile.lock update
ontoportal-bot-lirmm Oct 12, 2023
e7867d4
[ontoportal-bot] Gemfile.lock update
ontoportal-bot-lirmm Oct 12, 2023
b0111db
[ontoportal-bot] Gemfile.lock update
ontoportal-bot-lirmm Oct 16, 2023
0935380
[ontoportal-bot] Gemfile.lock update
ontoportal-bot-lirmm Oct 16, 2023
afd2472
Fix: AGROVOC concept seed not displaying and a better handling of co…
SirineMhedhbi Oct 17, 2023
a9932ba
fix update_submission concern to not use check the changed_values (#356)
syphax-bouazzouni Oct 17, 2023
23e149d
fix feedback action when ontology_submissions_request is checked (#358)
syphax-bouazzouni Oct 19, 2023
d727d55
[ontoportal-bot] Gemfile.lock update
ontoportal-bot-lirmm Oct 19, 2023
3930a4a
Revert "fix update_submission concern to not use check the changed_va…
syphax-bouazzouni Oct 19, 2023
c247fd9
disable edit link in the submissions table
syphax-bouazzouni Oct 21, 2023
745e963
fix user edit action returning always password empty error
syphax-bouazzouni Oct 21, 2023
4418138
fix add new submission removing old metadata
syphax-bouazzouni Oct 21, 2023
d482bbe
remove unused images (#376)
syphax-bouazzouni Nov 1, 2023
1f05f38
Feature: Implement CI deployment for development servers (#251)
syphax-bouazzouni Nov 18, 2023
a2888c9
add changes of fix portals erros notifications in master (#394)
SirineMhedhbi Dec 5, 2023
5d14e48
[ontoportal-bot] Gemfile.lock update
ontoportal-bot-lirmm Dec 5, 2023
33ccfaf
Feature: Update browse page design (#217) (#399)
syphax-bouazzouni Dec 5, 2023
ba6ee8d
Merge to master: Release 2.7.0.2 - Adds all the view components, wit…
syphax-bouazzouni Dec 5, 2023
1736a19
Merge to master - Release 2.7.0.3 - New UI, Multilingual integration…
syphax-bouazzouni Dec 10, 2023
b37043e
Fix: simplify the see all metadata page (#409)
syphax-bouazzouni Dec 13, 2023
84043f8
[ontoportal-bot] Gemfile.lock update
ontoportal-bot-lirmm Dec 13, 2023
5399ed2
[ontoportal-bot] Gemfile.lock update
ontoportal-bot-lirmm Dec 13, 2023
22578e2
Fix: Remove JQuery validate (#410)
SirineMhedhbi Dec 13, 2023
de7623a
Feature: Add agent display component (#404)
Bilelkihal Dec 15, 2023
846a210
Fix: Optimize some pages load speed (metadata curator, summary, agent…
syphax-bouazzouni Dec 19, 2023
9edc301
Fix: Optimize landscape pages load speed and integration with the new…
syphax-bouazzouni Dec 19, 2023
19a8d93
Merge to master: Release 2.7.1 (#414)
syphax-bouazzouni Dec 19, 2023
6935888
[ontoportal-bot] Gemfile.lock update
ontoportal-bot-lirmm Dec 19, 2023
02945f0
Fix: invalidating cache after submission process & remove unused code…
syphax-bouazzouni Dec 20, 2023
8e9c45d
Merge branch 'master' into development
syphax-bouazzouni Dec 22, 2023
fa0803b
Merge pull request #421 from ontoportal-lirmm/development
syphax-bouazzouni Dec 22, 2023
00ed8f1
[ontoportal-bot] Gemfile.lock update
ontoportal-bot-lirmm Dec 22, 2023
06f18cc
Merge to master: Release v2.7.2 (#423)
syphax-bouazzouni Dec 28, 2023
b5b6c92
[ontoportal-bot] Gemfile.lock update
ontoportal-bot-lirmm Dec 28, 2023
64cfab8
fix to handle ontology with logo that don't urls as value
syphax-bouazzouni Jan 19, 2024
2f36ca0
[ontoportal-bot] Gemfile.lock update
ontoportal-bot-lirmm Jan 19, 2024
c0182c0
fix: escape user id and include all attribute when fetched in the use…
syphax-bouazzouni Jan 24, 2024
d3aca14
[ontoportal-bot] Gemfile.lock update
ontoportal-bot-lirmm Jan 24, 2024
bcfd9e4
Fix: ontology description icons link to add APIKEY and fix admin agen…
syphax-bouazzouni Jan 26, 2024
bbd2f4b
Merge to master: Release 2.7.3 SPARQL endpoint, fix Google Analytics…
syphax-bouazzouni Jan 30, 2024
1312add
Fix: user with space reset password (#492)
syphax-bouazzouni Feb 6, 2024
570d9f0
Fix: Release 2.7.4 hotfixes (#494)
syphax-bouazzouni Feb 7, 2024
14b5dad
[ontoportal-bot] Gemfile.lock update
ontoportal-bot-lirmm Feb 8, 2024
33e91ce
Fix: Add back ontology view of input in upload ontology form (#507)
Bilelkihal Feb 20, 2024
ef3fd2d
[ontoportal-bot] Gemfile.lock update
ontoportal-bot-lirmm Feb 20, 2024
cae5b86
fix: fairsocre not showing because chart js was removed without migra…
syphax-bouazzouni Feb 23, 2024
e7d29a4
Merge branch 'master' of github.com:ontoportal-lirmm/bioportal_web_ui
syphax-bouazzouni Feb 23, 2024
cdefd68
[ontoportal-bot] Gemfile.lock update
ontoportal-bot-lirmm Feb 23, 2024
292eebe
Feature: Make select component options unlimited (#516)
Bilelkihal Feb 28, 2024
e6037cc
fix landscape page raising error for groups does not have a descripti…
syphax-bouazzouni Feb 28, 2024
03d2f2e
Merge to master: Release 2.7.4 - Full french internationalisation, N…
syphax-bouazzouni Apr 3, 2024
f550d83
Merge to master: Release 2.7.4.1 - Fix annotator fast context & add …
syphax-bouazzouni Apr 5, 2024
9e8c7e2
[ontoportal-bot] Gemfile.lock update
ontoportal-bot-lirmm Apr 6, 2024
9a9984e
Merge to master: Release 2.8.0 - Search everywhere anything, Visualiz…
syphax-bouazzouni May 22, 2024
0dfe3da
[ontoportal-bot] Gemfile.lock update
ontoportal-bot-lirmm May 24, 2024
ef3c6c1
[ontoportal-bot] Gemfile.lock update
ontoportal-bot-lirmm May 25, 2024
4a7fb7a
Merge to master: Release 2.8.0.1 fix not found issues, OFAIRE cache a…
syphax-bouazzouni May 25, 2024
e9acd21
Merge branch 'master' into ecoportal-ontoportal-reset
syphax-bouazzouni May 27, 2024
30c6503
Merge remote-tracking branch 'ecoportal/master' into ecoportal-ontopo…
syphax-bouazzouni May 27, 2024
2f8426e
Merge remote-tracking branch 'ecoportal/master' into ecoportal-ontopo…
syphax-bouazzouni May 28, 2024
962d543
Merge remote-tracking branch 'ecoportal/master' into ecoportal-ontopo…
syphax-bouazzouni May 28, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
37 changes: 28 additions & 9 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
source 'https://rubygems.org'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '7.0.3'
gem 'rails', '7.0.7'

gem 'jsbundling-rails'

gem 'chart-js-rails'
gem 'sassc-rails' #sass-rails replacent
gem 'terser' #ugilifer replacent

Expand All @@ -13,10 +13,9 @@ gem 'terser' #ugilifer replacent
# gem 'duktape'

gem 'bootstrap', '~> 4.2.0'
gem 'chart-js-rails'
gem 'jquery-rails'
gem 'jquery-ui-rails'
gem 'select2-rails'



# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
Expand Down Expand Up @@ -54,9 +53,10 @@ gem 'flamegraph'
gem 'graphql-client'
gem 'haml', '~> 5.1'
gem 'i18n'
gem 'rails-i18n', '~> 7.0.0'
gem 'iconv'
gem 'multi_json'
gem 'mysql2', '0.5.3'
gem 'mysql2'
gem 'oj'
gem 'open_uri_redirections'
gem 'pry'
Expand All @@ -73,9 +73,17 @@ gem 'turnout'
gem 'will_paginate', '~> 3.0'
gem 'inline_svg'
gem "lookbook", '~> 1.5.5'
gem 'ffi', '~> 1.15.5'
gem "flag-icons-rails", "~> 3.4"
gem "iso-639", "~> 0.3.6"
gem 'ontologies_api_client', git: 'https://github.com/lifewatch-eric/ontologies_api_ruby_client.git', branch: 'master'

# Multi-Provider Authentication
gem 'omniauth'
gem "omniauth-rails_csrf_protection"
gem 'omniauth-github'
gem 'omniauth-google-oauth2'
gem 'omniauth-orcid'
gem 'omniauth-keycloak'

group :staging, :production, :appliance do
# application monitoring
Expand All @@ -86,7 +94,7 @@ group :staging, :production, :appliance do
end

group :development do
# Capistrano Deployment
# Capistrano Deployment
gem 'bcrypt_pbkdf', '>= 1.0', '< 2.0', require: false # https://github.com/miloserdow/capistrano-deploy/issues/42
gem 'capistrano', '~> 3.11', require: false
gem 'capistrano-bundler', require: false
Expand All @@ -106,7 +114,12 @@ group :development do

# Use console on exceptions pages [https://github.com/rails/web-console]
gem 'web-console'
gem 'i18n-tasks'
gem 'i18n-tasks-csv', '~> 1.1'

gem 'deepl-rb'
gem 'letter_opener_web', '~> 2.0'
gem 'haml-rails'
end

group :test, :development do
Expand All @@ -117,11 +130,17 @@ group :test do
# Use system testing [https://guides.rubyonrails.org/testing.html#system-testing]
gem 'capybara'
gem 'selenium-webdriver'
gem 'webdrivers'
gem 'simplecov', require: false
gem 'simplecov-cobertura' # for codecov.io
#gem 'webdrivers'
gem 'webmock'
end


gem "net-ftp", "~> 0.2.0", require: false
gem "net-http"
gem "net-http", "~> 0.3.2"
gem 'openid_connect', '~> 2.2.0'



gem "bugsnag", "~> 6.26"
Loading
Loading