Merge 7531909 into 6565a49

Author: jsoref

.docker-compose.gv.env

@@ -12,6 +12,6 @@ OSF_AUTH_COOKIE_NAME=osf
 SESSION_COOKIE_SECURE=false
 SESSION_COOKIE_HTTPONLY=true
 SESSION_COOKIE_SAMESITE=Lax
-OSF_SENSITIVE_DATA_SECRET="TrainglesAre5Squares"
+OSF_SENSITIVE_DATA_SECRET="TrianglesAre5Squares"
 OSF_SENSITIVE_DATA_SALT="yusaltydough"
 DEBUG=1

CHANGELOG

@@ -88,14 +88,14 @@ We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
 
 - Crossref DOIs not minting with _v1, OSF is displaying DOI versions with _v1
 - When hamming a spammed user, preprints and registrations remain private
-- Fix emabrgoed registrations not becoming public after admin date change
-- Add v2 enpoint for alternative email confirmation
+- Fix embargoed registrations not becoming public after admin date change
+- Add v2 endpoint for alternative email confirmation
 - Make relationship on v2/nodes for collected_in
 - API V2: get action reviews request not listing latest preprint submit/withdraw requests
 - Add ability for admin app to change registry that a registration belongs to
 - Update to /nodes/<node-id> api
 - Subscription filtering not working correctly
-- API V2: Serialize registation resource attributes in Node Linked By Registrations list view and Node Linked Registrations list view
+- API V2: Serialize registration resource attributes in Node Linked By Registrations list view and Node Linked Registrations list view
 
 25.10.0 (2025-06-11)
 ====================
@@ -159,7 +159,7 @@ We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
 24.10.0 (2024-12-05)
 ====================
 
-- Migrate Preprint Affilations
+- Migrate Preprint Affiliations
 - Add OOPSpam and Akismet metrics to spam report
 - Add PrivateSpamMetricsReport
 - Update PrivateSpamMetricsReporter to work with refactored MonthlyReporter
@@ -340,7 +340,7 @@ reasons
 
 22.11.0 (2022-11-21)
 ====================
-- Enable monitoring and moderation of OSF resoruces based on links to external
+- Enable monitoring and moderation of OSF resources based on links to external
 domains
 
 22.10.0 (2022-10-25)
@@ -448,12 +448,12 @@ domains
 
 21.08.0 (2021-11-30)
 ====================
-- Remaining work in support of Registrion Versioning/Updating
+- Remaining work in support of Registration Versioning/Updating
 
 21.07.0 (2021-10-04)
 ====================
 - Add support for Registry Admins to bulk upload
-- Add models suppoorting Registration Versioning
+- Add models supporting Registration Versioning
 - Normalize default institutional affiliation for drafts
 - Fix bugs with spam training
 
@@ -687,7 +687,7 @@ domains
 ===================
 - Automatically map subjects when a preprint is moved to a different
   preprint provider in the admin app
-- Gitlab: return all repos to which the user has access
+- GitLab: return all repos to which the user has access
 - Upgrade Bower
 - Py3 backwards compatible changes
 
@@ -1033,7 +1033,7 @@ tags, using a m2m field.
 ====================
 
 - APIv2: Add Node Settings endpoint.
-- APIv2: Add employers and eductional_institutions to user serializer.
+- APIv2: Add employers and educational_institutions to user serializer.
 - APIv2: Add endpoints for account export and deactivation requests.
 - APIv2: Retrieve/delete user external identities.
 - Move addon max file size limits to settings files.
@@ -1159,10 +1159,10 @@ for GitHub, Zotero, and Mendeley addons.
 - Upgrade Dropbox client version.
 - Add field to PreprintProvider to toggle Hypothesis commenting.
 - Fix using django-waffle with groups.
-- Fix bug that caused project to be unreachable if it had a deleted BitBucket addon.
+- Fix bug that caused project to be unreachable if it had a deleted Bitbucket addon.
 - Fix incorrect OSF Meeting instructions.
 - Remove unused fonts and styles from landing page.
-- Hide hierarchy on search results if parent is priate.
+- Hide hierarchy on search results if parent is private.
 - API: Fix /data/relationships/referent/type for /guids/<registration-id>/?resolve=false endpoint.
 - API: Optimize node delete endpoint.
 - Admin: Fix typos.
@@ -1198,7 +1198,7 @@ Deprecates NodeWikiVersion, Node.wiki_pages_versions, and Node.wiki_pages_curren
 
 - Display file metadata for addon files deleted outside of the OSF.
 - Add decorator for feature-flagging EmbOSF routes.
-- Add footer to OSF landing page foor logged out users.
+- Add footer to OSF landing page for logged out users.
 - Make loading indicators consistent.
 - Show DOIs on withdrawn registrations.
 - Make support email configurable in settings.
