Skip to content

Commit cb271d1

Browse files
committed
Merge branch 'release/0.16.0'
2 parents 571ba63 + 542910f commit cb271d1

File tree

108 files changed

+3194
-2400
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+3194
-2400
lines changed

.template-lintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ module.exports = {
66

77
rules: {
88
'block-indentation': 4,
9-
'bare-strings': false
9+
'bare-strings': true
1010
}
1111
};

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,20 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

7+
## [0.16.0] - 2018-04-24
8+
### Added
9+
- `documentType` property to `preprint-service` model.
10+
- `secondary-nav-dropdown` class to `new-navbar-auth-dropdown` component
11+
- `ember-component-css` to bundle all component styles in one `pod-styles.scss` and prevent styling conflicts across components.
12+
- `works` to preprint word translations
13+
14+
### Changed
15+
- static strings to be in translation files
16+
- `bare-strings` option in eslint to `true`
17+
- OSF API version from 2.4 to 2.6
18+
- ember-cli-moment-shim version to `^3.5.3` due to security issues found in `moment` versions before `2.19.3`
19+
- classes and element tags to match styles needed for long name truncation on navbar
20+
721
## [0.15.0] - 2018-03-06
822
### Added
923
- Added "choose your custom citation" section to citation-widget

addon/adapters/osf-adapter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {
2222
*/
2323
export default DS.JSONAPIAdapter.extend(GenericDataAdapterMixin, {
2424
headers: {
25-
ACCEPT: 'application/vnd.api+json; version=2.4'
25+
ACCEPT: 'application/vnd.api+json; version=2.6'
2626
},
2727
authorizer: config['ember-simple-auth'].authorizer,
2828
host: config.OSF.apiUrl,

addon/components/citation-widget/template.hbs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<div>
22
<div id="citationList" class="m-b-md">
3-
<div class="f-w-xl">APA</div>
3+
<div class="f-w-xl">{{t 'eosf.components.citationWidget.apa'}}</div>
44
<span> {{apa}} </span>
5-
<div class="f-w-xl m-t-md">MLA</div>
5+
<div class="f-w-xl m-t-md">{{t 'eosf.components.citationWidget.mla'}}</div>
66
<span> {{mla}} </span>
7-
<div class="f-w-xl m-t-md">Chicago</div>
7+
<div class="f-w-xl m-t-md">{{t 'eosf.components.citationWidget.chicago'}}</div>
88
<span> {{chicago}} </span>
99
</div>
10-
<p><strong>Get more citations</strong></p>
10+
<p><strong>{{t 'eosf.components.citationWidget.getMoreCitations'}}</strong></p>
1111
{{#power-select
1212
search=(perform findStyles)
1313
selected=selectedStyle

addon/components/comment-detail/component.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,6 @@ import layout from './template';
2828
*/
2929
export default Ember.Component.extend({
3030
layout,
31+
i18n: Ember.inject.service(),
3132
comment: null
3233
});

addon/components/comment-detail/template.hbs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<div>
22
{{#if comment.deleted}}
33
<div>
4-
Comment deleted
4+
{{t 'eosf.components.commenting.commentDetail.commentDeleted'}}
55
{{# if comment.canEdit}}
6-
<button {{action restoreComment comment}} class="btn btn-warning">Restore</button>
6+
<button {{action restoreComment comment}} class="btn btn-warning">{{t 'eosf.components.commenting.commentDetail.restore'}}</button>
77
{{/if}}
88
</div>
99
{{else}}
@@ -13,11 +13,11 @@
1313
</strong>:
1414
{{# if comment.canEdit}}
1515
{{input value=comment.content}}
16-
<button {{action editComment comment}} class="btn btn-success">Edit</button>
17-
<button {{action deleteComment comment}} class="btn btn-danger">Delete</button>
16+
<button {{action editComment comment}} class="btn btn-success">{{t 'eosf.components.commenting.commentDetail.edit'}}</button>
17+
<button {{action deleteComment comment}} class="btn btn-danger">{{t 'eosf.components.commenting.commentDetail.delete'}}</button>
1818
{{else}}
1919
<span>{{comment.content}}</span>
20-
<button {{action reportComment comment}} class="btn btn-warning">Report</button>
20+
<button {{action reportComment comment}} class="btn btn-warning">{{t 'eosf.components.commenting.commentDetail.report'}}</button>
2121
{{/if}}
2222
</div>
2323
{{/if}}

addon/components/comment-form/component.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import layout from './template';
2020
*/
2121
export default Ember.Component.extend({
2222
layout,
23+
i18n: Ember.inject.service(),
2324
_commentText: null,
2425

2526
actions: {
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div>
2-
{{textarea class="form-control" maxlength="500" placeholder="Add a comment" value=_commentText}}
2+
{{textarea class="form-control" maxlength="500" placeholder=(t 'eosf.components.commenting.commentForm.addComment') value=_commentText}}
33
<button {{action 'addComment' _commentText}} class="btn btn-success" disabled={{if (not _commentText) true}}>
4-
Add comment
4+
{{t 'eosf.components.commenting.commentForm.addComment'}}
55
</button>
66
</div>

addon/components/comment-pane/component.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,6 @@ import layout from './template';
3030
*/
3131
export default Ember.Component.extend({
3232
layout,
33+
i18n: Ember.inject.service(),
3334
comments: null
3435
});
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<h3>Comments</h3>
1+
<h3>{{t 'eosf.components.commenting.commentPane.comments'}}</h3>
22
{{#each comments as |comment|}}
33
{{comment-detail
44
comment=comment
@@ -7,7 +7,7 @@
77
restoreComment=attrs.restoreComment
88
reportComment=attrs.reportComment}}
99
{{else}}
10-
(none)
10+
{{t 'eosf.components.commenting.commentPane.none'}}
1111
{{/each}}
1212

1313
{{comment-form addComment=attrs.addComment}}

0 commit comments

Comments
 (0)