Skip to content

Commit

Permalink
Merge branch 'master' into FOLIO-3627-sw
Browse files Browse the repository at this point in the history
  • Loading branch information
zburke authored Oct 9, 2023
2 parents b6f5090 + 4997ab8 commit c1bdb5b
Show file tree
Hide file tree
Showing 5 changed files with 1,328 additions and 2,334 deletions.
14 changes: 13 additions & 1 deletion .stylelintrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
{
"extends": "stylelint-config-standard"
"extends": "stylelint-config-standard",

"rules": {
"alpha-value-notation": null,
"color-function-notation": null,
"declaration-block-no-redundant-longhand-properties": null,
"function-no-unknown": null,
"import-notation": null,
"media-feature-range-notation": null,
"no-descending-specificity": null,
"selector-class-pattern": null,
"value-keyword-case": null
}
}
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
* Forgot password and Forgot username : add placeholder to input box. Refs STCOR-728.
* Include `yarn.lock`. Refs STCOR-679.
* *BREAKING* bump `react-intl` to `v6.4.4`. Refs STCOR-744.
* *BREAKING* use cookies and RTR instead of directly handling the JWT. Refs STCOR-671.
* Bump `stylelint` to `v15` and `stylelint-config-standard` to `v34`. Refs STCOR-745.
* *BREAKING* use cookies and RTR instead of directly handling the JWT. Refs STCOR-671, FOLIO-3627.

## [9.0.0](https://github.com/folio-org/stripes-core/tree/v9.0.0) (2023-01-30)
[Full Changelog](https://github.com/folio-org/stripes-core/compare/v8.3.0...v9.0.0)
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@
"react-redux": "^8.0.5",
"react-router": "^5.2.0",
"react-router-dom": "^5.2.0",
"stylelint": "^8.2.0",
"stylelint-config-standard": "^17.0.0",
"stylelint": "^15.10.3",
"stylelint-config-standard": "^34.0.0",
"stylelint-junit-formatter": "^0.2.1"
},
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions translations/stripes-core/pt_BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
"about.okapiServices": "Serviços do Okapi",
"about.unknown": "Desconhecido",
"about.version": "Versão {version}",
"about.forTenant": "Para o inquilino {tenant}",
"about.forTenant": "Para o locatário {tenant}",
"about.onUrl": "Na URL {url}",
"about.legendKey": "Chave",
"about.notEnabledModules": "Módulos instalados que não estão disponíveis para este inquilino são apresentados em <span>cinza</span>.",
"about.notEnabledModules": "Módulos instalados que não estão disponíveis para este locatário são apresentados em <span>cinza</span>.",
"about.moduleCount": "{count, number} {count, plural, one {módulo} other {módulos}}",
"about.interfaceCount": "{count, number} {count, plural, one {interface} other {interfaces}}",
"about.uiOrServiceDependencies": "UI/service dependencies",
Expand Down
Loading

0 comments on commit c1bdb5b

Please sign in to comment.