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

Sync: bring OntoPortal up-to-date with BioPortal releases 6.17.0 and onward #22

Merged
merged 72 commits into from
Oct 10, 2024
Merged
Changes from 1 commit
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
ff680ba
Refactor the account creation page
jvendetti May 13, 2024
9ea90ed
Remove superfluous comments
jvendetti May 13, 2024
a11aa39
Fix some RuboCop warnings
jvendetti May 13, 2024
74d4bd1
Display GitHub and ORCID identifiers
jvendetti Jun 14, 2024
881fb0d
Create users_helper.rb
jvendetti Jun 19, 2024
3cc788f
Refactor account show and edit pages
jvendetti Jul 1, 2024
74b8471
Remove the unused iconv gem
jvendetti Jul 2, 2024
2736b4d
Merge branch 'master' into feature/add-signup-fields/315
jvendetti Jul 3, 2024
2d21892
Render the new password edit page for resets
jvendetti Jul 3, 2024
2f0f39d
Fix some RuboCop warnings
jvendetti Jul 3, 2024
2faa257
Use newer style syntax for render
jvendetti Jul 4, 2024
9605a9c
Rename login index with HAML extension
jvendetti Jul 4, 2024
43ba3c5
Convert file content from ERB to HAML
jvendetti Jul 4, 2024
ef8c0b3
Replace form_for with form_with
jvendetti Jul 4, 2024
b46d485
Refactor the login page
jvendetti Jul 10, 2024
377bcb8
Rename lost_password with HAML extension
jvendetti Jul 10, 2024
00d83aa
Convert file content from ERB to HAML
jvendetti Jul 10, 2024
6e6d166
Replace form_for with form_with
jvendetti Jul 10, 2024
a06d0d1
Refactor lost password page
jvendetti Jul 11, 2024
4330abf
Remove commented out code
jvendetti Jul 11, 2024
a377417
Add Stimulus clipboard controller
jvendetti Jul 12, 2024
94b091b
Add copy to clipboard for user API keys
jvendetti Jul 12, 2024
b67e485
Remove logic and form for password updates
jvendetti Jul 13, 2024
10acc0e
Delete _form.html.haml
jvendetti Jul 13, 2024
c76d506
progress commit
mdorf Jul 17, 2024
b7a0bf5
progress commit
mdorf Jul 17, 2024
3dbafc3
progress commit
mdorf Jul 17, 2024
a1ce9d1
update ontologies_api_ruby_client to v2.3.0
alexskr Jul 19, 2024
466e8fc
Merge branch 'master' into feature/add-signup-fields/315
jvendetti Jul 22, 2024
cf74824
initial working commit
mdorf Jul 22, 2024
3a27a10
Gemfile.lock update
mdorf Jul 22, 2024
5e4b489
Gemfile.lock update
mdorf Jul 22, 2024
d42ae59
pin strscan to v3.0.1
alexskr Jul 23, 2024
e1ff335
a bug fix to the language dropdown
mdorf Jul 23, 2024
66c3b1a
Merge branch 'multilingual_support' of github.com:ncbo/bioportal_web_…
mdorf Jul 23, 2024
c7102c8
Gemfile.lock update
mdorf Jul 23, 2024
e75d593
disable language dropdown for a single language
mdorf Jul 23, 2024
2cbaee0
Merge pull request #321 from ncbo/feature/add-signup-fields/315
jvendetti Jul 24, 2024
c6897f8
Add include all param where necessary
jvendetti Aug 22, 2024
59ffa48
Replace find_by_acronym with more performant get
jvendetti Aug 22, 2024
ca3d6dd
Simplify code for fetching an ontology
jvendetti Aug 22, 2024
c65fc5a
Replace find with more performant get
jvendetti Aug 22, 2024
4f071d6
Don't make REST calls to get a username from an ID
jvendetti Aug 22, 2024
b5b1936
fixed correct display of language inside sub-trees
mdorf Sep 4, 2024
cf16e61
merged master with this branch
mdorf Sep 4, 2024
73c641d
Gemfile.lock update
mdorf Sep 4, 2024
7cbdb87
Bump ontologies_api_client to v2.4.0 tag
jvendetti Sep 4, 2024
a58a1c8
release candidate 1
mdorf Sep 4, 2024
43a5ce3
bug fix for displaying labels
mdorf Sep 4, 2024
ff0cee9
Gemfile.lock update
mdorf Sep 4, 2024
d66089b
Merge pull request #324 from ncbo/bugfix/edit-account-errors/320
jvendetti Sep 5, 2024
3802df4
implemented a fix for displaying non-English languages when no Englis…
mdorf Sep 9, 2024
05d6820
fixed the jump_to box to use the correct language
mdorf Sep 9, 2024
f3e083d
fixed an issue with site translations
mdorf Sep 10, 2024
43555c1
implemented a fix to the empty nodes display for a specific language
mdorf Sep 11, 2024
22dbc87
Merge branch 'master' into multilingual_support
alexskr Sep 11, 2024
15c4497
Merge pull request #325 from ncbo/multilingual_support
alexskr Sep 11, 2024
297a6ba
fixed languages display on the ontology metadata page
mdorf Sep 11, 2024
a60be0d
Account for https in class IDs
jvendetti Sep 11, 2024
2397bdc
Removed unused method
jvendetti Sep 11, 2024
ccc2834
Remove unused partials
jvendetti Sep 13, 2024
918eff1
Fix 163 RuboCop warnings
jvendetti Sep 17, 2024
998ae8b
Merge pull request #329 from ncbo/bugfix/property-label-resolution/326
jvendetti Sep 18, 2024
ea78151
fixed #328 - jump to search has not results for ontology views
mdorf Sep 18, 2024
0b21134
fixed #328 - jump to search has not results for ontology views
mdorf Sep 18, 2024
8590614
Replace deprecated find method with get
jvendetti Sep 18, 2024
0cc5ba5
Fix red herring error on custom ontology set save
jvendetti Sep 18, 2024
5f97912
Use proper error flash styling
jvendetti Sep 18, 2024
c875b15
Improve flash notice and error text for custom set
jvendetti Sep 18, 2024
d2f81cd
Narrow the include params on each get
jvendetti Sep 18, 2024
8a8b346
Tweak list style for custom ontology sets
jvendetti Sep 18, 2024
a8753d9
Merge pull request #331 from ncbo/bugfix/saving-custom-ontologies
jvendetti Sep 19, 2024
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
Prev Previous commit
Next Next commit
Display GitHub and ORCID identifiers
  • Loading branch information
jvendetti committed Jun 14, 2024
commit 74d4bd16c5d7d665746eec9aa3373d2e9f075f0c
6 changes: 6 additions & 0 deletions app/views/users/show.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@
%tr
%th Account Name:
%td= @user.username
%tr
%th GitHub username:
%td= @user.githubId
%tr
%th ORCID iD:
%td= @user.orcidId
%tr
%td{colspan: "2", style: "text-align: right;"}
= link_to "Edit Information", edit_user_path(url_encode(@user.username))
Expand Down