Skip to content

Replace the icon-class with an absolute link to an image #14664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 8 commits into from
Mar 19, 2019
Merged

Replace the icon-class with an absolute link to an image #14664

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
403b673
Replace the icon-class with an absolute link to an image
nickvergessen Mar 13, 2019
3022ef6
Use rich objects instead of name, link and icon
nickvergessen Mar 14, 2019
e8fe000
Dispatch event to allow apps to load their script for collections
juliusknorr Mar 14, 2019
8a26022
Adjust resource type to file
juliusknorr Mar 14, 2019
ec63d4b
Adjust gitattributes to ignore all files_sharing scripts in diff
juliusknorr Mar 14, 2019
39438cf
Bump nextcloud-vue-collections
juliusknorr Mar 14, 2019
5de3a0f
Bump bundles
juliusknorr Mar 14, 2019
21425eb
Return 200 instead of 404 when asking for collections of a resource
nickvergessen Mar 18, 2019
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
Prev Previous commit
Next Next commit
Adjust resource type to file 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed Mar 19, 2019
commit 8a26022f921f169198fa3e1b2dd79e62914c5dc0
2 changes: 1 addition & 1 deletion apps/files_sharing/src/collaborationresourceshandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
__webpack_public_path__ = OC.linkTo('files_sharing', 'js/dist/');
__webpack_nonce__ = btoa(OC.requestToken);

window.OCP.Collaboration.registerType('files', {
window.OCP.Collaboration.registerType('file', {
action: () => {
return new Promise((resolve, reject) => {
OC.dialogs.filepicker('Link to a file', function (f) {
Expand Down
2 changes: 1 addition & 1 deletion apps/files_sharing/src/views/CollaborationView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
-->

<template>
<collection-list v-if="fileId" type="files" :id="fileId" :name="filename"></collection-list>
<collection-list v-if="fileId" type="file" :id="fileId" :name="filename"></collection-list>
</template>

<script>
Expand Down
1 change: 0 additions & 1 deletion core/src/OCP/collaboration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ export default {
* @param {TypeDefinition} typeDefinition
*/
registerType(type, typeDefinition) {
console.log('Type ' + type + ' registered')
types[type] = typeDefinition;
},
trigger(type) {
Expand Down