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

9228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chad Pilkey
644ad523c5 removed the old Settings module 2015-01-15 15:12:24 -08:00
Fred Dixon
745c89a7b2 Merge pull request #483 from bigbluebutton/prevent-dispatching-of-join-event-twice 
- prevent dispatching of join event twice whihc triggers loading of mod...
 2015-01-14 18:29:25 -05:00
Richard Alam
3579ad2122 - prevent dispatching of join event twice whihc triggers loading of modules twice 2015-01-14 21:04:43 +00:00
Fred Dixon
5249c02ca6 Merge pull request #482 from bigbluebutton/fix-number-of-modules-display-when-loading 
Fix number of modules display when loading
 2015-01-14 15:47:00 -05:00
Richard Alam
083d85687c - fix formatting 2015-01-14 19:44:34 +00:00
Richard Alam
eca5c391bf - display the correct number of modules when loading. 2015-01-14 19:40:35 +00:00
Fred Dixon
ec6621a3dd Merge pull request #481 from bigbluebutton/update-to-red5-00da63df24ec11f01b979ddf48daea18402b5df0 
- update to latest red5 with local connection ishared object fix
 2015-01-13 13:27:51 -05:00
Richard Alam
0d44571674 - update to latest red5 with local connection ishared object fix 2015-01-13 18:08:03 +00:00
Richard Alam
ecd453ca3c Merge pull request #480 from antobinary/master 
HTML5 Client code up to Jan 2015
 2015-01-09 13:57:12 -05:00
Anton Georgiev
a6d2ecc8a4 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
 2015-01-09 16:32:10 +00:00
Anton Georgiev
b0ccef5af0 Added config pngImagesRequired. If true, the slides will be converted to png for HTML5 client. False by default. 2015-01-09 16:14:05 +00:00
Richard Alam
5894347d1f Merge pull request #467 from bigbluebutton/format-logging-when-user-joins-global-audio 
- format the log when user joins/leaves global audio
 2015-01-08 16:20:41 -05:00
Richard Alam
53630e758c Merge branch 'master' into format-logging-when-user-joins-global-audio 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
 2015-01-08 21:19:19 +00:00
Anton Georgiev
d9c1356427 keep only the most recent version of the shape 2015-01-08 21:00:13 +00:00
Richard Alam
518d568b34 Merge pull request #479 from bigbluebutton/change-logging-max-history 
- increase the number of log history
 2015-01-08 15:49:44 -05:00
Anton Georgiev
a811265b86 the textshape is displayed as the presenter is typing. Overwritten with the final version when it is available 2015-01-08 20:49:29 +00:00
Richard Alam
fca1798868 - increase the number of log history 2015-01-08 20:21:47 +00:00
Richard Alam
d42d744a1a Merge pull request #478 from bigbluebutton/fix-issue-1849 
- fix https://code.google.com/p/bigbluebutton/issues/detail?id=1849
 2015-01-08 14:33:34 -05:00
Richard Alam
68291cfa47 - wrong key name 2015-01-08 19:31:51 +00:00
Richard Alam
e4793933e5 - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1849 2015-01-08 19:29:27 +00:00
Anton Georgiev
60980df6a7 joinedAt is no longer used 2015-01-08 19:20:03 +00:00
Anton Georgiev
2836b9c647 update meteor to 1.0.2.1 2015-01-08 15:32:49 +00:00
Fred Dixon
3153555664 Merge pull request #476 from bigbluebutton/add-more-logging-to-help-in-debugging 
- add more logging to help debug where demo meeting disappears on test...
 2015-01-07 19:02:12 -05:00
Anton Georgiev
05e0b4d59d fixes the issue of portrait oriented slide not visible on sign in/refresh 2015-01-07 22:53:37 +00:00
Richard Alam
e1c4edae45 - add more logging to help debug where demo meeting disappears on test-install 2015-01-07 13:39:56 -08:00
Anton Georgiev
8d37efbb2c Merge branch 'meteor-client-responsive-ui' of github.com:gthacoder/bigbluebutton into testing-version-008 2015-01-07 19:16:53 +00:00
Fred Dixon
0d0d4e7665 Merge pull request #473 from bigbluebutton/update-locales-from-transifex-jan-6-2014 
- update locales
 2015-01-07 07:31:46 -05:00
Maxim Khlobystov
b28a7ab5b8 Added the ability for a user to close the sliding menu by clicking the darkened area. 2015-01-06 16:32:44 -08:00
Maxim Khlobystov
c461af43de Corrected the tooltip for Expand/Collapse button. 2015-01-06 15:49:41 -08:00
Anton Georgiev
8e88828464 cleaning up 2015-01-06 23:31:09 +00:00
Anton Georgiev
4b390f08c5 worked on fixing discrepancies of whiteboard on resize of the window 2015-01-06 23:27:56 +00:00
Maxim Khlobystov
8c65f05d16 Cleaning up. 2015-01-06 15:24:49 -08:00
Anton Georgiev
ac569c9fdd hide the unused space right above the footer 2015-01-06 23:22:02 +00:00
Maxim Khlobystov
2949415117 Prevented scrolling while the sliding menu is opened. 2015-01-06 15:07:25 -08:00
Anton Georgiev
a94bdcd85b rearranged and added comments for scaleSlide 2015-01-06 21:53:07 +00:00
Maxim Khlobystov
8973c30646 Made sure the whiteboard is visible when user enters the meeting using browser in portrait orientation. 2015-01-06 13:50:54 -08:00
Maxim Khlobystov
977f7f4273 Made sure the screen is always darkened while the sliding menu is opened. 2015-01-06 12:00:04 -08:00
Anton Georgiev
ef2c615b0d Merge branch 'meteor-client-responsive-ui' of github.com:gthacoder/bigbluebutton into testing-version-008 2015-01-06 18:28:17 +00:00
Maxim Khlobystov
8a4b7b6195 Eliminated unnecessary async operations on drawing/redrawing the whiteboard. 2015-01-06 09:42:37 -08:00
Richard Alam
b648727cc2 Merge pull request #472 from pedrobmarin/check-browser-version 
Check browser version
 2015-01-06 10:28:15 -05:00
Richard Alam
19044cacb2 - update locales 2015-01-06 15:24:57 +00:00
Pedro Beschorner Marin
0679bd3452 Client check for browser version 2015-01-06 12:57:32 -02:00
Pedro Beschorner Marin
e50de25c09 Added Chrome and Firefox version fields to config XML 2015-01-06 12:54:41 -02:00
Anton Georgiev
d4f37c1ec6 text shapes now can be colourful 2015-01-05 20:54:03 +00:00
Fred Dixon
29700d3b07 Merge pull request #471 from bigbluebutton/change-default-font-size-to-12 
- change default chat font size to 12
 2015-01-05 16:07:15 -04:00
Richard Alam
3bb8c97f74 - change default chat font size to 12 2015-01-05 20:06:21 +00:00
Fred Dixon
af9305ff92 Merge pull request #470 from bigbluebutton/fix-issue-1850 
- fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=18...
 2015-01-05 16:04:49 -04:00
Richard Alam
ca9931e2dc - fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1850 2015-01-05 19:59:46 +00:00
Maxim Khlobystov
2c86220669 Made sure the whiteboard height is restored to its landscape value after switching from portrait to landscape mode. 2015-01-04 14:13:43 -08:00
Maxim Khlobystov
352ab6760a Merge branch 'testing-version-008' of https://github.com/antobinary/bigbluebutton into meteor-client-responsive-ui 2014-12-30 11:35:22 -08:00