Lucas Zawacki
7d401dab53
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merge-with-tests
...
Conflicts:
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/PresentationService.groovy
2014-11-14 15:33:17 -02:00
Jesus Federico
4f1b907daf
bbb-lti: Updated css
2014-09-29 13:11:57 -04:00
Anton Georgiev
c9f8683e0b
Merge remote-tracking branch 'perroned/prototype-metor-client' into meteor-rebuild-server
2014-06-11 19:45:02 +00:00
perroned
6dcf442f1b
pushing changes to carry over work between computers
2014-06-09 06:29:12 -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
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
perroned
f71031b3f8
Cleaned up how meeting name is passed around, removed duplicated code and functions
2014-06-03 13:54:24 -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
Anton Georgiev
7d85751a43
fix indent + clean up
2014-06-03 17:09:11 +00:00
Anton Georgiev
25275821af
on logout the entire user row in the user list is removed
2014-06-03 14:40:35 +00: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
Anton Georgiev
05beb77462
add a user to the userlist only if it is not present in the collection
2014-06-02 19:41:40 +00:00
Anton Georgiev
1e115befe9
the current slide updates when the presentation (1.pdf to 2.pdf) has changed
2014-05-30 18:56:24 +00:00
Anton Georgiev
7880874520
displaying the current slide from the current presentation on get_presentation_info_reply
2014-05-30 18:23:13 +00:00
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
8928d4797c
found why some users are added multiple times in the userlist
2014-05-28 18:08:55 +00:00
Anton Georgiev
3c5c94de5f
worked on user_left
2014-05-27 17:51:09 +00: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
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
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
f676657b3b
displays the users in the UI userlist
2014-05-22 19:25:00 +00:00
Anton Georgiev
b7b075ce71
work on user_joined_event prior to get_users_request
2014-05-22 18:20:21 +00: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
f78264e9da
a joining user is displayed in the user list
2014-05-21 15:57:10 +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
Anton Georgiev
7fcc9dcdc2
cleaning up
2014-05-16 20:58:20 +00:00
Anton Georgiev
b2b1321460
worked on validate auth_token
2014-05-16 19:11:03 +00:00
Anton Georgiev
c5f5b635b5
receives validate_auth_token_reply
2014-05-15 20:42:54 +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
Leonardo Crauss Daronco
3cc04e47c3
Get the token from the URL to authenticate the HTML5 client
2014-04-25 10:34:26 -04:00
Leonardo Crauss Daronco
5d1fb4c168
HTML5 client authentication using redis and the new messages
...
The client sends a 'validate_auth_token_request' to the server, that waits
a 'validate_auth_token_reply' response from bbb-apps to pass to the client.
Still have to get info from /api/enter, for now the meetingId and userId are
hard-coded in the client (AuthenticationModel).
2014-04-24 17:39:59 -04:00
Leonardo Crauss Daronco
8202cebfea
Make the html5 always start in the session screen for testing
2014-04-23 17:13:09 -04:00
Anton Georgiev
e45a77f080
minor changes
2014-04-04 14:26:09 +00:00
Anton Georgiev
fa0ce4e1b0
fixed minor bugs that were causing errors due to 'null'
2014-04-03 19:13:13 +00:00
Anton Georgiev
f4a21302b3
userJoining (the user starting from html5 client) is also joined via user_joined_event
2014-04-03 18:34:19 +00:00
Anton Georgiev
47b19a4f39
user_left_event is now handled by the client. The username is moved to the left-hand side (was supposed to remove it)
2014-04-02 18:20:41 +00:00
Anton Georgiev
9bd51abe1d
temporary reducing the number of messages in the log - keep alive logging is removed. Also I commit a block of code for changing the channel of an incoming message from pubsub
2014-04-01 16:08:54 +00:00
Anton Georgiev
2287b24fc2
modified the login page so you can enter manually the meetingID that you want
2014-04-01 15:30:10 +00:00
Anton Georgiev
eb133320d1
minor console logging changes
2014-03-31 15:48:49 +00:00
Anton Georgiev
727ca898c6
user_joined_event: when received, the user is added to the list of users
2014-03-31 15:43:34 +00:00
Anton Georgiev
92d3d83a87
implemented share_presentation_event
2014-02-28 11:21:37 -05:00
Anton Georgiev
02efe58c1d
fixed message structure for ellipse, triangle, line
2014-02-21 21:01:20 +00:00
