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

9288 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Felipe Cecagno
d4f0c2c229 fixed the start and end time on the encrypted format metadata, which is now based on epoch 2015-03-24 21:15:25 -03:00
Felipe Cecagno
91067c5172 handling the case when the getRecordings url for the mconf-decrypter is not set 2015-02-05 14:32:48 -02:00
Felipe Cecagno
8e12c909c5 Merge branch '090-encrypted-recording' into HEAD 
Conflicts:
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	record-and-playback/core/Gemfile
	record-and-playback/deploy.sh
 2015-01-21 15:51:29 -02:00
Fred Dixon
ab9753344a Merge pull request #489 from bigbluebutton/update-spanish-locales 
- update locales from transifex
 2015-01-20 13:52:51 -05:00
Richard Alam
26c6ca0fd1 - update locales from transifex 2015-01-20 18:47:19 +00:00
Fred Dixon
39e9ccf1e5 Merge pull request #488 from bigbluebutton/update-locales-jan-20-2015 
- updating locales
 2015-01-19 17:17:04 -05:00
Richard Alam
95776a62bd - updating locales 2015-01-19 18:38:00 +00:00
Chad Pilkey
794cbf9e97 Merge pull request #487 from SenecaCDOT-BigBlueButton/client-pre-check 
change warnings to notifications
 2015-01-19 13:25:06 -05:00
Chad Pilkey
12d3a34ff5 change warnings to notifications 2015-01-19 10:22:15 -08:00
Chad Pilkey
b89a587c0b Merge pull request #486 from SenecaCDOT-BigBlueButton/client-pre-check 
minor tweaks to the configuration warnings
 2015-01-16 17:58:17 -05:00
Chad Pilkey
5a9a2a0a6c minor tweaks to the configuration warnings 2015-01-16 13:39:44 -08:00
Fred Dixon
74d54ace4a Merge pull request #485 from SenecaCDOT-BigBlueButton/client-pre-check 
Client pre check
 2015-01-15 19:23:18 -05:00
Chad Pilkey
9be9cca051 added a configuration warning system to the flash client 2015-01-15 16:14:49 -08:00
Fred Dixon
c5f0273075 Merge pull request #484 from ffdixon/fix-copyright 
Updated copyright date on home page demo
 2015-01-15 18:28:20 -05:00
Fred Dixon
1150572f3f Updated copyright date on home page demo 2015-01-15 18:25:30 -05:00
Chad Pilkey
fa7fa71f41 updated ChatOptions default fontSize to match config.xml.template 2015-01-15 15:19:00 -08:00
Chad Pilkey
f67c68e728 made the chat message spacing a little tighter 2015-01-15 15:16:38 -08:00
Chad Pilkey
985f08895a removed the unused jssip library 2015-01-15 15:15:30 -08:00
Chad Pilkey
94377d5da9 removed old js files from html experiment 2015-01-15 15:13:44 -08:00
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