perroned
|
239666d2ef
|
Trying to fix up, still a big mess
|
2014-07-10 07:36:29 -07:00 |
|
perroned
|
4001373438
|
Still trying to get the tabs UI working
|
2014-07-10 06:11:38 -07:00 |
|
perroned
|
e91f0e832e
|
Merge branch 'meteor-merge-private-chat' of https://github.com/antobinary/bigbluebutton into prototype-metor-client
|
2014-07-09 09:08:07 -07:00 |
|
Anton Georgiev
|
884cce7e9b
|
the client will have access only to the meeting they are in so they can see the meeting"s name and record status
|
2014-07-09 16:06:25 +00:00 |
|
perroned
|
328872b222
|
Merge branch 'meteor-merge-private-chat' of https://github.com/antobinary/bigbluebutton into prototype-metor-client
|
2014-07-09 08:38:25 -07:00 |
|
perroned
|
2797bb15f3
|
Updated bootstrap
|
2014-07-09 08:36:08 -07:00 |
|
Anton Georgiev
|
1c1815fb16
|
missed these changes in the merge
|
2014-07-09 15:26:12 +00:00 |
|
Anton Georgiev
|
3ad1bdd341
|
Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-merge-private-chat
Conflicts:
labs/meteor-client/client/globals.coffee
labs/meteor-client/client/views/chat/chat_bar.coffee
labs/meteor-client/collections/collections.coffee
labs/meteor-client/lib/router.coffee
labs/meteor-client/server/publish.coffee
labs/meteor-client/server/server.coffee
|
2014-07-09 15:09:27 +00:00 |
|
perroned
|
af3c7f4896
|
Removed old comment
|
2014-07-09 06:31:04 -07:00 |
|
perroned
|
df4a393b12
|
Added method for getting meeting name
|
2014-07-09 06:28:33 -07:00 |
|
perroned
|
098a4c7f81
|
Added private chat and chat tabs functionality. Tab UI is still buggy.
|
2014-07-09 06:18:52 -07:00 |
|
perroned
|
a304301bd4
|
By default youre in public chat
|
2014-07-09 06:16:17 -07:00 |
|
perroned
|
4460127b6a
|
Method for getting user's name'
|
2014-07-09 06:15:50 -07:00 |
|
Anton Georgiev
|
48010179e5
|
fixed adding to Slides collection
|
2014-07-08 17:15:30 +00:00 |
|
Anton Georgiev
|
abddc57c6f
|
worked on slides collection
|
2014-07-08 15:14:55 +00:00 |
|
Anton Georgiev
|
168eb4e715
|
adding Slides collection
|
2014-07-07 20:58:50 +00:00 |
|
Anton Georgiev
|
7aef935771
|
filter log messages from flooding event types - cursor update, page resizing...
|
2014-07-07 20:51:33 +00:00 |
|
Anton Georgiev
|
86e90bbdef
|
forgot to publish the Shapes collection
|
2014-07-07 20:31:18 +00:00 |
|
Anton Georgiev
|
4adef66799
|
remove redundant meetingId decl
|
2014-07-07 20:21:36 +00:00 |
|
Anton Georgiev
|
498472969e
|
adding a shape to the collection
|
2014-07-07 20:17:09 +00:00 |
|
Anton Georgiev
|
c74737d66c
|
adding a Shapes collection
|
2014-07-07 19:08:24 +00:00 |
|
Anton Georgiev
|
f1416a49a5
|
on get_presentation_info_reply request shapes
|
2014-07-07 18:04:47 +00:00 |
|
Anton Georgiev
|
3d00b2f2b8
|
changed logging style
|
2014-07-07 18:03:33 +00:00 |
|
perroned
|
8bc9ace261
|
Make tabs reappear
|
2014-07-07 08:31:29 -07:00 |
|
perroned
|
adb7dbc77c
|
working on private chat tabs
|
2014-07-07 08:30:17 -07:00 |
|
perroned
|
d0d4227d17
|
Made a tab creation helper
|
2014-07-04 08:00:46 -07:00 |
|
Anton Georgiev
|
c79c17d61a
|
stop sending userName and meetingName via the URL. Now we can obtain them from bbb-apps and the Collections
|
2014-07-03 20:50:24 +00:00 |
|
Anton Georgiev
|
561d099eec
|
display number of meetingsin console.log
|
2014-07-03 20:40:36 +00:00 |
|
Anton Georgiev
|
52202527a8
|
use the user's username when sending a chat message
|
2014-07-03 20:39:47 +00:00 |
|
Anton Georgiev
|
25cbf5af27
|
fix removing users from Users
|
2014-07-03 18:44:05 +00:00 |
|
Anton Georgiev
|
f651744da9
|
handle end of meeting + some cleanup
|
2014-07-03 18:31:32 +00:00 |
|
perroned
|
837edef50b
|
Created array to keep track of tabs
|
2014-07-03 10:56:56 -07:00 |
|
perroned
|
1b01ce8666
|
Added private chat creation and UI
|
2014-07-03 10:56:16 -07:00 |
|
perroned
|
94fe921ad6
|
Added private chat selectors
|
2014-07-03 10:55:32 -07:00 |
|
perroned
|
75bc1500e6
|
Added the default tabs
|
2014-07-03 10:55:06 -07:00 |
|
perroned
|
5d03c2651b
|
Added functions for adding new tabs
|
2014-07-03 10:54:41 -07:00 |
|
Anton Georgiev
|
444aef0b25
|
Meetings collection, adding to it on Server.start
|
2014-07-03 15:52:43 +00:00 |
|
Anton Georgiev
|
39d62e1d4a
|
now get_all_meetings_reply returns info about meetingName and recorded status
|
2014-07-03 15:30:06 +00:00 |
|
Anton Georgiev
|
1cec101920
|
obtaining meetingName from MeetingActor
|
2014-07-03 14:36:20 +00:00 |
|
Anton Georgiev
|
3fa27ae11a
|
Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-rebuild-server
Conflicts:
labs/meteor-client/client/globals.coffee
|
2014-07-02 19:10:12 +00:00 |
|
Anton Georgiev
|
c40bcece8f
|
cleaning up
|
2014-07-02 17:57:07 +00:00 |
|
Anton Georgiev
|
22785c12bc
|
cleaning up. The client side can only see one meeting
|
2014-07-02 17:13:00 +00:00 |
|
perroned
|
775d4ef0eb
|
Added comments for future changes - 2
|
2014-07-02 09:23:30 -07:00 |
|
perroned
|
5c326e0cd6
|
Added comments for future changes
|
2014-07-02 09:21:33 -07:00 |
|
perroned
|
a85a706d1d
|
Updated templates to new message format, the chat now displays real messages
|
2014-07-02 09:17:05 -07:00 |
|
perroned
|
d9eb0c8cf2
|
Changes
|
2014-07-02 08:43:56 -07:00 |
|
perroned
|
a8defa1c30
|
Changes
|
2014-07-02 08:41:12 -07:00 |
|
Anton Georgiev
|
5ea58dfb23
|
fixing user logout
|
2014-07-02 15:09:55 +00:00 |
|
Anton Georgiev
|
2b2622ecc9
|
fixing when a chat message is added to a collection
|
2014-07-02 15:08:56 +00:00 |
|
Anton Georgiev
|
773825de73
|
fixing chat so that we only call Meteor.redisPubSub from within RedisPubSub
|
2014-07-02 14:47:22 +00:00 |
|