@@ -1300,7 +1300,7 @@ Deprecates NodeWikiVersion, Node.wiki_pages_versions, and Node.wiki_pages_curren
 - Subsequent files do not receive a modal when copied over to a folder
 - Unable to authorize figshare accounts with unicode in name
 - fix incorrect method name in oauth node config js
-- In Fangorn, Github's [Open] button only points to the default branch
+- In Fangorn, GitHub's [Open] button only points to the default branch
 - Popular Public and New & Noteworthy -- making a project private causes error
 - Admin app: accessing list of user's permissions 502s
 - Unable to mark node as Ham
@@ -1316,7 +1316,7 @@ Deprecates NodeWikiVersion, Node.wiki_pages_versions, and Node.wiki_pages_curren
 - Citations preview should show the full name field if the individual name sections are blank
 - Incorrect error message is shown for Dataverse 500 error
 - File checked out to Alex DeHaven after Prereg Challenge submission is approved.
-- Don't use {} as a attribute default value
+- Don't use {} as an attribute default value
 - [admin app] Searching for user names that contain periods or commas returns 502
 - Forks total includes registrations
 - Fix spelling for new VOL section in project settings
@@ -1491,7 +1491,7 @@ Deprecates NodeWikiVersion, Node.wiki_pages_versions, and Node.wiki_pages_curren
 - Make ever_mentioned a ManyToMany field
 - Remove unused mongo code in framework.mongo
 - Reduce number of queries made by triggered mails script
-- Add a context manager to prevent auto_now fields from from getting updated during migrations
+- Add a context manager to prevent auto_now fields from getting updated during migrations
 - Remove model name aliasing in imports
 - Remove dead badges code
 - Add view OSF Subjects Permissions
@@ -1694,7 +1694,7 @@ Deprecates NodeWikiVersion, Node.wiki_pages_versions, and Node.wiki_pages_curren
 - Submitting to OSF4M using deleted project name does not create new project
 - Fangorn edit undefined
 - API 502s when refreshing github metadata (was: TypeError: Can't compare datetime.datetime to NoneType)
-- API 502s when requesting Github file metadata w/ version=2.2
+- API 502s when requesting GitHub file metadata w/ version=2.2
 - Search unhappy with some users
 - Registries: "Withdrawn" label not appearing on newly-withdrawn registrations
 - Retraction detail pages throw mithril mounting error
@@ -1759,7 +1759,7 @@ Post-release: python -m scripts.migration.migrate_meetings_preprints_to_preprint
 0.101.0 (2016-11-23)
 ====================
 - Fix renaming, download button, zip is broken on GitHub non-default branch
-- Prevent 500 error when oving a folder from a OSF in component to OSF storage in parent
+- Prevent 500 error when moving a folder from a OSF in component to OSF storage in parent
 - Ensure IE can view files in a VOL
 - Improve error messaging for attempted moves/deletes of primary file on private preprint project
 - Make comment reply filter work
@@ -1810,7 +1810,7 @@ Post-release: python -m scripts.migration.migrate_meetings_preprints_to_preprint
 0.97.0 (2016-10-20)
 ===================
 - API v2 Versioning
-- API v2 Redirect swagger docs to Browseable API
+- API v2 Redirect swagger docs to Browsable API
 - Fix wiki formatting for legacy wiki pages
 - Ensure bad file moves don't delete files
 - API v2 Make private nodes private in inter-node file moves
@@ -1925,7 +1925,7 @@ Migrations
 0.91.0 (2016-08-28)
 ===================
 
-- API Endpoints for Preprints (also includs providers and taxonomies)
+- API Endpoints for Preprints (also includes providers and taxonomies)
 - API Download Counts for OSF Storage Files
 
 Migrations
@@ -1956,7 +1956,7 @@ Migrations
 0.88.1 (2016-08-25)
 ===================
 
-- Make Github addon logging more tolerant to problems
+- Make GitHub addon logging more tolerant to problems
 
 0.88.0 (2016-08-22)
 ===================
@@ -1989,7 +1989,7 @@ Migrations
 0.87.5 (2016-08-16)
 ===================
 
-- Modify wording on ERPC langing page
+- Modify wording on ERPC landing page
 
 0.87.4 (2016-08-15)
 ===================
@@ -2110,7 +2110,7 @@ Migrations
 ===================
 
 - Use CAS for all authentication for OSF.
-- On regisration's file pages, show links to original source file.
+- On registration's file pages, show links to original source file.
 - Creating a wiki page whose name is the same as a previously deleted wiki page will no longer restore the wiki page's versions.
 - Add more contextual information about component hierarchy to the My Projects widget.
 - Add Date Modified column to file browsers.
@@ -2254,7 +2254,7 @@ See https://openscience.atlassian.net/browse/OSF-5861
 - Backend for OSF4Institutions: nodes and users can be affiliated with an institution (alpha; disabled on production).
 - Add visitor tracking with Keen.io.
 - Refactor Google Drive addon to use generic views.
-- Use Sendgrid API for sending emails; add categorization of emails.
+- Use SendGrid API for sending emails; add categorization of emails.
 - UI fixes.
 
 0.64.0 (2016-02-10)
@@ -2417,7 +2417,7 @@ Migrations
 0.50.0 (2015-09-17)
 ===================
 
-- Migration of all addon file collecitons to a single GuidFile collection.
+- Migration of all addon file collections to a single GuidFile collection.
 
 0.49.0 (2015-09-11)
 ===================
@@ -2726,7 +2726,7 @@ service when files are backed up to a Amazon Glacier archive.
 
 Hotfix release
 
-- Display warning about private Github repos on a public project on files and
+- Display warning about private GitHub repos on a public project on files and
 statistics pages.
 - Refactor celery task for rendering files so that file contents are not
 passed to message broker.
@@ -2770,16 +2770,16 @@ Lots of new UI features and responsiveness improvements.
 - Paginate search results in Add Contributor widget.
 - Speed improvements to contributor manager widget.
 - Add "ongoing" option to Education and Employment sections of user profile.
-- Improved mimetype detection when downloading a file through the Github
+- Improved mimetype detection when downloading a file through the GitHub
 addon.
 - Unread comment counts appear in comment tab.
 - Lots of bug fixes and minor UI improvements to the wiki.
 - Wiki page names can have punctuation and special characters.
 - Lots of UI fixes to the profile configuration pages.
 - Larger project title and description inputs.
 - Confirmation codes for project deletion are more fun =)
