Skip to content

Add a provider for linked collaboration resources #1611

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 20 commits into from
Mar 29, 2019
Merged

Add a provider for linked collaboration resources #1611

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
18b75cf
Add a provider for linked collaboration resources
nickvergessen Mar 13, 2019
22137e0
Update lib/Collaboration/Resources/ConversationProvider.php
juliusknorr Mar 14, 2019
5dd9930
WIP: Add collections frontend
juliusknorr Mar 14, 2019
a85b533
Add sidebar tab
juliusknorr Mar 22, 2019
c0bc066
Add icon to resource objects
juliusknorr Mar 22, 2019
35c5adf
Move views to proper folder
juliusknorr Mar 25, 2019
536c649
Fix eslint
juliusknorr Mar 25, 2019
0b4e604
Adapt new library version
juliusknorr Mar 25, 2019
59699e7
Bump bundles
juliusknorr Mar 22, 2019
4e8deb4
Adjust ignore files
nickvergessen Mar 25, 2019
e013471
Make the image-path absolute and fix non-public-rooms
nickvergessen Mar 25, 2019
b906238
Fix scrollbar and hide current room
juliusknorr Mar 25, 2019
95c1148
Add a link for rooms
nickvergessen Mar 26, 2019
bc1614a
Fix eslint warning
nickvergessen Mar 26, 2019
c83f0c3
'Handlebars' is defined but never used no-unused-vars
nickvergessen Mar 27, 2019
2b660fb
Catch a missing resource, so the tests work again
nickvergessen Mar 27, 2019
baa0cdc
Remove unused global
nickvergessen Mar 27, 2019
7ba4a58
Fix highlight when room is selected and exclude file/password rooms
nickvergessen Mar 27, 2019
3243de8
Fix missing room name of one-to-one rooms
nickvergessen Mar 28, 2019
1c3f4d3
Update the lib to the latest
nickvergessen Mar 28, 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
Add sidebar tab 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr @nickvergessen
juliusknorr authored and nickvergessen committed Mar 27, 2019
commit a85b5338834c709ea826a2852b2382ced9425e95
14 changes: 13 additions & 1 deletion js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@
_participants: null,
/** @property {OCA.SpreedMe.Views.ParticipantView} _participantsView */
_participantsView: null,
/** @property {OCA.SpreedMe.Views.CollectionsView} _collectionsView */
_collectionsView: null,
fullscreenDisabled: true,
_searchTerm: '',
guestNick: null,
Expand Down Expand Up @@ -288,7 +290,17 @@
});

this._sidebarView.addTab('participants', { label: t('spreed', 'Participants'), icon: 'icon-contacts-dark' }, this._participantsView);
this._sidebarView.addTab('collections', { label: t('spreed', 'Collections'), icon: 'icon-' }, this._participantsView);

this._collectionsView = new OCA.SpreedMe.Views.CollectionsView({
room: this.activeRoom,
id: 'collectionsTabView'
});
this._collectionsView.listenTo(this._rooms, 'change:active', function(model, active) {
if (active) {
this.setRoom(model);
}
});
this._sidebarView.addTab('collections', { label: t('spreed', 'Collections'), icon: 'icon-category-integration' }, this._collectionsView);
},
_hideParticipantList: function() {
this._sidebarView.removeTab('participants');
Expand Down
2 changes: 2 additions & 0 deletions js/merged.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"vendor/Caret.js/dist/jquery.caret.min.js",
"vendor/At.js/dist/js/jquery.atwho.min.js",
"simplewebrtc/bundled.js",
"collectionsintegration.js",
"models/chatmessage.js",
"models/chatmessagecollection.js",
"models/room.js",
Expand All @@ -16,6 +17,7 @@
"views/callbutton.js",
"views/callinfoview.js",
"views/chatview.js",
"views/collectionsview.js",
"views/editabletextlabel.js",
"views/emptycontentview.js",
"views/localvideoview.js",
Expand Down