BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,473 Commits 13 Branches 260 Tags 1.1 GiB
67308f9e19
Commit Graph

7473 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Georgiev
67308f9e19 cleaning up 2014-05-29 20:26:49 +00:00
Anton Georgiev
e7584d23d3 logging out a user - looks good in flash, will have to add a few things for html5 2014-05-29 19:55:32 +00: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
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
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
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
Anton Georgiev
1de97beadc the public chat messages are now displayed correctly - just once 2014-05-26 17:19:14 +00: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
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
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
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