Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/cypress-testing-li…
Browse files Browse the repository at this point in the history
…brary-4.0.0
  • Loading branch information
skjnldsv authored Jun 9, 2019
2 parents d1ab657 + e0a34ef commit 714f3fc
Show file tree
Hide file tree
Showing 6 changed files with 103 additions and 46 deletions.
26 changes: 13 additions & 13 deletions js/viewer.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/viewer.js.map

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions l10n/sk.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
OC.L10N.register(
"viewer",
{
"Viewer" : "Prehliadač",
"Simple file viewer with slideshow for media" : "Jednoduchý prehliadač súborov s režimom prezentácie pre obrázky a iné médiá"
},
"nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);");
5 changes: 5 additions & 0 deletions l10n/sk.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{ "translations": {
"Viewer" : "Prehliadač",
"Simple file viewer with slideshow for media" : "Jednoduchý prehliadač súborov s režimom prezentácie pre obrázky a iné médiá"
},"pluralForm" :"nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);"
}
98 changes: 71 additions & 27 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"axios": "^0.18.0",
"debounce": "^1.2.0",
"nextcloud-server": "^0.15.9",
"nextcloud-vue": "^0.11.3",
"nextcloud-vue": "^0.11.4",
"vue": "^2.6.10",
"vue-async-computed": "^3.6.1"
},
Expand All @@ -60,7 +60,8 @@
"css-loader": "^2.1.1",
"cypress": "^3.3.1",
"cypress-file-upload": "^3.1.2",
"cypress-image-snapshot": "^3.1.0",
"cypress-image-snapshot": "^3.1.1",
"cypress-testing-library": "^4.0.0",
"eslint": "^5.16.0",
"eslint-config-standard": "^12.0.0",
"eslint-import-resolver-webpack": "^0.11.1",
Expand All @@ -70,18 +71,18 @@
"eslint-plugin-promise": "^4.1.1",
"eslint-plugin-standard": "^4.0.0",
"eslint-plugin-vue": "^5.2.2",
"file-loader": "^3.0.1",
"file-loader": "^4.0.0",
"node-sass": "^4.12.0",
"sass-loader": "^7.1.0",
"stylelint": "^8.4.0",
"stylelint-config-recommended-scss": "^3.3.0",
"stylelint-scss": "^3.6.1",
"stylelint-webpack-plugin": "^0.10.5",
"url-loader": "^1.1.2",
"url-loader": "^2.0.0",
"vue-loader": "^15.7.0",
"vue-template-compiler": "^2.6.10",
"webpack": "^4.32.2",
"webpack-cli": "^3.3.2",
"webpack-cli": "^3.3.3",
"webpack-merge": "^4.2.1",
"webpack-node-externals": "^1.7.2"
}
Expand Down

0 comments on commit 714f3fc

Please sign in to comment.