Richard Alam
|
224bea1f5f
|
- sync layout with viewers
|
2014-05-29 07:06:44 -07:00 |
|
Richard Alam
|
e254787276
|
- add layout to lock settings
|
2014-05-28 12:25:28 -07:00 |
|
Anton Georgiev
|
2cfb4c4b2c
|
cleaning up
|
2014-05-28 18:45:03 +00:00 |
|
Anton Georgiev
|
5bcd1e9dcd
|
we do not expect requests for users or chathistory. These replies are automatically sent on successful validation
|
2014-05-28 18:44:19 +00:00 |
|
Anton Georgiev
|
77f5eaf6cf
|
cleanup after the changes in bbb-apps (on valid authentication publish users, chatHistory, etc right away)
|
2014-05-28 18:11:08 +00:00 |
|
Anton Georgiev
|
8928d4797c
|
found why some users are added multiple times in the userlist
|
2014-05-28 18:08:55 +00:00 |
|
Anton Georgiev
|
dbbe0d251e
|
missed this during the merge from perroned
|
2014-05-28 15:25:29 +00:00 |
|
Richard Alam
|
f87933cf76
|
- try to inject layout change when layout option is changed in lock settings
|
2014-05-27 19:00:38 -07:00 |
|
Anton Georgiev
|
8ed7146753
|
provoking chatHistory message
|
2014-05-27 21:41:52 +00:00 |
|
Anton Georgiev
|
46df19c38a
|
trying to join user and populate userlist, chatHistory, presentation, whiteboard on successful validation
|
2014-05-27 21:12:13 +00:00 |
|
Richard Alam
|
32e90ae8e5
|
- move lock settings info to bbb-apps from client
|
2014-05-27 13:14:34 -07:00 |
|
Anton Georgiev
|
392238fa31
|
Merge branch 'merge-polling-with-master' of github.com:perroned/bigbluebutton into merge-polling-with-master
Conflicts:
labs/demos/lib/handlers.coffee
|
2014-05-27 17:56:38 +00:00 |
|
Anton Georgiev
|
3c5c94de5f
|
worked on user_left
|
2014-05-27 17:51:09 +00:00 |
|
perroned
|
4d476cec37
|
"Changed AgnularJs Link
Made the http link use config IP in settings"
|
2014-05-27 08:12:12 -07:00 |
|
Richard Alam
|
79136feeba
|
- presenter should not be affected by lock settings
|
2014-05-27 07:16:04 -07:00 |
|
Richard Alam
|
f8974e5922
|
- apply lock icon to viewers only
|
2014-05-27 06:57:22 -07:00 |
|
Richard Alam
|
ff8c210104
|
- still the lock icon is not updating properly
|
2014-05-26 14:24:29 -07:00 |
|
Richard Alam
|
320ee09231
|
- try to apply lock settings to moderator only
|
2014-05-26 14:13:07 -07:00 |
|
Anton Georgiev
|
46cc8887a2
|
before: when another client joins the meeting, all users react to get_users_reply by re-writing the userlist. Now - the joining client uses get_users_reply, the rest of the clients use user_joined_message and only add a single user to the list. No more list overwriting
|
2014-05-26 20:28:54 +00:00 |
|
Richard Alam
|
0a59bb3964
|
Merge branch 'merge-polling-with-master' of github.com:antobinary/bigbluebutton into have-server-send-data-when-user-joins
|
2014-05-26 12:32:54 -07:00 |
|
Richard Alam
|
068df39570
|
- add [Disabled] text beside feature name
|
2014-05-26 11:32:21 -07:00 |
|
Richard Alam
|
e7c5a343a9
|
- show lock icon when a settings are locked
|
2014-05-26 10:48:30 -07:00 |
|
Richard Alam
|
b550ba966f
|
- disable/enable users list in chat window when private chat is enabled/disabled
|
2014-05-26 10:30:57 -07:00 |
|
Anton Georgiev
|
1de97beadc
|
the public chat messages are now displayed correctly - just once
|
2014-05-26 17:19:14 +00:00 |
|
Richard Alam
|
fb269a3c6b
|
- remove user sessions from hashmap when user leaves and when meeting is destroyed to
prevent memory leaks
|
2014-05-26 08:32:56 -07:00 |
|
Anton Georgiev
|
ae6fba2053
|
the usernames in the userlist are no longer surrounded by quotation marks
|
2014-05-26 14:45:10 +00:00 |
|
Anton Georgiev
|
6a301f4357
|
public chat messages are displayed, emitted, received...; right now each chat message is displayed twice (both in the flash and html5 clients).
|
2014-05-26 14:24:56 +00:00 |
|
Richard Alam
|
fb2fd12f3c
|
- disable/enable chat for viewer when settings are changed
|
2014-05-23 19:33:27 -07:00 |
|
Richard Alam
|
8549159aad
|
- try creating a chat conversation model
|
2014-05-23 14:43:01 -07:00 |
|
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 |
|