Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {
extends: [
'@nextcloud'
]
};
'@nextcloud',
],
}
44 changes: 44 additions & 0 deletions .github/workflows/lint-stylelint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# This workflow is provided via the organization template repository
#
# https://github.com/nextcloud/.github
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization

name: Lint

on:
pull_request:
push:
branches:
- master
- stable*

jobs:
lint:
runs-on: ubuntu-latest

name: stylelint

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Read package.json node and npm engines version
uses: skjnldsv/[email protected]
id: versions
with:
fallbackNode: '^12'
fallbackNpm: '^6'

- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
uses: actions/setup-node@v2
with:
node-version: ${{ steps.versions.outputs.nodeVersion }}

- name: Set up npm ${{ steps.versions.outputs.npmVersion }}
run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"

- name: Install dependencies
run: npm ci

- name: Lint
run: npm run stylelint
26 changes: 0 additions & 26 deletions .stylelintrc.js

This file was deleted.

4 changes: 2 additions & 2 deletions js/privacy-main.js

Large diffs are not rendered by default.

26 changes: 10 additions & 16 deletions js/privacy-main.js.LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
/*
object-assign
(c) Sindre Sorhus
@license MIT
*/

/*!
* Toastify js 1.9.1
* https://github.com/apvarun/toastify-js
* @license MIT licensed
*
* Copyright (C) 2018 Varun A P
*/

/*!
* Determine if an object is a Buffer
*
Expand All @@ -27,11 +13,19 @@ object-assign
*/

/*!
* Vue.js v2.6.12
* (c) 2014-2020 Evan You
* Vue.js v2.6.14
* (c) 2014-2021 Evan You
* Released under the MIT License.
*/

/*!
* escape-html
* Copyright(c) 2012-2013 TJ Holowaychuk
* Copyright(c) 2015 Andreas Lubbe
* Copyright(c) 2015 Tiancheng "Timothy" Gu
* MIT Licensed
*/

/**
* @copyright Copyright (c) 2018 John Molakvoæ <[email protected]>
*
Expand Down
2 changes: 1 addition & 1 deletion js/privacy-main.js.map

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions lib/Settings/MissionSettings.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ class MissionSettings implements ISettings {
* @return TemplateResponse
*/
public function getForm():TemplateResponse {
\OCP\Util::addScript('privacy', 'privacy-main');
\OCP\Util::addStyle('privacy', 'privacy');
return new TemplateResponse('privacy', 'mission');
}

Expand Down
Loading