Skip to content

Commit

Permalink
Merge pull request #141 from ror-community/dev
Browse files Browse the repository at this point in the history
Merge dev to staging: Dependabot updates
  • Loading branch information
lizkrznarich authored Jan 5, 2023
2 parents 2bca2ca + 71c2071 commit 1d1ddf3
Show file tree
Hide file tree
Showing 4 changed files with 3,159 additions and 2,029 deletions.
5 changes: 0 additions & 5 deletions app/routes/application.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
import Route from '@ember/routing/route';
import { inject as service } from '@ember/service';

export default Route.extend({
intl: service(),

beforeModel() {
return this.intl.setLocale(['en-us']);
}
});
2 changes: 1 addition & 1 deletion app/templates/organizations/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="container-fluid">
{{#if model}}
{{#if (gt model.meta.total 1)}}
<h4 class="ml-3">{{format-number model.meta.total}} Organizations</h4>
<h4 class="ml-3">{{decimal-format model.meta.total}} Organizations</h4>
<p class="small ml-3"><i>Are we missing an organization you're looking for? <a target="_blank" rel="noopener" href="http://curation-request.ror.org/">Submit a request to add it</a></i></p>
{{/if}}
<div class="row">
Expand Down
25 changes: 13 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@
"@ember/jquery": "^0.5.2",
"@ember/optional-features": "^0.6.3",
"bootstrap": "^4.2.1",
"broccoli-asset-rev": "^2.7.0",
"ember-ajax": "^3.1.0",
"ember-auto-import": "^1.2.21",
"broccoli-asset-rev": "^3.0.0",
"ember-ajax": "^5.1.2",
"ember-auto-import": "2",
"ember-bootstrap": "^2.4.0",
"ember-cli": "^3.8.1",
"ember-cli": "^4.9.2",
"ember-cli-app-version": "^3.2.0",
"ember-cli-babel": "^7.1.2",
"ember-cli-dependency-checker": "^3.0.0",
"ember-cli-dotenv": "^2.2.1",
"ember-cli-eslint": "^4.2.3",
"ember-cli-flash": "^1.7.1",
"ember-cli-htmlbars": "^3.0.0",
"ember-cli-htmlbars": "^6.1.1",
"ember-cli-htmlbars-inline-precompile": "^1.0.3",
"ember-cli-inject-live-reload": "^1.8.2",
"ember-cli-sass": "^8.0.1",
Expand All @@ -45,19 +45,20 @@
"ember-cli-uglify": "^2.1.0",
"ember-data": "~3.7.0",
"ember-export-application-global": "^2.0.0",
"ember-intl": "^3.5.0",
"ember-load-initializers": "^1.1.0",
"ember-maybe-import-regenerator": "^0.1.6",
"ember-moment": "^7.8.0",
"ember-helper-locale-number": "^1.0.0",
"ember-load-initializers": "^2.1.2",
"ember-maybe-import-regenerator": "^1.0.0",
"ember-moment": "^10.0.0",
"ember-qunit": "^3.4.1",
"ember-resolver": "^5.0.1",
"ember-source": "~3.7.0",
"ember-truth-helpers": "^2.1.0",
"ember-welcome-page": "^3.2.0",
"eslint-plugin-ember": "^5.2.0",
"eslint-plugin-ember": "^8.14.0",
"loader.js": "^4.7.0",
"qunit-dom": "^0.8.0",
"sass": "^1.16.0"
"qunit-dom": "^2.0.0",
"sass": "^1.16.0",
"webpack": "5"
},
"engines": {
"node": "6.* || 8.* || >= 10.*"
Expand Down
Loading

0 comments on commit 1d1ddf3

Please sign in to comment.