-- Allow multiple users to authenticate with the same Github credentials for
-the Github addon.
+- Allow multiple users to authenticate with the same GitHub credentials for
+the GitHub addon.
 - Includes all fixes from the "Sprint: Initial" milestone: https://github.com/CenterForOpenScience/openscienceframework.org/issues?q=milestone%3A%22Sprint+%3A+Initial%22+
 - Update required versions of requests, webassets, and bleach.
 
@@ -2795,7 +2795,7 @@ Schema changes
 
 - Remove fork_list and registration_list fields from Node model. NOTE: A
 migration was NOT performed to remove these fields.
-- Add AddonGithubOauthSettings model.
+- Add AddonGitHubOauthSettings model.
 - Remove oauth_access_token and oauth_token_type fields from
 AddonGitHubUserSettings model.
 
@@ -2843,11 +2843,11 @@ and prevents a number of circular import problems throughout the codebase.
 - Wiki logs link to wiki pages.
 - Add confirmation dialog when deselecting addons from the user profile page.
 - Registered users no longer have "key ring" of view-only link keys. View-only
-links will appear the same, regardless of whether you are logged in or not.
+links will appear the same, regardless of whether or not you are logged in.
 - Project deletion events are logged.
 - Developers: All deprecated Solr code removed.
 - Developers: Bower components are no longer added to the git tree. Use `bower
-install` to installthem.
+install` to install them.
 - Developers: Various improvements to logging.
 - Developers: ``URLLookup`` class is deprecated. Use ``api_url_for`` and
 ``web_url_for`` in your tests.

CONTRIBUTING.md

@@ -30,6 +30,6 @@ When submitting an issue, be as descriptive as possible:
 * Suggest a solution
     * What will it look like when this issue is resolved?
 
-Include pictures (e.g., in OSX press Cmd+Shift+4 to draw a box to screenshot)
+Include pictures (e.g., in macOS press Cmd+Shift+4 to draw a box to screenshot)
 
 Examples of good issue reporting: [#382](https://github.com/CenterForOpenScience/osf.io/issues/382), [#713](https://github.com/CenterForOpenScience/osf.io/issues/713).

NOTICE

@@ -460,7 +460,7 @@ Common Public Attribution License Version 1.0 (CPAL-1.0)
 
     8.1 This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive.
 
-    8.2 If You initiate litigation by asserting a patent infringement claim (excluding declatory judgment actions) against Initial Developer, Original Developer or a Contributor (the Initial Developer, Original Developer or Contributor against whom You file such action is referred to as “Participant”) alleging that:
+    8.2 If You initiate litigation by asserting a patent infringement claim (excluding declaratory judgment actions) against Initial Developer, Original Developer or a Contributor (the Initial Developer, Original Developer or Contributor against whom You file such action is referred to as “Participant”) alleging that:
 
         (a) such Participant’s Contributor Version directly or indirectly infringes any patent, then any and all rights granted by such Participant to You under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively, unless if within 60 days after receipt of notice You either: (i) agree in writing to pay Participant a mutually agreeable reasonable royalty for Your past and future use of Modifications made by such Participant, or (ii) withdraw Your litigation claim with respect to the Contributor Version against such Participant. If within 60 days of notice, a reasonable royalty and payment arrangement are not mutually agreed upon in writing by the parties or the litigation claim is not withdrawn, the rights granted by Participant to You under Sections 2.1 and/or 2.2 automatically terminate at the expiration of the 60 day notice period specified above.
 

PULL_REQUEST_TEMPLATE.md

@@ -36,4 +36,4 @@ Any concerns/considerations/questions that development raised?
 
 ## Ticket
 
-<!-- Link to JIRA ticket, if applicable e.g. https://openscience.atlassian.net/browse/OSF-1234 -->
+<!-- Link to Jira ticket, if applicable e.g. https://openscience.atlassian.net/browse/OSF-1234 -->

README-docker-compose.md

@@ -2,15 +2,15 @@
 ## Docker and OS Setup
 
 1. Install the Docker Client
-  - OSX: https://www.docker.com/products/docker#/mac
+  - macOS: https://www.docker.com/products/docker#/mac
   - Ubuntu: https://docs.docker.com/engine/installation/linux/ubuntulinux
   - Windows: https://www.docker.com/products/docker#/windows
 2. Grant the docker client additional resources (recommended minimums of 1 CPU, 8GB memory, 2GB swap, and 32GB disk image size)
-   - OSX: https://docs.docker.com/docker-for-mac/#/preferences
+   - macOS: https://docs.docker.com/docker-for-mac/#/preferences
    - Ubuntu: N/A
    - Windows: https://docs.docker.com/docker-for-windows/#advanced
-3. Setup the Operating System
-  - OSX
+3. Set up the Operating System
+  - macOS
     - Alias the loopback interface
 
     ```bash
@@ -72,7 +72,7 @@
         `netsh interface show interface`
       - Rename the interface
 
-        `netsh inteface set interface "Ethernet 2" newname="Loopback"`
+        `netsh interface set interface "Ethernet 2" newname="Loopback"`
       - Assign the Loopback interface an IP address
 
         `netsh interface ip add address "Loopback" 192.168.168.167 255.255.255.255`
@@ -124,7 +124,7 @@
 
   - Running containers with docker compose
 
-    - In `webite/settings/local.py`, disable `SEARCH_ENGINE`
+    - In `website/settings/local.py`, disable `SEARCH_ENGINE`
     ```python
     # SEARCH_ENGINE = 'elastic'
     SEARCH_ENGINE = None

addons/base/models.py

@@ -455,7 +455,7 @@ def before_fork(self, node, user):
         """Return warning text to display if user auth will be copied to a
         fork.
         :param Node node:
-        :param Uder user
+        :param User user
         :returns Alert message
         """
 

addons/base/tests/base.py

@@ -13,7 +13,7 @@ class AddonTestCase:
         - ADDON_SHORT_NAME (class variable)
         - set_user_settings(self, settings): Method that makes any modifications
             to the UserSettings object, e.g. setting access_token
-        - set_node_settings(self, settings): Metehod that makes any modifications
+        - set_node_settings(self, settings): Method that makes any modifications
             to the NodeSettings object.
 
     This will give you:

addons/base/tests/serializers.py

@@ -121,7 +121,7 @@ def test_serialized_urls_checks_required(self):
             with pytest.raises(AssertionError):
                 self.ser.serialized_urls
 
-    def test_serialized_acccounts(self):
+    def test_serialized_accounts(self):
         ea = self.ExternalAccountFactory()
         self.user.external_accounts.add(ea)
 
@@ -131,7 +131,7 @@ def test_serialized_acccounts(self):
         assert len(serialized) == self.user.external_accounts.count()
         assert mock_serialize_account.call_count == len(serialized)
 
-    def test_serialize_acccount(self):
+    def test_serialize_account(self):
         ea = self.ExternalAccountFactory()
         expected = {
             'id': ea._id,
@@ -169,7 +169,7 @@ class StorageAddonSerializerTestSuiteMixin(OAuthAddonSerializerTestSuiteMixin):
     @abc.abstractmethod
     def client(self):
         """Provide a mocked version of this provider's client (i.e. the client should not make
-        acutal API calls).
+        actual API calls).
         """
         pass
 

addons/base/views.py

@@ -198,7 +198,7 @@ def get_auth(auth, **kwargs):
     Authenticate a request and construct a JWT payload for Waterbutler callbacks.
     When a user interacts with a file OSF sends a request to WB which itself sends a
     request to an external service or Osfstorage, in order to confirm that event has
-    taken place Waterbutler will send this callback to OSF to comfirm the file action was
+    taken place Waterbutler will send this callback to OSF to confirm the file action was
     successful and can be logged.
 
     This function decrypts and decodes the JWT payload from the request, authenticates