Skip to content

Commit

Permalink
Merge branch 'hotfix/25.01.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
mfraezz committed Jan 10, 2025
2 parents 5516b8e + ee243a0 commit 41e40aa
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [25.01.2] - 2025-01-10
### Added
- Update policy links

## [25.01.1] - 2025-01-06
### Added
- Fix funder column propertyPathKey
Expand Down Expand Up @@ -2018,6 +2022,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Added
- Quick Files

[25.01.2]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/25.01.2
[25.01.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/25.01.1
[25.01.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/25.01.0
[24.10.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/24.10.0
Expand Down
6 changes: 3 additions & 3 deletions config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,9 @@ module.exports = function(environment) {
},
},
signUpPolicy: {
termsLink: `${POLICY_URL_PREFIX}TERMS_OF_USE.md`,
privacyPolicyLink: `${POLICY_URL_PREFIX}PRIVACY_POLICY.md`,
cookiesLink: `${POLICY_URL_PREFIX}PRIVACY_POLICY.md#f-cookies`,
termsLink: 'https://osf.io/terms_of_use/',
privacyPolicyLink: 'https://osf.io/privacy_policy/',
cookiesLink: 'https://osf.io/privacy_policy/#f-cookies',
},
footerLinks: {
cos: 'https://cos.io',
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-osf-web",
"version": "25.01.1",
"version": "25.01.2",
"private": true,
"description": "Ember front-end for the Open Science Framework",
"homepage": "https://github.com/CenterForOpenScience/ember-osf-web#readme",
Expand Down
4 changes: 2 additions & 2 deletions translations/en-us.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2239,7 +2239,7 @@ meetings:
subject: Subject
message_body: 'Message body'
attachment: Attachment
panel_footer_note: 'Once sent, we will follow-up by sending you the permanent identifier that others can use to cite your work; you can also login and make changes, such as uploading additional files, to your project at that URL.If you didn''t have an OSF account, one will be created automatically and a link to set your password will be emailed to you; if you do, we will simply create a new project in your account.By creating an account you agree to our <a href="https://github.com/CenterForOpenScience/centerforopenscience.org/blob/master/TERMS_OF_USE.md">Terms</a> and that you have read our <a href="https://github.com/CenterForOpenScience/centerforopenscience.org/blob/master/PRIVACY_POLICY.md">Privacy Policy</a>, including our information on <a href="https://github.com/CenterForOpenScience/centerforopenscience.org/blob/master/PRIVACY_POLICY.md#f-cookies">Cookie Use</a>.'
panel_footer_note: 'Once sent, we will follow-up by sending you the permanent identifier that others can use to cite your work; you can also login and make changes, such as uploading additional files, to your project at that URL.If you didn''t have an OSF account, one will be created automatically and a link to set your password will be emailed to you; if you do, we will simply create a new project in your account.By creating an account you agree to our <a href="https://osf.io/terms_of_use/">Terms</a> and that you have read our <a href="https://osf.io/privacy_policy/">Privacy Policy</a>, including our information on <a href="https://osf.io/privacy_policy/#f-cookies">Cookie Use</a>.'
conference_homepage: 'Conference homepage'
analytics:
pageTitle: '{nodeTitle} Analytics'
Expand Down Expand Up @@ -2276,7 +2276,7 @@ analytics:
resources: Resources
privateProject: "\n <p>\n Analytics are not available for private projects. To view Analytics, make your project public\n by selecting Make Public from the project overview page. Public projects:\n </p>\n <ul>\n <li>are discoverable</li>\n <li>are citable</li>\n <li>can be affiliated with OSF for Institutions partners</li>\n <li>promote open practices among peers</li>\n </ul>\n <p>\n Receive data on visitors to your project by enabling Analytics\n and begin discovering the impact of your work.\n </p>\n "
cookieBanner:
cookieWarning: 'This website relies on cookies to help provide a better user experience. By clicking Accept or continuing to use the site, you agree. For more information, see our <a href="https://github.com/CenterForOpenScience/cos.io/blob/master/PRIVACY_POLICY.md">Privacy Policy</a> and information on <a href="https://github.com/CenterForOpenScience/cos.io/blob/master/PRIVACY_POLICY.md#7-types-of-information-we-collect">cookie use</a>.'
cookieWarning: 'This website relies on cookies to help provide a better user experience. By clicking Accept or continuing to use the site, you agree. For more information, see our <a href="https://osf.io/privacy_policy/">Privacy Policy</a> and information on <a href="https://osf.io/privacy_policy/#8-types-of-information-we-collect">cookie use</a>.'
accept: Accept
discover:
relevance: Relevance
Expand Down

0 comments on commit 41e40aa

Please sign in to comment.