Commit Graph

9642 Commits

Author SHA1 Message Date
Fred Dixon
aa518d6ef0 Merge pull request #513 from capilkey/cut-call-time
Cut WebRTC call time
2015-02-12 18:13:09 -05:00
Oleksandr Zhurbenko
28ed53eaa2 Merge branch 'meteor-portrait-improvements' of https://github.com/antobinary/bigbluebutton into whiteboard-modifications 2015-02-12 14:51:45 -08:00
Chad Pilkey
229f446914 remove help button from the layout correctly 2015-02-12 14:27:54 -08:00
Chad Pilkey
10874f986d move <script> tag to the correct place in BigBlueButton.html 2015-02-12 14:26:19 -08:00
Chad Pilkey
d6ef5168c0 add support for webrtc call transferring, cuts join time in half 2015-02-12 14:25:41 -08:00
Fred Dixon
2df0b5ebb5 Merge pull request #512 from bigbluebutton/remove-info-about-turn
- remove querying of stun from flash. We will be doing this outside in ...
2015-02-12 13:50:01 -05:00
Richard Alam
aa0e92137b - remove querying of stun from flash. We will be doing this outside in JS instead. 2015-02-12 18:29:39 +00:00
Anton Georgiev
91cabcae8e portrait view:the chat section is now vertically restricted 2015-02-12 18:11:11 +00:00
perroned
4d1d29af34 readable text in different orientations 2015-02-12 09:29:55 -08:00
perroned
773d6b0b59 mobile userlist readability 2015-02-12 09:19:58 -08:00
Anton Georgiev
cdf2d10b97 Merge branch 'new-branch' of https://github.com/perroned/bigbluebutton into testing-version-15 2015-02-12 15:32:45 +00:00
Fred Dixon
f8bd0a15ed Merge pull request #510 from capilkey/fixed-presentation-issues
Fixed presentation issues
2015-02-11 18:05:10 -05:00
Fred Dixon
7424a28b5b Merge pull request #511 from bigbluebutton/update-to-red5-commit-198cdeaa391f7eaed348397d4b11c2fd7e12ae92
- update red5 to bring in fix for connections not cleanedup properly wh...
2015-02-11 17:38:56 -05:00
Richard Alam
18403d03bc - update red5 to bring in fix for connections not cleanedup properly which may be cause OOM Exception 2015-02-11 22:31:23 +00:00
Oleksandr Zhurbenko
4b300a1cf0 Merge branch 'new-branch' of https://github.com/perroned/bigbluebutton into whiteboard-modifications 2015-02-11 13:20:36 -08:00
perroned
10bd9e28fe Merge remote-tracking branch 'anton/meteor-portrait-improvements' into new-branch 2015-02-11 12:50:30 -08:00
perroned
10fe725695 Comments properly explaining line break code 2015-02-11 12:06:19 -08:00
perroned
096d2e5d93 Cleaned up newline conversions 2015-02-11 11:55:50 -08:00
perroned
2f4960e5b2 Newlines between flash and html5 2015-02-11 11:43:46 -08:00
Oleksandr Zhurbenko
dade374971 Fixed chat scaling 2015-02-10 11:01:40 -08:00
Anton Georgiev
ea363c8678 Merge branch 'new-branch' of https://github.com/perroned/bigbluebutton into testing-version-15 2015-02-10 16:34:12 +00:00
perroned
949c40b618 translate incoming and outgoing multiline messages 2015-02-10 08:29:52 -08:00
perroned
1c6abd5793 Prevent user list from getting covered in mobile 2015-02-10 07:48:02 -08:00
perroned
256fbbc1c5 Forgot a class 2015-02-10 07:24:13 -08:00
perroned
570e62143f participants list and options menu 2015-02-10 07:17:26 -08:00
Chad Pilkey
81b567aebc Merge remote-tracking branch 'upstream/master' into fix-issue-1866 2015-02-09 11:52:43 -08:00
Chad Pilkey
5326b9cca2 fixed issue 1865 - fit-to-width zoom issues 2015-02-09 11:51:45 -08:00
Chad Pilkey
ab4dfdf4f3 fixed two issues with the text toolbar sticking around when it shouldn't 2015-02-09 11:51:00 -08:00
Fred Dixon
a49f6493c4 Merge pull request #509 from bigbluebutton/modify-log-format-to-include-tz
- change format of logs to add timezone
2015-02-09 13:46:05 -05:00
Richard Alam
96e8fde865 - change format of logs to add timezone 2015-02-09 18:40:31 +00:00
Fred Dixon
a83d82207e Merge pull request #508 from bigbluebutton/update-locales-feb-9-2015
- update locales
2015-02-09 11:35:07 -05:00
Richard Alam
cd9ef88567 - update locales 2015-02-09 16:30:23 +00:00
Anton Georgiev
5a07dfd482 added the footer portrait specific font-size to the remaining cases 2015-02-06 23:57:57 +00:00
Anton Georgiev
1d030ac066 bigger font-size on portrait's footer. update footer params 2015-02-06 23:08:56 +00:00
Anton Georgiev
876c3cb9eb meteor 1.0.2.1->1.0.3.1 2015-02-06 23:07:01 +00:00
Fred Dixon
2ed3195fbc Update bbbResources.properties
Change the copyright date to 2015
2015-02-06 16:34:54 -05:00
Fred Dixon
3d4d2b9d5f Merge pull request #507 from bigbluebutton/implement-issue-1863
Implement issue 1863
2015-02-06 16:32:12 -05:00
Richard Alam
24b9c5c525 - store stun and turn servers in client 2015-02-06 21:05:12 +00:00
Anton Georgiev
192a641119 missed during merge 2015-02-06 20:50:49 +00:00
Anton Georgiev
a1d4e62d9b Merge branch 'new-branch' of https://github.com/perroned/bigbluebutton into testing-version-15
Conflicts:
	labs/meteor-client/app/client/stylesheets/portrait/chat.less
