Fred Dixon
0807684ec1
Merge pull request #549 from gthacoder/meteor-client-push-menu
...
HTML5 client's push menu.
2015-03-08 09:45:27 -04:00
Maxim Khlobystov
f1623a143c
Replaced the push menu collapse button's chevron icons with the hamburger menu icon.
2015-03-08 01:30:44 -05:00
Maxim Khlobystov
52be0c0751
Positioned every element under the shield correctly when the push menu is opened.
2015-03-07 21:58:26 -05:00
Maxim Khlobystov
093382d3ff
Made it impossible for the main content of the page to be shifted in landscape orientation, prevented problems on switching between views.
2015-03-06 22:05:00 -05:00
Maxim Khlobystov
ba80d03b07
Saved the navbar from being disabled when the sliding menu is opened.
2015-03-06 22:04:40 -05:00
Maxim Khlobystov
96c1a3fc4a
Added some opacity to the rest of the page when the sliding menu is opened.
2015-03-06 22:04:18 -05:00
Maxim Khlobystov
716cb56830
Added the transparent shield over the view with sliding menu opened to detect the user's click.
2015-03-06 22:04:00 -05:00
Maxim Khlobystov
a105b2b6b5
Made the sliding menu push the rest of the page right instead of covering it.
2015-03-06 22:03:25 -05:00
Maxim Khlobystov
165ee6e753
Got rid of the darkened screen appearing along with the sliding menu.
2015-03-06 22:02:28 -05:00
Anton Georgiev
ee69c62309
first check if the html5 client is running and then attempt to redirect the user
2015-03-06 22:44:13 +00:00
Anton Georgiev
deec36b411
style the redirect page a bit
2015-03-06 22:43:51 +00:00
Anton Georgiev
5ebb2f5f3c
Allow moderators to use the html5 client.
...
Temporarily they will have exactly the same permissions as viewers do.
This commit's goal is to facilitate the redirect to the html5 client in the event that Flash is not detected on the system
2015-03-06 20:53:13 +00:00
Oleksandr Zhurbenko
7ef15d846f
Whiteboard's name is changed to static and the name of the presentation file is not displayed anymore
2015-03-06 08:57:11 -08:00
Oleksandr Zhurbenko
84351383f2
Merge branch 'master' into meteor-ui
2015-03-06 08:40:09 -08:00
Oleksandr Zhurbenko
c7124a1d15
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton
2015-03-06 08:24:53 -08:00
Oleksandr Zhurbenko
8437646cc4
Mobile UI changes
2015-03-06 08:22:41 -08:00
Oleksandr Zhurbenko
7d2b70f26f
Minor changes in the mobile view
2015-03-05 16:34:19 -08:00
Anton Georgiev
e77b295517
Merge branch 'master' into flash-redirect
2015-03-05 22:56:34 +00:00
Chad Pilkey
446f5f317c
Merge pull request #547 from antobinary/meteor-listenonly-audio
...
bbb_webrtc_bridge_sip.js fix, HTML5 client can join audio even if no Flash users have joined audio
2015-03-05 17:44:34 -05:00
Anton Georgiev
d02a30f3c2
Merge branch 'master' into meteor-listenonly-audio
2015-03-05 22:23:58 +00:00
Fred Dixon
8d8ed43985
Update start.sh
...
Added definition for HOME to start.sh help meteor start from within upstart job.
2015-03-05 16:52:04 -05:00
Fred Dixon
c4bfaa7c5b
Merge pull request #546 from kepstin/stun-turn-js
...
Fix timestamp calculation generating turn server credentials
2015-03-05 16:45:40 -05:00
Calvin Walton
0a6d03ca79
TURN: The timestamp is actually the expiry time
...
Make sure to add the TTL to the current time, so the generated expiry
time is in the future.
2015-03-05 16:27:30 -05:00
Calvin Walton
dfa9fd00e2
TURN server password: Use second-based timestamps
...
The expiration timestamp should be a standard unix timestamp measured in
seconds, not the millisecond-based Java time.
2015-03-05 16:21:46 -05:00
Anton Georgiev
f62fd4ce31
due to this the html5 client was not able to join a voice conf without a flash user already joined
2015-03-05 21:10:27 +00:00
Fred Dixon
63132411b8
Merge pull request #545 from antobinary/client-code-relocation
...
HTML5 client code relocation. Deleting the previous version of the client
2015-03-05 15:55:19 -05:00
Anton Georgiev
7a4c5cd7c2
remove the code from the old version of the html5 client
2015-03-05 20:24:43 +00:00
Anton Georgiev
d830e3358d
move the HTML5 client code outside of labs
2015-03-05 17:55:23 +00:00
Anton Georgiev
0a79f0dc29
the redirection page offers installing Flash or redirection
2015-03-05 17:30:09 +00:00
Oleksandr Zhurbenko
0a0c5bbf34
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton
2015-03-05 07:21:36 -08:00
Fred Dixon
30c0b67015
Merge pull request #543 from OZhurbenko/meteor-ui
...
Mobile View's changes
2015-03-04 19:57:26 -05:00
Oleksandr Zhurbenko
99f4c51ce7
Rolling back server's IP
2015-03-04 16:47:06 -08:00
Oleksandr Zhurbenko
a2e96394ee
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui
...
Conflicts:
labs/meteor-client/app/client/globals.coffee
2015-03-04 16:42:22 -08:00
Oleksandr Zhurbenko
8aa86c8d79
Cleaning
2015-03-04 16:30:50 -08:00
Anton Georgiev
44429a6bd6
redirect user to HTML5 client if Flash not installed/enabled. Must be attendee (for now)
2015-03-04 23:51:33 +00:00
Oleksandr Zhurbenko
94ada286cd
Fixing footer
2015-03-04 14:28:30 -08:00
Fred Dixon
25406d0400
Merge pull request #542 from bigbluebutton/revert-540-revert-536-bbb-lock-settings-fix
...
Revert "Revert "Bbb lock settings fix""
2015-03-04 17:03:37 -05:00
Fred Dixon
cf5ab25ca0
Revert "Revert "Bbb lock settings fix""
2015-03-04 16:47:35 -05:00
Oleksandr Zhurbenko
deb0f05235
Added default settings to the config file
2015-03-04 13:45:01 -08:00
Oleksandr Zhurbenko
a48b24c8af
Set up different default font sizes for mobile/desktop
2015-03-04 13:33:37 -08:00
Fred Dixon
1d6192a934
Merge pull request #541 from gthacoder/meteor-client-toggling-panels
...
Modified rules for toggling the userlist/whiteboard/chat in HTML5 client.
2015-03-04 15:26:48 -05:00
Maxim Khlobystov
e523ab6b3d
Prevented user from closing all of the userlist/whiteboard/chat, made it reopen everything on that attempt.
2015-03-04 12:36:10 -05:00
Maxim Khlobystov
d542640768
Made the userlist toggled off by default when user enters the meeting using mobile device in landscape orientation.
2015-03-04 12:35:52 -05:00
Oleksandr Zhurbenko
85199503a7
Changed sizes' dependencies so now they depend on the width of the device
2015-03-04 09:27:35 -08:00
Chad Pilkey
6733a53ea9
Merge pull request #540 from bigbluebutton/revert-536-bbb-lock-settings-fix
...
Revert "Bbb lock settings fix"
2015-03-04 11:50:41 -05:00
Chad Pilkey
34fdfb9f83
Revert "Bbb lock settings fix"
2015-03-04 11:49:13 -05:00
Chad Pilkey
8de57dfc36
Fixed the WhiteboardModule definition in config.xml
2015-03-04 10:43:54 -05:00
Fred Dixon
6e7b1491ef
Merge pull request #536 from tdj-br/bbb-lock-settings-fix
...
Bbb lock settings fix
2015-03-03 19:54:43 -05:00
Oleksandr Zhurbenko
90de6c5ae5
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton
2015-03-03 16:16:55 -08:00
Fred Dixon
78bd38cb17
Merge pull request #539 from OZhurbenko/meteor-ui
...
Meteor ui
2015-03-03 19:11:27 -05:00
