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: Release 2.4.7 - Groups and categories administration and Bug fixes #335

Merged
merged 16 commits into from
Sep 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b3d8c23
Merge pull request #281 from ontoportal-lirmm/fix-bug-in-slices-links
syphax-bouazzouni Jun 28, 2023
c6e9ec5
Merge pull request #212 from ontoportal-lirmm/fix/signup-fields-valid…
syphax-bouazzouni Mar 10, 2023
2b1d902
Merge pull request #214 from ontoportal-lirmm/feature/update-account-…
syphax-bouazzouni Mar 16, 2023
94da8e1
Merge pull request #237 from ontoportal-lirmm/feature/ecoportal/group…
syphax-bouazzouni May 8, 2023
bf9055d
Merge pull request #273 from ontoportal-lirmm/fix/bug-ANAEETHES-ontology
syphax-bouazzouni Sep 5, 2023
3e711ff
Merge pull request #277 from ontoportal-lirmm/Fix-alphabetical-sorting
syphax-bouazzouni Jun 27, 2023
1122782
Fix: bug of display list submitted ontologies of account setting (#286)
syphax-bouazzouni Sep 5, 2023
0560f0a
fix bug of display text in alert when there is no collections (#285)
syphax-bouazzouni Sep 5, 2023
ab762cc
Merge pull request #287 from ontoportal-lirmm/fix-bug-reset-password
SirineMhedhbi Jul 7, 2023
b3024d9
Fix bug of select list view of ontology (#289)
SirineMhedhbi Jul 12, 2023
7c01732
Merge pull request #295 from ontoportal-lirmm/Fix-display-the-list-of…
syphax-bouazzouni Sep 5, 2023
8d66b4f
Merge pull request #291 from ontoportal-lirmm/Fix-remove-views-of-sub…
syphax-bouazzouni Aug 6, 2023
69af592
Merge pull request #280 from ontoportal-lirmm/Fix-Ontology-style-text…
syphax-bouazzouni Sep 5, 2023
0121b16
Merge pull request #254 from ontoportal-lirmm/feature/add-ontology-co…
syphax-bouazzouni Jun 27, 2023
f0f0ecc
Merge pull request #302 from ontoportal-lirmm/feature/migrate-fair-sc…
syphax-bouazzouni Sep 5, 2023
af7333f
fix generated bug after edit group and category (#334)
syphax-bouazzouni Sep 6, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,8 @@ GEM
netrc (0.11.0)
newrelic_rpm (9.2.2)
nio4r (2.5.9)
nokogiri (1.14.3-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.14.3-x86_64-linux)
racc (~> 1.4)
oj (3.14.3)
Expand Down Expand Up @@ -418,6 +420,7 @@ GEM
zeitwerk (2.6.8)

PLATFORMS
x86_64-darwin-21
x86_64-linux

DEPENDENCIES
Expand Down
1 change: 0 additions & 1 deletion app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
//= require bp_property_tree
//= require concepts
//= require home
//= require fair_score
//= require_tree ./helpers
//= require_tree ./components
//= require ontologies
Expand Down
Loading