2015-02-06 20:03:11 +00:00
Anton Georgiev
e846c5f330 Merge branch 'meteor-client-responsive-ui' of https://github.com/gthacoder/bigbluebutton into testing-version-15 2015-02-06 19:52:36 +00:00
Anton Georgiev
dc12fc0eb1 Merge branch 'chat-quotes' of github.com:antobinary/bigbluebutton into testing-version-15 2015-02-06 19:48:13 +00:00
Richard Alam
cdc6daced8 - add support for configuring stun and turn servers
- add new /stuns api to be called by the Flash client
2015-02-06 19:46:56 +00:00
Anton Georgiev
a6eb4865dc load the main template only on successful login (before it would load for a sec no matter what) 2015-02-06 19:41:18 +00:00
Anton Georgiev
c6da51d61b add a flag for HTML5 users. add a flag for html5 users that validated successfully. Use these flags for action authorization. From now onwards we only allow users that got validate_auth_token_reply with true to proceed and enter a meeting. No restriction for the flash client users. Dummy users are now added only for html5 users when requesting validation from BBB 2015-02-06 17:21:31 +00:00
Anton Georgiev
7ff2a05a73 clear session vars before redirecting 2015-02-06 16:55:46 +00:00
Maxim Khlobystov
438c61485d Made the landing page responsive. 2015-02-05 16:44:01 -08:00
Maxim Khlobystov
b16f4e2f1a Made the padding between the slide and whiteboard border consistent on loading the portrait view and scaling. 2015-02-05 14:43:57 -08:00
Anton Georgiev
08e0ada372 Merge branch 'whiteboard-modifications' of https://github.com/OZhurbenko/bigbluebutton into chat-quotes 2015-02-05 20:07:13 +00:00
Anton Georgiev
6e39140ab3 if unauthorized user attempts to subscribe, throw an error which will cause the user to be redirected to the login page 2015-02-05 19:58:39 +00:00