BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,869 Commits 13 Branches 260 Tags 1.1 GiB
55df6c1e26
Commit Graph

5869 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Markos Calderon
931c3ba942 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-05-03 15:15:00 -05:00
Markos Calderon
7bd396c017 fix for webcam sharing 2013-05-03 15:14:39 -05:00
Tyler Copeland
72f2c9b61a Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-05-03 15:22:25 -04:00
Tyler Copeland
63eb97db66 Updated image for 081 landing page 2013-05-03 15:21:33 -04:00
Richard Alam
711ef6e67d - don't display video control buttons when window is very small 2013-05-03 18:38:27 +00:00
Markos Calderon
063a952df7 fix hide and show presenter icon in videoconf 2013-05-03 10:55:54 -05:00
Richard Alam
08aee47876 - make video windows the same sizes inside video dock 2013-05-03 14:31:22 +00:00
Richard Alam
7b78545f9d Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-05-02 18:42:32 +00:00
Richard Alam
97884b8cc8 - notify JS API that user has left the meeting 2013-05-02 18:41:48 +00:00
Jesus Federico
7dd0adf385 Updated lti.properties file 2013-04-30 16:28:49 -04:00
Richard Alam
0b902805b0 - seems like it's picking the wrong jar 2013-04-30 15:43:56 +00:00
Richard Alam
75fb9c9a09 - upgrade to red5 r4635 to get fix for RTMPT kepp alive 2013-04-30 15:11:28 +00:00
Gustavo Salazar
2ae224765e a log file by meeting in archive phase 2013-04-29 16:03:21 -05:00
Gustavo Salazar
4c60948ae0 Merge pull request #77 from fcecagno/fixing-video-processing 
fixing the start-stop camera events matches, so now even if there's no s...
 2013-04-28 17:40:50 -07:00
Richard Alam
d20ffe17ba Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-04-28 23:39:30 +00:00
Richard Alam
607d09e7cb - upgrading to latest red5 with fix to rtmpt 2013-04-28 23:38:54 +00:00
Richard Alam
b40a62aa0b Merge pull request #137 from SenecaCDOT-BigBlueButton/fix-chat-times 
Fix chat times
 2013-04-28 15:30:08 -07:00
Chad Pilkey
60b1e77196 the message time is now correct 2013-04-28 15:12:08 -07:00
Richard Alam
4d3e6de0e9 - return the default config xml without wrapping in a response xml. THis way, the config xml isn;t encoded. 2013-04-28 21:52:14 +00:00
Chad Pilkey
c18f9405f6 chat messages now know the correct last message send time 2013-04-28 13:42:04 -07:00
Richard Alam
91176431ca - upgrade to red5 r4360 2013-04-28 20:11:19 +00:00
Richard Alam
dd8014c122 - fix problem where webcam button is not showing up when user is using RTMPT 2013-04-28 20:10:22 +00:00
Richard Alam
9a338b8105 - don't delete locales folder unless building locales 2013-04-28 17:15:05 +00:00
Richard Alam
dfa65a5d91 - upgrade to red5 r4628 2013-04-27 23:07:28 +00:00
Richard Alam
e30a87d91c - build polling after building main client to generate linker-report needed by modules 2013-04-27 14:53:14 -07:00
Richard Alam
7740b54b17 create client dir if not present 2013-04-27 14:15:01 -07:00
Richard Alam
a98511997d - don't delete .gitignore under client dir 2013-04-27 13:46:53 -07:00
Richard Alam
7805cfb854 - use client dir as output target instead of bin. This way we don't have to link bin to client 
to setup dev env
 2013-04-27 13:18:54 -07:00
Richard Alam
cc8a93b0e2 - cleanup project files 2013-04-27 13:17:30 -07:00
Richard Alam
9d20b66e5f - remove copying of join-mock.xml as we don't support that anymore 2013-04-27 13:08:44 -07:00
Richard Alam
e0e320b7a2 Merge pull request #136 from SenecaCDOT-BigBlueButton/fix-whiteboardtoolbar-location 
the whiteboard toolbar now follows the presentation window when it moves
 2013-04-27 12:18:32 -07:00
Chad Pilkey
a7ff32711e the whiteboard toolbar now follows the presentation window when it moves 
when it moves
 2013-04-27 10:42:23 -07:00
Richard Alam
cf0f2c11c2 Merge pull request #135 from SenecaCDOT-BigBlueButton/improve-present-leftright-arrows 
added disabled icons for left and right arrow buttons in presentation wi...
 2013-04-27 10:25:39 -07:00
Chad Pilkey
ddfc84b8c0 added disabled icons for left and right arrow buttons in presentation window 2013-04-27 10:21:40 -07:00
Richard Alam
0b055b1672 - fix commons-pool jar definition 2013-04-26 22:58:24 +00:00
Richard Alam
c706c40218 - don't drag commons lib 2013-04-26 22:54:57 +00:00
Richard Alam
c06334f24d - upgrade to red5 r4627 2013-04-26 20:59:33 +00:00
Felipe Cecagno
0619d5716a Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2013-04-26 17:44:57 -03:00
Felipe Cecagno
1f3f6e927f fixing the problem that was preventing the client to load the default layouts in the beginning of the session; the combo was only populated if the layouts were loaded BEFORE the layout combo get created - now it works independently of the order that the elements get initialized 2013-04-26 17:43:22 -03:00
Richard Alam
ebd6c864f2 Merge pull request #134 from SenecaCDOT-BigBlueButton/really-just-hotkeys 
Fixed accidental logout on Ctrl-X
 2013-04-26 12:20:49 -07:00
jtrobinson
3bd3d6c88a Changed Ctrl-X to Ctrl-L 2013-04-26 12:13:41 -07:00
Richard Alam
00a0d1e8a1 Merge pull request #132 from mconf/layout-min-width-0.81 
Layout minWidth
 2013-04-25 15:39:50 -07:00
Felipe Cecagno
34d16432e5 just fixed an issue introduced during the merge of minimum width on layouts 2013-04-25 18:52:13 -03:00
Felipe Cecagno
7ad5b359dc adding minWidth to the current default layouts 2013-04-25 18:16:14 -03:00
Felipe Cecagno
59825d336d Merge remote branch 'mconf/layout-min-width' into layout-min-width-0.81 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/events/ModuleLoadEvent.as
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModuleManager.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesProxy.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/LayoutDefinition.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/WindowLayout.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/services/LayoutSharedObjectService.as
 2013-04-25 18:12:44 -03:00
Richard Alam
89ce86ae90 Merge pull request #130 from SenecaCDOT-BigBlueButton/fix-userwindow-namecolumn 
added min widths to the userwindow columns
 2013-04-25 13:30:50 -07:00
Richard Alam
0db837a18d Merge pull request #129 from SenecaCDOT-BigBlueButton/fix-presentation-ctrlbar 
Fix presentation ctrlbar
 2013-04-25 13:30:31 -07:00
Richard Alam
a8b9ac3214 Merge pull request #128 from SenecaCDOT-BigBlueButton/add-headset-to-joinaudio 
added a headset icon to the join audio button
 2013-04-25 13:30:04 -07:00
Richard Alam
4983bc2961 Merge pull request #127 from SenecaCDOT-BigBlueButton/add-allowkick 
added allowKickUser option to config.xml, fixed lock icon bug, set white...
 2013-04-25 13:29:02 -07:00
Chad Pilkey
686785462c added min widths to the userwindow columns 2013-04-25 13:01:09 -07:00