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
11 changes: 6 additions & 5 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,16 @@ kind: pipeline
name: webpack-build

steps:
- name: submodules
image: docker:git
commands:
- git submodule update --init
- name: webpack-build
- name: build
image: nextcloudci/node:node-4
commands:
- cd /drone/src
- npm ci
- npm run build
- name: changes
image: nextcloudci/node:node-4
commands:
- cd /drone/src
- git status
- bash -c "[[ ! \"`git status --porcelain `\" ]] || ( echo 'Uncommited changes in webpack build' && exit 1 )"

Expand Down
2 changes: 1 addition & 1 deletion apps/settings/js/vue-6.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/settings/js/vue-6.js.map

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions apps/settings/js/vue-settings-apps-users-management.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions apps/workflowengine/css/multiselect.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#workflowengine .multiselect .multiselect__single {
display: flex;
}

#workflowengine .option__icon {
min-width: 25px;
}

#workflowengine input,
#workflowengine .multiselect {
width: 100%;
}
43 changes: 32 additions & 11 deletions apps/workflowengine/js/workflowengine.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/workflowengine/js/workflowengine.js.map

Large diffs are not rendered by default.

24 changes: 22 additions & 2 deletions apps/workflowengine/src/components/Checks/FileMimeType.vue
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
<!--
- @copyright Copyright (c) 2019 Julius Härtl <[email protected]>
-
- @author Julius Härtl <[email protected]>
-
- @license GNU AGPL version 3 or any later version
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation, either version 3 of the
- License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-->

<template>
<div>
<Multiselect
Expand Down Expand Up @@ -108,5 +130,3 @@ export default {
}
}
</script>

<style scoped src="./../../css/multiselect.css"></style>
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ export default {
required: true
},
value: {
type: Array,
default() {
return []
}
Expand Down
22 changes: 22 additions & 0 deletions apps/workflowengine/src/components/Checks/MultiselectTag/api.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
/**
* @copyright Copyright (c) 2019 Julius Härtl <[email protected]>
*
* @author Julius Härtl <[email protected]>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

import axios from 'nextcloud-axios'
import { generateRemoteUrl } from 'nextcloud-router'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
/**
* @copyright Copyright (c) 2019 Julius Härtl <[email protected]>
*
* @author Julius Härtl <[email protected]>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

import MultiselectTag from './MultiselectTag'

export default MultiselectTag
Expand Down
2 changes: 0 additions & 2 deletions apps/workflowengine/src/components/Checks/RequestURL.vue
Original file line number Diff line number Diff line change
Expand Up @@ -137,5 +137,3 @@ export default {
}
}
</script>

<style scoped src="./../../css/multiselect.css"></style>
Original file line number Diff line number Diff line change
Expand Up @@ -133,5 +133,3 @@ export default {
}
}
</script>

<style scoped src="./../../css/multiselect.css"></style>
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,3 @@ export default {
}
}
</script>

<style scoped src="./../../css/multiselect.css"></style>
2 changes: 1 addition & 1 deletion apps/workflowengine/src/components/Checks/file.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/**
* @copyright Copyright (c) 2019 Julius Härtl <[email protected]>
*
* @author Julius Härtl <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion apps/workflowengine/src/components/Checks/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/**
* @copyright Copyright (c) 2019 Julius Härtl <[email protected]>
*
* @author Julius Härtl <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion apps/workflowengine/src/components/Checks/request.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/**
* @copyright Copyright (c) 2019 Julius Härtl <[email protected]>
*
* @author Julius Härtl <[email protected]>
Expand Down
11 changes: 0 additions & 11 deletions apps/workflowengine/src/css/multiselect.css

This file was deleted.

2 changes: 1 addition & 1 deletion apps/workflowengine/src/helpers/api.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/**
* @copyright Copyright (c) 2019 Julius Härtl <[email protected]>
*
* @author Julius Härtl <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion apps/workflowengine/src/helpers/validators.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/**
* @copyright Copyright (c) 2019 Julius Härtl <[email protected]>
*
* @author Julius Härtl <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion apps/workflowengine/src/mixins/valueMixin.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/**
* @copyright Copyright (c) 2019 Julius Härtl <[email protected]>
*
* @author Julius Härtl <[email protected]>
Expand Down
27 changes: 25 additions & 2 deletions apps/workflowengine/src/workflowengine.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
/**
* @copyright Copyright (c) 2019 Julius Härtl <[email protected]>
*
* @author Julius Härtl <[email protected]>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

import Vue from 'vue'
import Vuex from 'vuex'
import store from './store'
Expand Down Expand Up @@ -65,6 +87,7 @@ Vue.use(Vuex)
Vue.prototype.t = t

const View = Vue.extend(Settings)
new View({
const workflowengine = new View({
store
}).$mount('#workflowengine')
})
workflowengine.$mount('#workflowengine')
4 changes: 3 additions & 1 deletion apps/workflowengine/templates/settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
use OCA\WorkflowEngine\AppInfo\Application;
style(Application::APP_ID, 'multiselect');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So... I'm happy it works now. But it still feels hacky. Including the CSS into the bundle is much nicer IMO (as it saves requests). But lets debug that later.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's ping @juliushaertl 🙈

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added it to the list to fix in #12790


/** @var array $_ */
/** @var \OCP\IL10N $l */
?>
<div id="<?php p(\OCA\WorkflowEngine\AppInfo\Application::APP_ID); ?>"></div>
<div id="<?php p(Application::APP_ID); ?>"></div>
9 changes: 5 additions & 4 deletions build/files-checker.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
'.babelrc',
'.codecov.yml',
'.drone.yml',
'.eslintrc.js',
'.git',
'.gitattributes',
'.github',
Expand Down Expand Up @@ -52,20 +53,20 @@
'config',
'console.php',
'contribute',
'COPYING',
'COPYING-README',
'COPYING',
'core',
'cron.php',
'index.html',
'index.php',
'lib',
'Makefile',
'occ',
'ocs',
'ocs-provider',
'ocm-provider',
'package.json',
'ocs-provider',
'ocs',
'package-lock.json',
'package.json',
'public.php',
'README.md',
'remote.php',
Expand Down
2 changes: 1 addition & 1 deletion core/js/dist/login.js

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

2 changes: 1 addition & 1 deletion core/js/dist/login.js.map

Large diffs are not rendered by default.

Loading