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 |
|
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 |
|
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 |
|
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 |
|
Fred Dixon
|
78bd38cb17
|
Merge pull request #539 from OZhurbenko/meteor-ui
Meteor ui
|
2015-03-03 19:11:27 -05:00 |
|
Oleksandr Zhurbenko
|
100ea561f1
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui
Conflicts:
labs/meteor-client/app/lib/router.coffee
|
2015-03-03 16:03:24 -08:00 |
|
Oleksandr Zhurbenko
|
acdfaeed22
|
Improved Chat
|
2015-03-03 15:38:19 -08:00 |
|
Fred Dixon
|
630209330e
|
Merge pull request #538 from gthacoder/meteor-client-landscape
Updates for HTML5 client's landscape view.
|
2015-03-03 16:27:07 -05:00 |
|
Oleksandr Zhurbenko
|
e18369936f
|
Fixed Chat tab sizes
|
2015-03-03 13:26:50 -08:00 |
|
Fred Dixon
|
cff0759f2f
|
Merge pull request #537 from antobinary/failed-signin-stays-out
html5client: Slow connection caused users to be refused access but also to be added to the userlist
|
2015-03-03 16:26:49 -05:00 |
|
Anton Georgiev
|
b1b8eca6e6
|
rearranged the permissions so that even unvalidated users should be allowed to logoutSelf as long as authenticated
Conflicts:
labs/meteor-client/app/lib/router.coffee
|
2015-03-03 19:41:30 +00:00 |
|
Maxim Khlobystov
|
2809396ab2
|
Made the userlist and chat scrollable when needed.
|
2015-03-03 14:40:07 -05:00 |
|
Maxim Khlobystov
|
0371752a84
|
Made sure the footer never covers the rest of the page in landscape orientation.
|
2015-03-03 14:39:40 -05:00 |
|
Maxim Khlobystov
|
59e1d72d81
|
Made sure the sliding menu buttons only exist on mobile devices in portrait orientation.
|
2015-03-03 14:39:22 -05:00 |
|
Maxim Khlobystov
|
10ff076629
|
Updated the Handlebars handler for the portrait mobile media query.
|
2015-03-03 14:39:05 -05:00 |
|
Chad Pilkey
|
7314f8f607
|
Merge pull request #535 from antobinary/nginx-stuff
Nginx config and avoid :3000
|
2015-03-03 12:47:20 -05:00 |
|
Oleksandr Zhurbenko
|
a785b6ad54
|
Some cleaning, textbox fixed in a mobile view, changed buttons and fonts in a mobile view
|
2015-03-03 08:36:15 -08:00 |
|
Tiago Daniel Jacobs
|
9d53c765fa
|
Redoing the changes to PhoneButton due to conflict on merge
|
2015-03-03 07:04:47 +00:00 |
|
Tiago Daniel Jacobs
|
34e2e48be2
|
Merging
|
2015-03-03 06:52:56 +00:00 |
|
Tiago Daniel Jacobs
|
cc9fdc1a9e
|
Fixed layouts combo state when presenter mode is turned on/off
|
2015-03-03 06:34:56 +00:00 |
|
Tiago Daniel Jacobs
|
0033e36384
|
Fixed state of webcam button when leaving presenter state
|
2015-03-03 06:34:10 +00:00 |
|
Tiago Daniel Jacobs
|
3060b2ea7d
|
Implemented method to check if lock is in use or not, refactored to use it in entire code.
|
2015-03-03 05:01:58 +00:00 |
|
Tiago Daniel Jacobs
|
647c0a83bc
|
Code clean up and fixes to lock settings
|
2015-03-03 04:49:56 +00:00 |
|
Tiago Daniel Jacobs
|
95cf0167f2
|
Restored ability to lock/unlock individual users
|
2015-03-03 00:44:34 +00:00 |
|
Anton Georgiev
|
5b6573bb0c
|
root_url can be localhost based
|
2015-03-03 00:42:11 +00:00 |
|