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 |
|
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 |
|
Chad Pilkey
|
b9afd0e36b
|
fixed a null pointer exception when the mic is not found
|
2014-06-02 09:23:13 -07:00 |
|
Chad Pilkey
|
e1a56c45ba
|
Merge remote-tracking branch 'upstream/merge-polling-with-master' into fix-webrtc-dialogs
Conflicts:
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
|
2014-06-02 08:59:33 -07:00 |
|
Richard Alam
|
19ac02fab2
|
- enable polling by default
|
2014-06-02 07:44:46 -07:00 |
|
Richard Alam
|
26a142b49a
|
- make window smaller
|
2014-06-01 18:17:07 -07:00 |
|
Richard Alam
|
e0f65acffd
|
- make viewer init the polling module properly
|
2014-06-01 09:22:07 -07:00 |
|
Chad Pilkey
|
02e6a98f1c
|
removed some unused managers from the phone module
|
2014-05-30 15:20:00 -07:00 |
|
Chad Pilkey
|
19ce05b31b
|
created an audio selection window to choose your stream type
|
2014-05-30 15:19:25 -07:00 |
|
Chad Pilkey
|
91d2e1d288
|
removed the background from the listen only indicator image
|
2014-05-30 15:15:38 -07:00 |
|
Fred Dixon
|
ee839aa7a5
|
Merge pull request #324 from xaker1/feature
Contributor agreement received. Merging (thanks!)
|
2014-05-30 15:52:53 -04:00 |
|
Anton Georgiev
|
188a4c49dc
|
the slide on the html5 viewer is now syncronized with the slide at the flash presenter. presentation_page_changed_message
|
2014-05-30 19:12:58 +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 |
|
Richard Alam
|
f4ff66c211
|
- update jar version numbers for red5 1.0.2
|
2014-05-30 11:10:41 -07:00 |
|
Anton Georgiev
|
0476885281
|
filter the current page of the [current] presentation (filtering on the server side)
|
2014-05-30 16:32:00 +00:00 |
|
Anton Georgiev
|
29a51efa71
|
send the presentation info
|
2014-05-30 16:29:56 +00:00 |
|