Richard Alam
|
71cff3bfe6
|
- extract some user code from flex module. Module should only be for the UI.
|
2014-05-23 13:24:01 -07:00 |
|
Anton Georgiev
|
e63ce2074d
|
Merge branch 'merge-polling-with-master' of https://github.com/bigbluebutton/bigbluebutton into merge-polling-with-master
|
2014-05-23 17:36:09 +00:00 |
|
Richard Alam
|
970be7f8d9
|
Merge branch 'merge-polling-with-master' of github.com:antobinary/bigbluebutton into merge-polling-with-master
|
2014-05-23 10:30:42 -07:00 |
|
Richard Alam
|
6eee34b86c
|
- remove some of the menu items for the gear icon
|
2014-05-23 10:29:09 -07:00 |
|
Richard Alam
|
87b776ad58
|
- fix sending of lock settings to server
|
2014-05-23 08:47:13 -07:00 |
|
Anton Georgiev
|
06fa37e685
|
cleaning up
|
2014-05-23 14:16:56 +00:00 |
|
Anton Georgiev
|
54ffccf8ac
|
get_chat_history, get_chat_history_reply. The history should be displaying properly but I should first fix sending a chat message. Otherwise the history will remain empty
|
2014-05-22 21:52:36 +00:00 |
|
Anton Georgiev
|
3b6331997f
|
cleaning up
|
2014-05-22 21:50:51 +00:00 |
|
Anton Georgiev
|
f676657b3b
|
displays the users in the UI userlist
|
2014-05-22 19:25:00 +00:00 |
|
Richard Alam
|
5c844ffeee
|
- send lock settings to server
|
2014-05-22 11:41:59 -07:00 |
|
Anton Georgiev
|
2ce8eab68c
|
Merge branch 'implement-lock-settings' of https://github.com/bigbluebutton/bigbluebutton into merge-polling-with-master
|
2014-05-22 18:20:46 +00:00 |
|
Anton Georgiev
|
b7b075ce71
|
work on user_joined_event prior to get_users_request
|
2014-05-22 18:20:21 +00:00 |
|
Richard Alam
|
1ab0b0a2c4
|
- send new lock settings to server
|
2014-05-22 11:13:00 -07:00 |
|
Richard Alam
|
52f0e5e00a
|
- require only meetingid and userid for join_user message
|
2014-05-22 11:12:20 -07:00 |
|
Richard Alam
|
1b8fa657ce
|
- send lock settings from server to client
|
2014-05-22 08:30:46 -07:00 |
|
Anton Georgiev
|
f9ecc5b9a7
|
get_users_request + reply ... the array of users is empty for now, I wonder if it will contain users if my user is not the only one in the meeting
|
2014-05-22 15:22:13 +00:00 |
|
Anton Georgiev
|
28ad6da463
|
fix indents
|
2014-05-22 15:20:46 +00:00 |
|
Richard Alam
|
0e29e7fc45
|
- start implementing lock settings
|
2014-05-21 15:06:38 -07:00 |
|
Richard Alam
|
4a4241ee78
|
- make sure create, register user and validate are in correct sequence
|
2014-05-21 13:56:37 -07:00 |
|
Chad Pilkey
|
b4b5e7793c
|
Merge remote-tracking branch 'upstream/merge-polling-with-master' into fix-webrtc-dialogs
|
2014-05-21 12:33:34 -07:00 |
|
Chad Pilkey
|
679b899b74
|
first take at new audio dialogs
|
2014-05-21 12:14:08 -07:00 |
|
Richard Alam
|
f266067e1a
|
- display message to user when auth token is invalid
|
2014-05-21 18:42:49 +00:00 |
|
Anton Georgiev
|
f78264e9da
|
a joining user is displayed in the user list
|
2014-05-21 15:57:10 +00:00 |
|
Anton Georgiev
|
aa85b3343d
|
fixing indentations
|
2014-05-21 14:31:55 +00:00 |
|
Anton Georgiev
|
f66bb034d9
|
register user
|
2014-05-21 14:30:51 +00:00 |
|
Anton Georgiev
|
6ff8b5fd69
|
Merge branch 'merge-polling-with-master' of https://github.com/bigbluebutton/bigbluebutton into merge-polling-with-master
|
2014-05-20 18:55:03 +00:00 |
|
Anton Georgiev
|
fcbf2f8740
|
working on validate_auth_token_reply - added logs so we can clearly see the validation process/status
|
2014-05-20 18:54:20 +00:00 |
|
Ubuntu
|
87fba474a2
|
Merge branch 'fix-meeting-lifecycle' into merge-polling-with-master
|
2014-05-20 18:30:51 +00:00 |
|
Richard Alam
|
53a86bafba
|
- add check to handle whne user has joined the meeting
|
2014-05-20 15:35:03 +00:00 |
|
Fred Dixon
|
86f9b53e88
|
Fix for issue #1720
|
2014-05-19 21:10:07 -04:00 |
|
Fred Dixon
|
7b0dd94f52
|
Removed duplicated code
|
2014-05-18 22:02:21 -04:00 |
|
Anton Georgiev
|
708edc8cde
|
Merge branch 'merge-polling-with-master' of https://github.com/bigbluebutton/bigbluebutton into merge-polling-with-master
|
2014-05-16 20:59:06 +00:00 |
|
Anton Georgiev
|
7fcc9dcdc2
|
cleaning up
|
2014-05-16 20:58:20 +00:00 |
|
Richard Alam
|
653c12ef0e
|
- fix param names
|
2014-05-16 20:54:50 +00:00 |
|
Richard Alam
|
3a3f0ec9e3
|
Merge branch 'merge-polling-with-master' of github.com:antobinary/bigbluebutton into merge-polling-with-master
|
2014-05-16 19:16:34 +00:00 |
|
Anton Georgiev
|
b2b1321460
|
worked on validate auth_token
|
2014-05-16 19:11:03 +00:00 |
|
Anton Georgiev
|
6ecbd8d1f3
|
restricted CORS
|
2014-05-16 18:34:54 +00:00 |
|
Richard Alam
|
391dc9be5a
|
- fix listen-only in get users reply
|
2014-05-16 17:26:51 +00:00 |
|
Richard Alam
|
5686b6871c
|
- finish global audio...display speaker icon beside user's name when joined in listen-only mode
|
2014-05-16 15:24:22 +00:00 |
|
Richard Alam
|
6bc09111c0
|
- handle message correctly
|
2014-05-15 20:26:54 -07:00 |
|
Richard Alam
|
7e4edcae65
|
- handle user connected/disconnected to/from global audio
|
2014-05-15 22:21:47 +00:00 |
|
Richard Alam
|
4c636ec4c8
|
- reset property
|
2014-05-15 21:05:38 +00:00 |
|
Richard Alam
|
1a7af0943c
|
- send user connected/disconnected to/from global audio message
|
2014-05-15 21:04:51 +00:00 |
|
Anton Georgiev
|
c5f5b635b5
|
receives validate_auth_token_reply
|
2014-05-15 20:42:54 +00:00 |
|
Anton Georgiev
|
9d51489c32
|
Merge branch 'merge-polling-with-master' of https://github.com/bigbluebutton/bigbluebutton into merge-polling-with-master
|
2014-05-15 18:44:09 +00:00 |
|
Anton Georgiev
|
d56c2c66ba
|
validate token
|
2014-05-15 18:43:17 +00:00 |
|
Anton Georgiev
|
32fea5be69
|
when redirected from the login page, go straight into sessionView
|
2014-05-15 15:54:39 +00:00 |
|
Richard Alam
|
5dcad2c6c9
|
- keep track of users in listen only mode
|
2014-05-15 15:50:07 +00:00 |
|
Richard Alam
|
f3e13db080
|
Merge branch 'merge-polling-with-master' of github.com:antobinary/bigbluebutton into merge-polling-with-master
|
2014-05-14 21:26:38 +00:00 |
|
Richard Alam
|
70f8df6f50
|
Merge branch 'merge-global-audio' into merge-polling-with-master
|
2014-05-14 21:03:13 +00:00 |
|