perroned
543cc7f7e1
Merge remote-tracking branch 'bbb/master' into html5client-mod-verto-addition
...
Conflicts:
bigbluebutton-html5/app/client/main.coffee
2015-10-07 06:38:00 -07:00
Richard Alam
e44056cd5d
Merge pull request #2825 from ritzalam/add-external-userid-in-log
...
- log external user id
2015-10-06 18:27:45 -04:00
Richard Alam
894b59b687
- log external user id
2015-10-06 22:26:47 +00:00
Richard Alam
5b0facd058
Merge pull request #2824 from perroned/html5-client-https-audio
...
Load JS libraries over HTTPS. Only allow exiting of audio while in call.
2015-10-06 17:06:46 -04:00
perroned
99e0b75997
Simplify loading protocol process for libraries
2015-10-06 12:56:50 -07:00
perroned
3a738caa90
Load libraries from same protocl as page was served from
2015-10-06 12:48:34 -07:00
perroned
9f69fc4105
Merge remote-tracking branch 'bbb/master' into html5-client-https-audio
2015-10-06 12:42:37 -07:00
perroned
5478e37b5b
merge conflicts
2015-10-06 12:11:43 -07:00
Richard Alam
e53ed90859
Merge pull request #2823 from ritzalam/fix-demo11-api-example
...
- convert all external ids in js api into internal user ids as using…
2015-10-06 15:00:33 -04:00
Richard Alam
9260705ab9
- add js lib that parses chat messages and converts urls (fixes issue 2692)
2015-10-06 18:58:54 +00:00
Richard Alam
5e034a2b1f
Merge pull request #2820 from capilkey/add-dots-to-reconnect
...
Added scrolling dots to the reconnect popup
2015-10-06 14:00:01 -04:00
Richard Alam
a2cf908425
- convert all extarnal ids in js api into internal user ids as using external user ids breaks when
...
a user joins twice into the meeting
2015-10-06 17:57:39 +00:00
Richard Alam
885a39fac5
Merge pull request #2821 from gthacoder/meteor-client-userlist-emojis
...
Emojis for HTML5 client.
2015-10-06 11:44:03 -04:00
Maxim Khlobystov
4b14abfc9d
Slightly changed the color palette for FAB.
2015-10-06 08:15:08 -07:00
Maxim Khlobystov
d5fddab14d
Cleaning up.
2015-10-06 08:10:38 -07:00
perroned
9e9002b6bd
When in audio only display exit button, remove join for other method
2015-10-05 13:46:54 -07:00
Chad Pilkey
6f69330b77
Added scrolling dots to the reconnect popup
2015-10-05 12:26:44 -07:00
perroned
343bcf86d0
Load external JS libraries using HTTPS
2015-10-05 12:07:14 -07:00
Maxim Khlobystov
5b97d359b3
Changed the color palette for the floating action button to use the existing colors.
2015-10-05 11:45:35 -07:00
Maxim Khlobystov
426adee719
Prevented the FAB from triggering on clicking invisible buttons.
2015-10-05 11:34:10 -07:00
Maxim Khlobystov
4231de1f51
Made FAB disappear smoothly after user clicks one of its buttons.
2015-10-05 10:02:52 -07:00
Richard Alam
85de6a9844
Merge pull request #2819 from ritzalam/update-locales-oct-5-2015
...
- update to latest locales (oct 5, 2015)
2015-10-05 12:01:09 -04:00
Richard Alam
c3aa194e00
- update to latest locales (oct 5, 2015)
2015-10-05 15:59:07 +00:00
Fred Dixon
c9c107014d
Update index.html
2015-10-05 11:44:47 -04:00
Richard Alam
f20b919ec2
Merge pull request #2818 from kepstin/ff-41-0-1-hang-workaround
...
Workaround Firefox 41.0.1 hang on Windows
2015-10-05 11:32:43 -04:00
Richard Alam
93ba04ce4c
Merge pull request #2814 from capilkey/fix-2810
...
Fix 2810
2015-10-05 11:32:34 -04:00
Calvin Walton
dbd79cebb5
Workaround Firefox 41.0.1 hang on Windows
...
On this particular browser, switch the Flash embed window mode to "opaque"
instead of "window". This causes buttons and right-click to be somewhat
unresponsive, but is still better than a complete browser hang.
The browser versions that the workaround is applied to is extremely limited,
because of the sideeffects.
2015-10-05 11:26:31 -04:00
Richard Alam
0681da3fd3
Merge pull request #2815 from maxdoumit/master
...
fix demo12.jsp when camera is disabled
2015-10-05 11:19:34 -04:00
Fred Dixon
74173226cb
Merge pull request #2817 from bigbluebutton/Update-index-html
...
Update index.html
2015-10-05 10:55:56 -04:00
Fred Dixon
d8cd5f7edd
Update index.html
...
Changed footer to show 1.0-beta
2015-10-05 10:55:49 -04:00
maxdoumit
d9c3f50f47
fix demo12.jsp when camera is disabled
...
The following code was returning a null pointer
Element videodockModule = getElementWithAttribute(firstChild, "name", "VideodockModule");
Removing the lines solves the issue and does not load the videodockModule. This issue could have been introduced with a change to the xml client file.
This closes #2713
2015-10-05 00:52:42 -04:00
Maxim Khlobystov
e9f204b681
Added the ability to clear emoji status.
2015-10-02 18:07:28 -07:00
Chad Pilkey
81ced7193b
Only show annotations for the current whiteboard
2015-10-02 15:03:40 -07:00
Chad Pilkey
04ce742fd7
Make sure whiteboard text is published to the correct whiteboardID
2015-10-02 15:02:13 -07:00
Maxim Khlobystov
65a7ac4b70
Implemented emoji status detection.
2015-10-01 15:24:43 -07:00
Maxim Khlobystov
d8ecfd8e04
Added the ability to set emoji status.
2015-10-01 12:41:43 -07:00
Maxim Khlobystov
da50169319
Updated Meteor.
2015-10-01 11:34:00 -07:00
Richard Alam
0744466ce0
Merge pull request #2811 from ritzalam/user-internal-userid-in-voice
...
User internal userid in voice
2015-09-30 16:26:03 -04:00
Richard Alam
5dd139f2f4
- do not user external user id to find user
2015-09-30 20:07:05 +00:00
perroned
87ae47e95c
Resolve issues with SIP compatability
2015-09-30 12:41:59 -07:00
Richard Alam
93dd5186b4
- user internal user id for user in the voice conf
2015-09-30 18:55:17 +00:00
perroned
6109b40171
Remove comment structure altering code views
2015-09-30 11:08:45 -07:00
perroned
f7df2964c5
Autosubscribe to deskshare watch-only stream on join
2015-09-30 11:04:01 -07:00
perroned
3ea085ea07
Trigger deskshare start and stop
2015-09-30 09:57:44 -07:00
Calvin Walton
5c6788d771
Merge pull request #2809 from kepstin/long-wav-file
...
Long wav file
2015-09-28 14:47:22 -04:00
Calvin Walton
a6d6001040
Convert audio_size to a number before subtracting header size
2015-09-25 14:11:25 -04:00
Calvin Walton
d44b458b49
Need to convert bit_rate to an integer
2015-09-25 14:08:17 -04:00
Calvin Walton
530799776d
Fix some reference errors in wav detection
2015-09-25 14:01:30 -04:00
Richard Alam
1179e85b1c
Merge pull request #2807 from capilkey/add-messageLength-default
...
Add a default message length to avoid issues of missing property
2015-09-25 10:21:27 -04:00
Chad Pilkey
0627afa2e5
Add a default message length to avoid issues of missing property
2015-09-24 14:17:07 -07:00
