BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,481 Commits 13 Branches 260 Tags 1.1 GiB
b6bde6fb97
Commit Graph

9481 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Georgiev
b6bde6fb97 removing merging traces for smooth pull req 2015-02-19 21:06:01 +00:00
Anton Georgiev
6416469172 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 
Conflicts:
	bbb-api-demo/src/main/webapp/demoHTML5.jsp
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2015-02-19 20:47:08 +00:00
Richard Alam
b64174dda5 Merge pull request #525 from antobinary/chat-symbols-log-strings 
HTML5 Client chat symbols
 2015-02-19 15:39:27 -05:00
Richard Alam
2a2b843537 Merge pull request #524 from antobinary/html5-bbb-demo 
HTML Client jsp login page instead of demos node app
 2015-02-19 15:39:13 -05:00
Anton Georgiev
a035e9bc5a fix some log strings 
Conflicts:
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2015-02-19 19:53:19 +00:00
Anton Georgiev
7911046a70 allowing " and \ chars in the chat strings from the HTML5 client 2015-02-19 19:29:26 +00:00
Anton Georgiev
c66aaba03e added link to html5client demo. Rm meetingName box 2015-02-19 19:03:53 +00:00
Anton Georgiev
6f8f59c3d8 removing demos. Substituted with demoHTML5.jsp 
Conflicts:
	labs/demos/public/stylesheets/login.css
 2015-02-19 17:31:52 +00:00
Anton Georgiev
d5c5fc6272 added a BBB demo for accessing the HTML5 client. It should substitute the demos app 2015-02-19 17:29:57 +00:00
Richard Alam
c20bba7b5c Merge pull request #523 from bigbluebutton/change-log-level-to-user-disconnect 
- change log level to warn
 2015-02-18 10:49:46 -05:00
Richard Alam
7d7b29620d - change log level to warn 2015-02-18 15:48:23 +00:00
Richard Alam
0f402235a1 Merge pull request #522 from bigbluebutton/do-not-store-connection-info 
- remove storing of connection as we query the connection from Red5 dir...
 2015-02-18 09:54:00 -05:00
Richard Alam
1baf405a31 - remove storing of connection as we query the connection from Red5 directly 2015-02-18 01:31:32 +00:00
Richard Alam
65c35e1137 Merge pull request #520 from bigbluebutton/add-more-info-js-log 
- add more info into JS log
 2015-02-17 19:26:22 -05:00
Richard Alam
edaeaf6bf4 Merge pull request #521 from capilkey/webrtc-fixes 
WebRTC fixes
 2015-02-17 19:26:07 -05:00
Richard Alam
23573f528c Merge pull request #516 from bigbluebutton/remove-collector-actor 
- remote CollectorActor as we don't use it. Found that sometimes it's s...
 2015-02-17 19:12:12 -05:00
Chad Pilkey
e6d3cd551d fixed a race condition in the webrtc javascript code, and added cause for error 1004 2015-02-17 16:11:42 -08:00
Richard Alam
931d1624d7 - add more info into JS log 2015-02-18 00:09:10 +00:00
Anton Georgiev
cd0fe0bd58 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2015-02-17 23:47:23 +00:00
Anton Georgiev
8550ed926c adjust the logOutUrl 2015-02-17 23:33:13 +00:00
Anton Georgiev
822b6268e3 removing demos. Substituted with demoHTML5.jsp 2015-02-17 23:25:30 +00:00
Anton Georgiev
991d60806c added a BBB demo for accessing the HTML5 client. It should substitute the demos app 2015-02-17 23:19:43 +00:00
Richard Alam
a710c58282 Merge pull request #518 from kepstin/stun-turn-js 
Add webrtc 1009 error to translations
 2015-02-17 13:46:37 -05:00
Calvin Walton
8e7a34b5dd Add webrtc 1009 error to translations 2015-02-17 13:29:27 -05:00
Richard Alam
6c44523464 Merge pull request #517 from kepstin/stun-turn-js 
Use configured stun/turn servers when making webrtc call
 2015-02-17 12:09:53 -05:00
Richard Alam
55059a4c60 - remote CollectorActor as we don't use it. Found that sometimes it's sendBuffer gets too large and 
not sure if the Actor died and isn't processing the messages.
 2015-02-17 17:01:17 +00:00
Calvin Walton
1af70d8e4e Use configured stun/turn servers when making webrtc call 2015-02-17 12:00:04 -05:00
Anton Georgiev
e95b63f444 Merge branch 'meteor-client-responsive-ui' of github.com:gthacoder/bigbluebutton into meteor-portrait-improvements 2015-02-17 16:55:04 +00:00
Maxim Khlobystov
7a068c5c8e Corrected the proportion in which the userlist, whiteboard and chat grow or shrink on horizontal scaling. 2015-02-16 17:49:01 -08:00
Maxim Khlobystov
065cf1e701 Fixed the horizontal scaling in Firefox. 2015-02-16 17:33:26 -08:00
Maxim Khlobystov
7ff7c4a9be Made the userlist width flexible. 2015-02-16 17:16:57 -08:00
Anton Georgiev
64b3929bc5 onBeforeAction requires a this.next() even if we're still waiting before rendering 2015-02-13 23:27:31 +00:00
Anton Georgiev
fc9ebef332 Merge branch 'new-branch' of github.com:perroned/bigbluebutton into meteor-portrait-improvements 2015-02-13 22:47:07 +00:00
Anton Georgiev
cb3fb5806d mini script to run without testing 2015-02-13 21:03:25 +00:00
Anton Georgiev
a4f08680b1 limit expansion of chat + users after a widow resize or orientation switch 2015-02-13 20:54:44 +00:00
Richard Alam
797be9ce10 Merge pull request #515 from capilkey/fix-blurriness 
fix blurriness in the client caused by Flex SDK 4.14
 2015-02-13 14:11:14 -05:00
Chad Pilkey
941b044cd7 fix blurriness in the client caused by Flex SDK 4.14 2015-02-13 10:49:23 -08:00
Fred Dixon
0c5e427093 Merge pull request #514 from capilkey/pixel-align-fix 
move the pixel alignment check to a callback
 2015-02-12 18:57:29 -05:00
Chad Pilkey
537f5b6e9a move the pixel alignment check to a callback 2015-02-12 15:52:03 -08:00
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