Skip to content

Rename linked collections to projects #1663

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
nickvergessen merged 1 commit into from
Apr 9, 2019
Merged

Rename linked collections to projects #1663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
NOTIFY_MENTION: 2,
NOTIFY_NEVER: 3,


/* Must stay in sync with values in "lib/Room.php". */
FLAG_DISCONNECTED: 0,
FLAG_IN_CALL: 1,
Expand Down Expand Up @@ -301,7 +302,7 @@
this.setRoom(model);
}
});
this._sidebarView.addTab('collections', { label: t('spreed', 'Collections'), icon: 'icon-category-integration' }, this._collectionsView);
this._sidebarView.addTab('collections', { label: t('spreed', 'Projects'), icon: 'icon-projects' }, this._collectionsView);
},
_hideParticipantList: function() {
this._sidebarView.removeTab('participants');
Expand Down
4 changes: 2 additions & 2 deletions js/collections.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/collections.js.map
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions js/collectionsintegration.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/collectionsintegration.js.map
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions vue/package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion vue/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"debounce": "^1.2.0",
"nextcloud-axios": "^0.1.3",
"nextcloud-vue": "^0.9.7",
"nextcloud-vue-collections": "^0.3.0",
"nextcloud-vue-collections": "^0.4.0",
"vue": "^2.6.10",
"vue-fragment": "^1.5.0",
"vuex": "^3.1.0"
Expand Down
2 changes: 1 addition & 1 deletion vue/src/collections.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ import RoomSelector from './views/RoomSelector'
})
})
},
typeString: t('spreed', 'room'),
typeString: t('spreed', 'Link to a conversation'),
typeIconClass: 'icon-talk'
})
})(window.OCP, window.OC)
4 changes: 2 additions & 2 deletions vue/src/views/RoomSelector.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<modal @close="close">
<div id="modal-inner" :class="{ 'icon-loading': loading }">
<div id="modal-content">
<h1>{{ t('spreed', 'Select a room to link to the collection') }}</h1>
<h1>{{ t('spreed', 'Select a conversation to add to the project') }}</h1>
<div id="room-list">
<ul v-if="!loading">
<li v-for="room in availableRooms" :key="room.token" :class="{selected: selectedRoom === room.token }"
Expand All @@ -38,7 +38,7 @@
</div>
<div id="modal-buttons">
<button v-if="!loading" class="primary" @click="select">
{{ t('spreed', 'Select room') }}
{{ t('spreed', 'Select conversation') }}
</button>
</div>
</div>
Expand Down