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.7.4 - Full french internationalisation, New Ontologies selector & New Annotator UI page #488

Merged
merged 48 commits into from
Apr 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
8709789
Fix: Search page issues (#483)
Bilelkihal Feb 2, 2024
4d02d48
Feauture: internationalization part 2 - FAIRScore details, Ontology v…
SirineMhedhbi Feb 5, 2024
629e703
Feature : internationalization part 3- Feedback, Visits, Concepts lis…
SirineMhedhbi Feb 5, 2024
66baac3
Feature: internationalization part 4 - Submit success page and Ontol…
SirineMhedhbi Feb 5, 2024
ec692f5
Feature: internationalization part 5 - FAIRScore, Concept tree and d…
SirineMhedhbi Feb 5, 2024
b5fa2ef
Feature: internationalization part 6 - Metrics, Summary, Scheme and …
SirineMhedhbi Feb 5, 2024
15bd185
Feature: internationalization part 7 - Projects page (#478)
SirineMhedhbi Feb 5, 2024
ab408cf
Feature: internationalization part 8 - groups page (#479)
SirineMhedhbi Feb 5, 2024
8cd4177
Feature: internationalization part 9 - Categories page (#481)
SirineMhedhbi Feb 5, 2024
ce922f5
Feature: internationalization part 10 - login and statistics pages (#…
SirineMhedhbi Feb 5, 2024
b182d44
Feature: internationalization part 11 - users page (#484)
SirineMhedhbi Feb 5, 2024
39b7c78
Feature: internationalization part 12 - notes page (#487)
SirineMhedhbi Feb 5, 2024
72b2ffa
Feature : internationalization part 1 - Feedback, Metadata curator, O…
SirineMhedhbi Feb 5, 2024
052b422
Feature : internationalization part 13 - mappings page (#489)
SirineMhedhbi Feb 5, 2024
b6b74a4
Feature : internationalization part 14 - agents page (#490)
SirineMhedhbi Feb 5, 2024
9987af5
Feature: Update annotator page design (#467)
Bilelkihal Feb 19, 2024
0f85ee3
Fix: Tests issues (#515)
Bilelkihal Feb 26, 2024
4872293
Fix: Auto fill ontology viw of input when we click the '+' button in …
Bilelkihal Feb 27, 2024
fcabaea
Feature : internationalization part 15 - licenses, change_request, ch…
SirineMhedhbi Feb 27, 2024
0e60c8d
Feature : internationalization part 16 - admin pages, footer applianc…
SirineMhedhbi Feb 27, 2024
3a1775c
Feature : internationalization part 17 - concepts and submissions pag…
SirineMhedhbi Feb 27, 2024
ebdf827
Feature : internationalization part 18 -Landscape, visits, properties…
SirineMhedhbi Feb 27, 2024
29dc7ee
Feature: Add an explicit search button to the search page (#504)
Bilelkihal Feb 27, 2024
fdc297d
Fix: display of content sections in summary page by adding option to …
SirineMhedhbi Feb 27, 2024
854f8ef
Feature: make home page bubbles clickable (#513)
Bilelkihal Feb 27, 2024
adac005
Feature : internationalization part 23 - Helpers: admin, agents, comp…
SirineMhedhbi Feb 27, 2024
57ab037
Feature : internationalization part 19 - All components (#498)
SirineMhedhbi Feb 27, 2024
0898e68
Feature : internationalization part 20 - Controllers: categories, gro…
SirineMhedhbi Feb 27, 2024
9c63f91
Feature : internationalization part 22 - Controllers: ontolobridge, o…
SirineMhedhbi Feb 27, 2024
2b77a75
Feature : internationalization part 21 - Controllers: language, login…
SirineMhedhbi Feb 28, 2024
6bcaba6
Fix: internationalization of french part (#519)
SirineMhedhbi Mar 11, 2024
a78daa9
Feature: Update stageportal ui theme colors and extract svgs colors (…
Bilelkihal Mar 11, 2024
112195f
Fix: add target blank to summary page link to open in a new window (#…
SirineMhedhbi Mar 12, 2024
5add30b
Feature: Add a "Ontoportal instances" section to point to the other p…
SirineMhedhbi Mar 12, 2024
499b43e
fix admin routes that don't work with namespace (#541)
SirineMhedhbi Mar 15, 2024
a0716d3
Feature: improve search input component to add key events (#499)
Bilelkihal Mar 15, 2024
fef53e3
Fix: Harmonize API and UI urls in Search, Annotator and Recommender p…
Bilelkihal Mar 18, 2024
7e2ac60
Feature: Update ontologies selector component (#508)
Bilelkihal Mar 21, 2024
9962096
Feature: Add contextual go to API icons in admin sections (#530)
SirineMhedhbi Mar 22, 2024
94c067e
Feature: Make the word "Ontology" configurable in all the portal (#520)
SirineMhedhbi Mar 22, 2024
9be2752
Feature: update metadata curator design and fix show all submissions …
syphax-bouazzouni Mar 22, 2024
10a7220
Feature: Add view badge to the summary header section (#526)
Bilelkihal Mar 25, 2024
079cfcd
Fix: Ontoportal instances home section style issue (#552)
Bilelkihal Mar 26, 2024
597a832
allow special chars in annotator's input text (#553)
Bilelkihal Mar 26, 2024
4f26969
Fix: Some bugs in the pre-release 2.7.4 including internationalisatio…
syphax-bouazzouni Mar 29, 2024
4e2d8aa
Fix: pre release 2.4.7 global bugs (#556)
Bilelkihal Apr 3, 2024
97879ac
fix: running local docker api test CI
syphax-bouazzouni Apr 3, 2024
2b676ce
fix: login page icons size
syphax-bouazzouni Apr 3, 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
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ OP_API_URL="https://data.bioontology.org"
## Image repositroy from which the ontoportal api will be built
API_IMAGE_REPOSITORY=agroportal
## Image tag/version from which the ontoportal api will be built
API_IMAGE_TAG=development
API_IMAGE_TAG=master


2 changes: 1 addition & 1 deletion .github/workflows/tests-system.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
bundler-cache: true

- name: Run OntoPortal API
run: bin/run_api -k ${{ env.REMOTE_API_KEY }} -r agroportal -t development -s STY -u ${{ env.REMOTE_API_URL }}
run: bin/run_api -k ${{ env.REMOTE_API_KEY }} -r agroportal -t master -s STY -u ${{ env.REMOTE_API_URL }}

# Add or replace database setup steps here
- name: set up config file
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
bundler-cache: true

- name: Run OntoPortal API
run: bin/run_api -k ${{ env.REMOTE_API_KEY }} -r agroportal -t development -s STY -u ${{ env.REMOTE_API_URL }}
run: bin/run_api -k ${{ env.REMOTE_API_KEY }} -r agroportal -t master -s STY -u ${{ env.REMOTE_API_URL }}

# Add or replace database setup steps here
- name: set up config file
Expand Down
3 changes: 3 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,8 @@ GEM
netrc (0.11.0)
newrelic_rpm (9.7.1)
nio4r (2.7.0)
nokogiri (1.15.5-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.15.5-x86_64-linux)
racc (~> 1.4)
oauth2 (2.0.9)
Expand Down Expand Up @@ -562,6 +564,7 @@ GEM
zeitwerk (2.6.13)

PLATFORMS
x86_64-darwin-23
x86_64-linux

DEPENDENCIES
Expand Down
2 changes: 1 addition & 1 deletion app/assets/images/arrow-down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/assets/images/arrow-right-outlined.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions app/assets/images/check-outlined.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions app/assets/images/edit.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions app/assets/images/eye.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/assets/images/github-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/assets/images/green-check.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion app/assets/images/icons/alert-triangle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/assets/images/icons/archive.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading