merge develop into main #304
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… to version 2.6-SNAPSHOT
…tem" mode="output.category" />
Sonatype Lift is retiringSonatype Lift will be retiring on Sep 12, 2023, with its analysis stopping on Aug 12, 2023. We understand that this news may come as a disappointment, and Sonatype is committed to helping you transition off it seamlessly. If you’d like to retain your data, please export your issues from the web console. |
…cherUtils#getUserNameFromModsNameElement * UBO-256 FSU040THUL-1049 Removed now unused method MCRUserMatcherUtils#getUserNameFromModsNameElement() * UBO-256 FSU040THUL-1049 Only invoke MCRUserManager.updateUser() once per code path
* UBO-96 Added button to unlink user account from ORCID UBO-96 Added i18n key 'orcid.integration.unlink' UBO-96 Added DozBibUserServlet UBO-96 Code format web-fragment.xml UBO-96 Placed orcid button inside <p>-element UBO-96 Added Testing Servlet UBO-96 Store updated UserAttributes UBO-96 Check for guest user * UBO-96 Added dependency to org.mycore:mycore-orcid2 * UBO-96 Removed dependency to org.mycore:mycore-orcid Commented code to make ubo-common compile * UBO-96 Set redirect url to $WebApplicationBaseURL/orcid * UBO-96 Added ORCIDTools.js UBO-96 Renamed mycore-orcid properties to their equivalent mycore-orcid2 properties * UBO-96 Updated check for presence of orcid token * UBO-96 Updated DozBibUserServlet to use mycore-orcid2 api * UBO-96 Added method 'revoke' to ORCIDTools.js * UBO-96 Added ubo-dialog.xsl * UBO-96 Show confirm dialog when user trys to revoke orcid connection * UBO-96 Read number of publications for user from orcid UBO-96 Added DozBibORCIDUtils (WIP) * UBO-96 Test for orcid_credential attribute rather than orcid_id * UBO-96 Added public static boolean weAreTrustedParty() to DozBibORCIDUtils * UBO-96 Renamed DozBibUserServlet to DozBibORCIDUserServlet and moved class to package /org/mycore/ubo/orcid/ * UBO-96 Migrated orcid list import * UBO-96 Renamed property MCR.ORCID.LinkURL to MCR.ORCID2.LinkURL in mods-display.xsl * UBO-96 Migrated mycore2orcid.js to mycore-orcid2 * UBO-96 Added simple notification dialog to ubo-dialog.xsl * UBO-96 Fixed grammar * UBO-96 Do not use slang as button label * UBO-96 Changed upload to orcid button type * UBO-96 Fixed orcid indicator title/tooltip * UBO-96 Fixed link to orcid in user profile * UBO-96 Reflect changes from /rsc to /api in mycore-orcic2 (WIP) * UBO-96 Added orcid2 properties * UBO-96 Deprecated ORCIDTools.js * UBO-96 Use JWT and include /modules/orcid2/js/orcid-auth.js from mycore-orcid2 * UBO-96 Removed ORCIDTools.js * UBO-96 Removed method loadScript() * UBO-96 Reflect recent changes in mycore-orcid2 * UBO-96 Use POST http method for pushing a publication to ORCID * UBO-96 Changed position of MCRORCIDWorkEventHandler * UBO-96 Endpoint is splitted into update and create * UBO-96 Allow user to activate automatic update of ORCID® profile * UBO-96 Reflect sync status in orcid status headline * UBO-96 Renamed user attribute to orcid_update_profile (name might change later) * UBO-96 Changed some i18n values in messages_en.properties * UBO-96 Fixed NPE and updated javadoc * UBO-96 Remove TODO in MCRUserMatcherUtils * UBO-96 Delete user attribute 'orcid_update_profile' when orcid auth is removed * UBO-96 Added action parameter to DozBibORCIDUserServlet * UBO-96 Do not die on invalid token * UBO-96 Set propert MCR.ORCID2.WorkEventHandler.UpdateOnlyExisting = true * UBO-96 Format * UBO-96 Disable upload to orcid button once it was clicked * UBO-96 Test for property MCR.ORCID2.Client.V3.APIMode * UBO-96 Added include in html-layout.xsl to user-orcid.xsl * UBO-96 public static String getFirstOrcidByCurrentUser() to DozBibORCIDUtils to enable linking to orcid * UBO-96 Updated import of MCRORCIDWorkUtils to org.mycore.orcid2.v3.work.MCRORCIDWorkUtils * UBO-96 Updated MCR.EventHandler.MCRObject.018A.Class * UBO-96 Updated properties reflecting latest changes in mycore-orcid2 * UBO-96 Disabled update by user * UBO-96 Show id of publication when logging to js console * UBO-96 adopt to new orcid2 version * UBO-96 update ORCIDWorkEventHandler to new version * UBO-96 updated create-work path * Improve orcid unlinking and allow to change user settings * UBO-96 Added i18n orcid.integration.list to messages_en.properties * UBO-96 Added i18n orcid.integration.settings.title to messages_en.properties * UBO-96 Added i18n orcid.integration.settings.createFirstWork, orcid.integration.settings.alwaysUpdateWork, orcid.integration.settings.createDuplicateWork, orcid.integration.settings.recreateDeletedWork to messages_en.properties * UBO-96 reformat message properties for better diff * UBO-96 fix translation bug * UBO-96 set editable user attributes, to prevent editing of orcid token * UBO-96 Added public static int getNumWorks(String orcid) to DozBibORCIDUtils.java * UBO-96 Added javadoc and altered public static int getNumWorks() (returns now the total of publications based on all connected orcids) * UBO-96 Display orcid id in summary line * UBO-96 Added public static boolean isConnected(String orcid) to DozBibORCIDUtils * UBO-96 Removed public static boolean hasSyncEnabled() from DozBibORCIDUtils since it is obsolete * UBO-96 Fixed javadoc in DozBibORCIDUserServlet * UBO-96 update information text --------- Co-authored-by: Kathleen Neumann <[email protected]> Co-authored-by: Sebastian Hofmann <[email protected]>
…o solr-schema.json
- KDSF fields for peer reviewed, access rights and typeOfResource - optimize validation and mandatory style - make subtitle repeatable
* UBO-18 unify name identifier handling * UBO-18 use name identifier classification and code refacturing * UBO-18 do not display identifier marked with x-display=false * UBO-18 set color of connected author icon to primary color
* UBO-96 Added button to unlink user account from ORCID UBO-96 Added i18n key 'orcid.integration.unlink' UBO-96 Added DozBibUserServlet UBO-96 Code format web-fragment.xml UBO-96 Placed orcid button inside <p>-element UBO-96 Added Testing Servlet UBO-96 Store updated UserAttributes UBO-96 Check for guest user * UBO-96 Added dependency to org.mycore:mycore-orcid2 * UBO-96 Removed dependency to org.mycore:mycore-orcid Commented code to make ubo-common compile * UBO-96 Set redirect url to $WebApplicationBaseURL/orcid * UBO-96 Added ORCIDTools.js UBO-96 Renamed mycore-orcid properties to their equivalent mycore-orcid2 properties * UBO-96 Updated check for presence of orcid token * UBO-96 Updated DozBibUserServlet to use mycore-orcid2 api * UBO-96 Added method 'revoke' to ORCIDTools.js * UBO-96 Added ubo-dialog.xsl * UBO-96 Show confirm dialog when user trys to revoke orcid connection * UBO-96 Read number of publications for user from orcid UBO-96 Added DozBibORCIDUtils (WIP) * UBO-96 Test for orcid_credential attribute rather than orcid_id * UBO-96 Added public static boolean weAreTrustedParty() to DozBibORCIDUtils * UBO-96 Renamed DozBibUserServlet to DozBibORCIDUserServlet and moved class to package /org/mycore/ubo/orcid/ * UBO-96 Migrated orcid list import * UBO-96 Renamed property MCR.ORCID.LinkURL to MCR.ORCID2.LinkURL in mods-display.xsl * UBO-96 Migrated mycore2orcid.js to mycore-orcid2 * UBO-96 Added simple notification dialog to ubo-dialog.xsl * UBO-96 Fixed grammar * UBO-96 Do not use slang as button label * UBO-96 Changed upload to orcid button type * UBO-96 Fixed orcid indicator title/tooltip * UBO-96 Fixed link to orcid in user profile * UBO-96 Reflect changes from /rsc to /api in mycore-orcic2 (WIP) * UBO-96 Added orcid2 properties * UBO-96 Deprecated ORCIDTools.js * UBO-96 Use JWT and include /modules/orcid2/js/orcid-auth.js from mycore-orcid2 * UBO-96 Removed ORCIDTools.js * UBO-96 Removed method loadScript() * UBO-96 Reflect recent changes in mycore-orcid2 * UBO-96 Use POST http method for pushing a publication to ORCID * UBO-96 Changed position of MCRORCIDWorkEventHandler * UBO-96 Endpoint is splitted into update and create * UBO-96 Allow user to activate automatic update of ORCID® profile * UBO-96 Reflect sync status in orcid status headline * UBO-96 Renamed user attribute to orcid_update_profile (name might change later) * UBO-96 Changed some i18n values in messages_en.properties * UBO-96 Fixed NPE and updated javadoc * UBO-96 Remove TODO in MCRUserMatcherUtils * UBO-96 Delete user attribute 'orcid_update_profile' when orcid auth is removed * UBO-96 Added action parameter to DozBibORCIDUserServlet * UBO-96 Do not die on invalid token * UBO-96 Set propert MCR.ORCID2.WorkEventHandler.UpdateOnlyExisting = true * UBO-96 Format * UBO-96 Disable upload to orcid button once it was clicked * UBO-96 Test for property MCR.ORCID2.Client.V3.APIMode * UBO-96 Added include in html-layout.xsl to user-orcid.xsl * UBO-96 public static String getFirstOrcidByCurrentUser() to DozBibORCIDUtils to enable linking to orcid * UBO-96 Updated import of MCRORCIDWorkUtils to org.mycore.orcid2.v3.work.MCRORCIDWorkUtils * UBO-96 Updated MCR.EventHandler.MCRObject.018A.Class * UBO-96 Updated properties reflecting latest changes in mycore-orcid2 * UBO-96 Disabled update by user * UBO-96 Show id of publication when logging to js console * UBO-96 adopt to new orcid2 version * UBO-96 update ORCIDWorkEventHandler to new version * UBO-96 updated create-work path * Improve orcid unlinking and allow to change user settings * UBO-96 Added i18n orcid.integration.list to messages_en.properties * UBO-96 Added i18n orcid.integration.settings.title to messages_en.properties * UBO-96 Added i18n orcid.integration.settings.createFirstWork, orcid.integration.settings.alwaysUpdateWork, orcid.integration.settings.createDuplicateWork, orcid.integration.settings.recreateDeletedWork to messages_en.properties * UBO-96 reformat message properties for better diff * UBO-96 fix translation bug * UBO-96 set editable user attributes, to prevent editing of orcid token * UBO-96 Added public static int getNumWorks(String orcid) to DozBibORCIDUtils.java * UBO-96 Added javadoc and altered public static int getNumWorks() (returns now the total of publications based on all connected orcids) * UBO-96 Display orcid id in summary line * UBO-96 Added public static boolean isConnected(String orcid) to DozBibORCIDUtils * UBO-96 Removed public static boolean hasSyncEnabled() from DozBibORCIDUtils since it is obsolete * UBO-96 Fixed javadoc in DozBibORCIDUserServlet * UBO-96 update information text --------- Co-authored-by: Kathleen Neumann <[email protected]> Co-authored-by: Sebastian Hofmann <[email protected]>
…o solr-schema.json
- KDSF fields for peer reviewed, access rights and typeOfResource - optimize validation and mandatory style - make subtitle repeatable
* UBO-18 unify name identifier handling * UBO-18 use name identifier classification and code refacturing * UBO-18 do not display identifier marked with x-display=false * UBO-18 set color of connected author icon to primary color
* UBO-18 fix css class for connected person * UBO-18 add <sup> for connected persons and more details to person box * UBO-18 finetuning for popover close button
…23), Heft 1, S. 1 - 10, Artikel 9489' to 'Jg. 13 (2023), Heft 1, Artikel 9489, S. 1 - 10'
* UBO-265 FSU040THUL-972 Made solr field fundingType multivalued * UBO-265 FSU040THUL-972 Display funding type
* UBO-266 Tolerate repeated lead ID * Fixed debug level
* Remove user_attributes, extend nameIdentifier classification * Add xsl to convert and filter user attributes from name identifiers * Use nameIdentifier classification, use URL from category * Use nameIdentifier classification, show all identifier types * Fixed repeater for user's attributes / nameIdentifiers * Filter out lead ID and connection ID in publication editor
* Save publication after repair event * Removed unused import
#339) * UBO-282 Include mycore2orcid.js inresponse.xsl (was accidentally removed recently) * UBO-282 Moved invocation of template notification-dialog to if-block
…roved code readability (#333)
…ch (#341) * UBO-289 Surround 'MCRORCIDSessionUtils.getCurrentUser()' with try/catch * UBO-289 Only allow ORCID authentication when user is not a transient user * UBO-289 Added info text for transient users * UBO-289 Added xml:lang attribute to <article/>
…mLDAPUser protected (#343) * UBO-292 Made org.mycore.ubo.matcher.MCRUserMatcherLDAP#getUserNameFromLDAPUser protected * UBO-292 Made org.mycore.ubo.matcher.MCRUserMatcherLDAP#CONFIG_LDAP_LOGIN_ATTRIBUTENAME protected
…lication.PublicationEventHandler.getRealNameFromNameElement for local users to "family name, given name" (#344)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.