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
|
098a4c7f81
|
Added private chat and chat tabs functionality. Tab UI is still buggy.
|
2014-07-09 06:18:52 -07: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
|
52202527a8
|
use the user's username when sending a chat message
|
2014-07-03 20:39:47 +00:00 |
|
perroned
|
1b01ce8666
|
Added private chat creation and UI
|
2014-07-03 10:56:16 -07: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
|
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
|
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
|
d599a782a3
|
cleaning up
|
2014-06-27 19:47:16 +00:00 |
|
perroned
|
2beb2868b1
|
commented
|
2014-06-27 12:29:07 -07:00 |
|
Anton Georgiev
|
2fb970d9cd
|
adjusting the parameter names so that they match what is recognized on the server
|
2014-06-27 19:10:11 +00:00 |
|
Anton Georgiev
|
d6851c39a4
|
when we try to send a chat message from the html5 client we now send a send_public_chat_message_request towards bbb-apps
|
2014-06-27 17:53:31 +00:00 |
|
Anton Georgiev
|
9a9c80efab
|
when we press Enter, the chat message enters the collection
|
2014-06-27 17:31:01 +00:00 |
|
perroned
|
d53e340f28
|
Fixed bug in sending message, missing parentheses
|
2014-06-27 10:22:56 -07:00 |
|
perroned
|
8a213f6354
|
stress the current user
|
2014-06-27 06:59:31 -07:00 |
|
perroned
|
50e746e5da
|
Fixed bug where help link changed current page, now opens new tab
|
2014-06-26 13:15:31 -07:00 |
|
perroned
|
090c5ae595
|
Fixed issue with no server version being displayed
|
2014-06-26 13:11:31 -07:00 |
|
perroned
|
f270f74903
|
Implemented auto scrolling to the bottom of the chat messages window, building chat message to send to server
|
2014-06-26 12:58:58 -07:00 |
|
perroned
|
2123998bcb
|
Changed some toggles, fixed up some UI, more chat functionality
|
2014-06-26 10:13:19 -07:00 |
|
perroned
|
46cdeafabb
|
Cleaned up lots of code, changed toggles to server calls
|
2014-06-26 08:14:43 -07:00 |
|
perroned
|
8971b21a90
|
Added some comments
|
2014-06-26 08:13:29 -07:00 |
|
perroned
|
7ac36b1cf6
|
Tidy up, more chat UI, log out user info to check for duplicates'
|
2014-06-25 11:51:16 -07:00 |
|
perroned
|
efb2177b2b
|
Fixing up some UI
|
2014-06-25 07:04:04 -07:00 |
|
perroned
|
30bae7c80f
|
Recreating chat UI
|
2014-06-25 06:28:15 -07:00 |
|
perroned
|
806bf90b4c
|
Some tidying up and making things more proper
|
2014-06-24 11:39:32 -07:00 |
|
perroned
|
3eb07aec15
|
Fixed a bug when switching panes
|
2014-06-24 11:36:22 -07:00 |
|
perroned
|
34e62b838e
|
Moved function
|
2014-06-24 11:11:51 -07:00 |
|
perroned
|
13df1b475b
|
Working on chat UI
|
2014-06-24 11:11:26 -07:00 |
|
perroned
|
067463b866
|
beginning work on the chat UI
|
2014-06-24 06:46:42 -07:00 |
|
perroned
|
c282b46b4c
|
Cleaning up the code a bit, placed rendering logic inside individual templates to be a bit neater
|
2014-06-23 12:54:17 -07:00 |
|
perroned
|
ac61ea7a24
|
Added sample whiteboard entry
|
2014-06-23 12:51:54 -07:00 |
|
perroned
|
c76378edff
|
Added logout page
|
2014-06-23 12:11:57 -07:00 |
|
perroned
|
6005ea000e
|
Fixed kicking users... for now, until things change again
|
2014-06-23 10:20:08 -07:00 |
|
perroned
|
63a3a4c737
|
Created a helper and rewrote logic to determine if user is sharing audio/video
|
2014-06-23 09:58:30 -07:00 |
|
perroned
|
70714bd320
|
Fixed some helpers and templates to match data format
|
2014-06-23 06:22:30 -07:00 |
|
perroned
|
466787ab47
|
Added new line feeds to files
|
2014-06-23 06:21:03 -07:00 |
|
perroned
|
b63a1cb549
|
Fixed setPresenter helper
|
2014-06-23 06:17:19 -07:00 |
|
perroned
|
01b7fc9111
|
Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client
Conflicts:
labs/meteor-client/client/views/users/user_list.coffee
labs/meteor-client/server/insert-startup-data.js
|
2014-06-20 07:32:12 -07:00 |
|
Anton Georgiev
|
82b8f9d134
|
Meteor.users -> Meteor.Users the collection should start with a capital letter
|
2014-06-19 21:29:52 +00:00 |
|
perroned
|
4e3dc04573
|
Removed 'sign in as...' buttons
|
2014-06-19 11:13:52 -07:00 |
|
perroned
|
124068a590
|
Use data from session now
|
2014-06-19 10:52:08 -07:00 |
|
perroned
|
eeb4558f92
|
Beginning chat system
|
2014-06-19 06:29:48 -07:00 |
|
perroned
|
6e1ec8f200
|
Updated more buttons to templates. Still trying to clean up code
|
2014-06-17 08:47:26 -07:00 |
|
perroned
|
18e729eaf1
|
Fixed some queries
|
2014-06-17 08:46:49 -07:00 |
|
perroned
|
1280a4dccf
|
Changed button html to template
|
2014-06-17 08:08:34 -07:00 |
|
perroned
|
9f34755d88
|
Updated query based on available data
|
2014-06-17 08:08:07 -07:00 |
|
perroned
|
096892264d
|
Formatting data into table cells
|
2014-06-16 12:11:55 -07:00 |
|
perroned
|
c52bef4e3c
|
Formatting data into table cells
|
2014-06-16 12:11:22 -07:00 |
|
perroned
|
c12942aa45
|
Added scrolling in user's list
|
2014-06-16 11:31:44 -07:00 |
|
perroned
|
abdf769a2f
|
Using bootstrap classes for layouts
|
2014-06-16 10:47:55 -07:00 |
|
perroned
|
4352bc2721
|
Restructured page layouts. There has to be a better way to do this. Spacebars is a pain
|
2014-06-16 10:47:16 -07:00 |
|
perroned
|
c20e7e2d1b
|
Shortened some code. Added special handlers allowing for mods to edit another's user's data
|
2014-06-16 10:45:17 -07:00 |
|
perroned
|
1948e7c7a2
|
Removed uneeded functions to a different more appropriate scope
|
2014-06-13 11:17:58 -07:00 |
|
perroned
|
d0747c9418
|
Added iron router
|
2014-06-13 09:22:30 -07:00 |
|
perroned
|
8cabd766dc
|
Some prettying up a bit with bootstrap
|
2014-06-12 12:12:09 -07:00 |
|
perroned
|
ef0272f768
|
Fixing up users collection to use meteor's built in users collection, fixed up some meteor-coffeescript compatability issues
|
2014-06-12 08:12:25 -07:00 |
|
perroned
|
21d9c7799f
|
Migrating to coffeescript
|
2014-06-12 07:08:55 -07:00 |
|
perroned
|
2978ba1eed
|
Fixed a bug with presenters and deletion
|
2014-06-12 06:18:40 -07:00 |
|
perroned
|
e609d2df9f
|
Fixed up some permissions issues
|
2014-06-11 11:56:04 -07:00 |
|
perroned
|
740a3056e0
|
Implementing pseudo log in, to alter view based on user'
|
2014-06-11 11:52:58 -07:00 |
|
perroned
|
b86c9c8cce
|
Added user toggles. And made them only accessible to individual user (i.e. moderator should only be able to turn off a students webcam and mic, not on
|
2014-06-11 09:11:07 -07:00 |
|
perroned
|
26c7050283
|
Trying to implement css/less from html5, cleaned up code a bit, added functionality to buttons
|
2014-06-11 08:21:09 -07:00 |
|
perroned
|
4e30f69e81
|
Added a few buttons that would show up for moderators or presenters
|
2014-06-10 12:59:58 -07:00 |
|
perroned
|
19ba6f37e2
|
Just a few comments
|
2014-06-10 12:26:42 -07:00 |
|
perroned
|
cb8b0d0e11
|
basic functionality for users
|
2014-06-10 12:19:20 -07:00 |
|
Richard Alam
|
1f9fe5cac7
|
- meteor
|
2014-06-06 15:19:09 -07:00 |
|