Commit Graph

7864 Commits

Author SHA1 Message Date
Anton Georgiev
c9f8683e0b Merge remote-tracking branch 'perroned/prototype-metor-client' into meteor-rebuild-server 2014-06-11 19:45:02 +00:00
Anton Georgiev
0f680bd4d5 cleaning up 2014-06-11 19:38:47 +00:00
Anton Georgiev
fc9c2adf3e still have to connect bunyan 2014-06-11 19:26:46 +00: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
Anton Georgiev
22a31392f4 I think I resolved the coffeescript class structure problem 2014-06-11 17:56:07 +00:00
Anton Georgiev
1ccc24d71c subscribing and publishing (simple version) 2014-06-11 17:12:51 +00:00
Anton Georgiev
46a231c3c0 config is found, redis is found 2014-06-11 16:11:23 +00: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
perroned
4e19f83006 Merge branch 'prototype-meteor-client' of https://github.com/bigbluebutton/bigbluebutton into prototype-metor-client 2014-06-09 08:02:43 -07:00
Anton Georgiev
ebb0424856 Merge branch 'prototype-meteor-client' of https://github.com/bigbluebutton/bigbluebutton into prototype-meteor-client
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
2014-06-09 14:51:59 +00:00
perroned
6dcf442f1b pushing changes to carry over work between computers 2014-06-09 06:29:12 -07:00
Richard Alam
b19053980a - set user id 2014-06-06 15:51:12 -07:00
Richard Alam
1f9fe5cac7 - meteor 2014-06-06 15:19:09 -07:00
Chad Pilkey
cbfcdc231c Merge pull request #333 from SenecaCDOT-BigBlueButton/fix-phonenumber-text
Addendum to #332
2014-06-05 17:06:46 -04:00
Chad Pilkey
893c977ec9 forgot to add the new config property to the template 2014-06-05 14:04:19 -07:00
Richard Alam
2a0afbc6cc Merge pull request #332 from SenecaCDOT-BigBlueButton/fix-phonenumber-text
Fix phone number text in audio selection
2014-06-05 16:56:45 -04:00
Chad Pilkey
632096fd64 the phone option is now somewhat configurable 2014-06-05 13:52:37 -07:00
Anton Georgiev
f80044f682 fix zoom + scale shape 2014-06-05 20:23:47 +00:00
Anton Georgiev
ef27d4424b at this stage we can make, update, draw a rectangle with a single send_whiteboard_shape_message 2014-06-05 19:27:42 +00:00
perroned
bcc1dcf34d Removing users functionality from view into models 2014-06-04 13:18:10 -07:00
Richard Alam
94405b8e35 Merge pull request #331 from SenecaCDOT-BigBlueButton/alternate-upload-dialog-spawn
Cleaned up the FileUploadWindow
2014-06-04 15:04:32 -04:00
Chad Pilkey
9b86798f21 cleaned up the file upload window and made it so that when you click the file name it will open the native file dialog 2014-06-04 11:47:24 -07:00
Anton Georgiev
852d7b1788 commenting out unused code 2014-06-04 18:31:35 +00:00
Anton Georgiev
4f4c0a57b9 commented out the messages that are not supported right now, so it is more clear what works and what does not 2014-06-04 18:12:24 +00:00
Anton Georgiev
d25ac63362 worked on dispatching a request for whiteboard shapes and waiting for reply 2014-06-04 15:14:23 +00:00
Anton Georgiev
3b9e50f2d0 adding a whiteboard listener 2014-06-04 15:12:49 +00:00
Richard Alam
8015eeeecd Merge branch 'merge-polling-with-master' of github.com:bigbluebutton/bigbluebutton into merge-polling-with-master 2014-06-03 19:20:44 -07:00
Richard Alam
3051bf9dd5 - change color of user talking icon glow 2014-06-03 19:19:47 -07:00
Richard Alam
d7b6918340 Merge pull request #330 from SenecaCDOT-BigBlueButton/fix-webrtc-dialogs
add audio selection window
2014-06-03 19:36:52 -04:00
Anton Georgiev
42832891d6 rearranging 2014-06-03 21:12:37 +00:00
perroned
f71031b3f8 Cleaned up how meeting name is passed around, removed duplicated code and functions 2014-06-03 13:54:24 -07:00
Chad Pilkey
344103922a moved the webrtc call failed alertbox text to locales 2014-06-03 13:14:05 -07:00
perroned
be6b1cc918 Fixed someone's typo for a CSS field 2014-06-03 12:52:42 -07:00
perroned
ae1c01e194 Removing useless code 2014-06-03 12:26:59 -07:00
perroned
b8eafc5312 Forgot to put meeting name back into url for last commit 2014-06-03 12:25:43 -07:00
Chad Pilkey
b1da215ac2 if presenterShareOnly is true don't switch moderators to listen only when presenter changes 2014-06-03 12:14:51 -07:00
perroned
eb83bb7bfa Non-ideal fix for hiding-showing the users list 2014-06-03 11:51:59 -07:00
perroned
22db0d8dc9 Fixed meeting name so it shows up in chat, added it to the url 2014-06-03 11:48:02 -07:00
perroned
70da7d1deb test 2014-06-03 11:45:05 -07:00
Anton Georgiev
7d85751a43 fix indent + clean up 2014-06-03 17:09:11 +00:00
Chad Pilkey
cfc49f51d5 Merge pull request #319 from SenecaCDOT-BigBlueButton/fix-presentation-control-bar
Fix presentation control bar
2014-06-03 12:07:21 -04:00
Chad Pilkey
f6cb040908 moved the audio selection window strings to the locale file 2014-06-03 09:00:41 -07:00
Anton Georgiev
25275821af on logout the entire user row in the user list is removed 2014-06-03 14:40:35 +00:00
Chad Pilkey
d0618c1a03 added presenterShareOnly, error popup when webrtc fails with option to fallback to flash 2014-06-02 15:16:52 -07:00
Anton Georgiev
daea03df05 altered the flow of events. we first receive the get users reply and then we join the meeting. checks have been introduced to see if the user added to the list has the correct fields 2014-06-02 21:40:23 +00:00