Skip to content

Commit

Permalink
Merge branch 'hotfix/0.142.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
adlius committed Sep 7, 2023
2 parents 426c1b2 + d64e575 commit cd07810
Show file tree
Hide file tree
Showing 16 changed files with 1,436 additions and 124 deletions.
5 changes: 0 additions & 5 deletions .bowerrc

This file was deleted.

1 change: 0 additions & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ jobs:
key: cached_node_modules_${{ hashFiles('**/yarn.lock') }}
restore-keys: cached_node_modules_

- run: yarn bower install --config.interactive=false
- run: yarn test:cover
- name: Send coverage report to coveralls
uses: coverallsapp/github-action@master
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,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).

## [0.142.2] - 2023-09-07
### Changed
- Remove bower

## [0.142.1] - 2023-09-07
### Changed
- Update Dockerfile
Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,13 @@ You will need the following things properly installed on your computer.
- [Git](http://git-scm.com/)
- [Node.js](http://nodejs.org/) (preferably via [nvm](https://github.com/creationix/nvm#install-script))
- [Yarn](https://yarnpkg.com/)
- [Bower](http://bower.io/)
- [Ember CLI](http://ember-cli.com/)

## Installation

- `git clone` this repository
- To pull in local preprint provider assets as well, use `git clone --recursive` instead (assuming you are using git >= 1.6.5).
- `yarn install --frozen-lockfile`
- `bower install`

## Preprint Provider Assets

Expand Down
5 changes: 0 additions & 5 deletions app/sanitizers/advisory-board.js

This file was deleted.

5 changes: 0 additions & 5 deletions app/sanitizers/description.js

This file was deleted.

5 changes: 0 additions & 5 deletions app/sanitizers/footer-links.js

This file was deleted.

2 changes: 1 addition & 1 deletion app/templates/components/preprint-footer-branded.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="text-center branded-footer-links">
<div>
{{sanitize-html model.footerLinks "footer-links"}}
{{html-safe model.footerLinks}}
</div>

</div>
Expand Down
4 changes: 2 additions & 2 deletions app/templates/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
{{/if}}
<p class="lead">
{{#if theme.isProvider}}
{{sanitize-html theme.provider.description "description"}}
{{html-safe theme.provider.description}}
<br>
<small>
<a href="{{host}}preprints" onbeforeclick={{action "click" "link" "Index - Powered By"}}>
Expand Down Expand Up @@ -139,7 +139,7 @@
<div class="preprint-advisory p-v-md">
<div class="container">
<div class="row">
{{sanitize-html theme.provider.advisoryBoard "advisory-board"}}
{{html-safe theme.provider.advisoryBoard}}
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/submit.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
{{ selectedProvider.name }}
{{/if}}
</dt>
<dd>{{sanitize-html selectedProvider.description}}</dd>
<dd>{{html-safe selectedProvider.description}}</dd>
</dl>
</div>
</div>
Expand Down
7 changes: 0 additions & 7 deletions bower.json

This file was deleted.

2 changes: 1 addition & 1 deletion ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ module.exports = function(defaults) {
production: path.join('node_modules', 'hint.css/hint.css'),
});

app.import(path.join(app.bowerDirectory, 'jquery.tagsinput/src/jquery.tagsinput.js'));
app.import(path.join('node_modules', 'jquery-tags-input/src/jquery.tagsinput.js'));

// Import component styles from addon
app.import('vendor/assets/ember-osf.css');
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "preprint-service",
"version": "0.142.1",
"version": "0.142.2",
"description": "Center for Open Science Preprint Service",
"license": "Apache-2.0",
"author": "",
Expand Down Expand Up @@ -32,7 +32,6 @@
"autoprefixer": "^7.1.2",
"bootstrap-daterangepicker": "^2.1.23",
"bootstrap-sass": "^3.4.1",
"bower": "^1.8.8",
"broccoli-asset-rev": "^2.4.5",
"c3": "^0.4.23",
"coveralls": "2.11.16",
Expand Down Expand Up @@ -62,6 +61,7 @@
"ember-cli-sass": "^7.0.0",
"ember-cli-shims": "^1.1.0",
"ember-cli-sri": "^2.1.0",
"ember-cli-string-helpers": "^6.1.0",
"ember-cli-template-lint": "^0.7.5",
"ember-cli-uglify": "^1.2.0",
"ember-click-outside": "^0.1.12",
Expand All @@ -86,7 +86,6 @@
"ember-power-select": "2.2.1",
"ember-read-more": "^0.0.13",
"ember-resolver": "^4.0.0",
"ember-sanitize": "^2.0.2",
"ember-sinon-qunit": "3.1.0",
"ember-sortable": "^1.8.2",
"ember-source": "2.18.0",
Expand All @@ -95,6 +94,7 @@
"eslint": "^4.4.1",
"font-awesome": "^4.7.0",
"hint.css": "^2.5.0",
"jquery-tags-input": "^1.3.5",
"liquid-fire": "^0.27.3",
"loader.js": "^4.2.3",
"node-sass": "4.13.1",
Expand Down
7 changes: 0 additions & 7 deletions tests/integration/components/preprint-footer-branded-test.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
import EmberObject from '@ember/object';
import { moduleForComponent, test } from 'ember-qunit';
import hbs from 'htmlbars-inline-precompile';
import sanitizer from 'preprint-service/sanitizers/footer-links';

moduleForComponent('preprint-footer-branded', 'Integration | Component | preprint footer branded', {
integration: true,

setup() {
this.container.registry.register('sanitizer:footer-links', EmberObject.extend(sanitizer));
},

});

test('shows all social', function(assert) {
Expand Down
45 changes: 0 additions & 45 deletions tests/unit/helpers/sanitizers-test.js

This file was deleted.

Loading

0 comments on commit cd07810

Please sign in to comment.