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

250 Commits

Author SHA1 Message Date
Richard Alam
d03f532b08 - ignore transifex dir when building locales 2014-09-12 13:13:34 -07:00
Mateus Dalepiane
cbb4a167bb Merge remote-tracking branch 'origin/new-videodock' into 090-new-videodock 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/AvatarWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml
 2014-08-26 17:20:00 -03:00
Ghazi Triki
bb09eb6d75 After checking we bumped projects version and Flex locales to 0.9.0 with some fixes 2014-08-13 12:20:10 +01:00
Ghazi Triki
9a794f854a Bumped projects version and Flex locales to 0.9 2014-08-13 10:28:08 +01:00
Ghazi Triki
ac7af7dfea Manually bumped all application version to the correct actual version 0.9.0-dev 2014-07-31 17:42:38 +01:00
Felipe Cecagno
79e513b38f Merge branch 'v0.81-release' of https://github.com/bigbluebutton/bigbluebutton into video-profiles 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
 2014-03-12 21:58:15 -03:00
Felipe Cecagno
a773701bca implemented the startup application with a consistent UI, avoiding the standard flex colors while the client doesn't load the branding file 2013-12-24 11:45:45 -02:00
Felipe Cecagno
163f1c3cbc implemented the background configurable by the config.xml 2013-12-19 21:58:06 -02:00
Richard Alam
cbdf8a3440 - add target to build a single locale 2013-10-21 19:37:11 +00:00
Felipe Cecagno
f8e63fd6f4 Merge branch 'master' into mconf-branding 
Conflicts:
	bigbluebutton-client/build.xml
	bigbluebutton-client/locale/ar_SY/bbbResources.properties
	bigbluebutton-client/locale/az_AZ/bbbResources.properties
	bigbluebutton-client/locale/bg_BG/bbbResources.properties
	bigbluebutton-client/locale/ca_ES/bbbResources.properties
	bigbluebutton-client/locale/cs_CZ/bbbResources.properties
	bigbluebutton-client/locale/da_DK/bbbResources.properties
	bigbluebutton-client/locale/de_DE/bbbResources.properties
	bigbluebutton-client/locale/el_GR/bbbResources.properties
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/es_ES/bbbResources.properties
	bigbluebutton-client/locale/es_LA/bbbResources.properties
	bigbluebutton-client/locale/et_EE/bbbResources.properties
	bigbluebutton-client/locale/eu_EU/bbbResources.properties
	bigbluebutton-client/locale/fa_IR/bbbResources.properties
	bigbluebutton-client/locale/fi_FI/bbbResources.properties
	bigbluebutton-client/locale/fr_CA/bbbResources.properties
	bigbluebutton-client/locale/fr_FR/bbbResources.properties
	bigbluebutton-client/locale/he_IL/bbbResources.properties
	bigbluebutton-client/locale/hr_HR/bbbResources.properties
	bigbluebutton-client/locale/hu_HU/bbbResources.properties
	bigbluebutton-client/locale/id_ID/bbbResources.properties
	bigbluebutton-client/locale/it_IT/bbbResources.properties
	bigbluebutton-client/locale/ja_JP/bbbResources.properties
	bigbluebutton-client/locale/kk_KZ/bbbResources.properties
	bigbluebutton-client/locale/km_KH/bbbResources.properties
	bigbluebutton-client/locale/ko_KR/bbbResources.properties
	bigbluebutton-client/locale/lt_LT/bbbResources.properties
	bigbluebutton-client/locale/lv_LV/bbbResources.properties
	bigbluebutton-client/locale/mn_MN/bbbResources.properties
	bigbluebutton-client/locale/ne_NE/bbbResources.properties
	bigbluebutton-client/locale/nl_NL/bbbResources.properties
	bigbluebutton-client/locale/no_NO/bbbResources.properties
	bigbluebutton-client/locale/pl_PL/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/locale/pt_PT/bbbResources.properties
	bigbluebutton-client/locale/ro_RO/bbbResources.properties
	bigbluebutton-client/locale/ru_RU/bbbResources.properties
	bigbluebutton-client/locale/si_LK/bbbResources.properties
	bigbluebutton-client/locale/sk_SK/bbbResources.properties
	bigbluebutton-client/locale/sr_RS/bbbResources.properties
	bigbluebutton-client/locale/sv_SE/bbbResources.properties
	bigbluebutton-client/locale/th_TH/bbbResources.properties
	bigbluebutton-client/locale/tr_TR/bbbResources.properties
	bigbluebutton-client/locale/uk_UA/bbbResources.properties
	bigbluebutton-client/locale/vi_VN/bbbResources.properties
	bigbluebutton-client/locale/zh_CN/bbbResources.properties
	bigbluebutton-client/locale/zh_TW/bbbResources.properties
	bigbluebutton-client/resources/prod/MconfLive.html
	bigbluebutton-client/resources/prod/lib/bbb_blinker.js
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MicSettings.mxml
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
	record-and-playback/presentation/playback/presentation/playback.html
 2013-08-26 21:26:44 -03:00
Hugo Lazzari
bcfa02ee48 Implemented sharedNotesNoServer to work with bigbluebutton 0.81 2013-07-15 11:49:46 -03:00
Felipe Cecagno
371243dbe6 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into video-profiles 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCalls.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/VideoWindow.mxml
 2013-06-28 16:09:11 -03:00
Richard Alam
253563b7ec - clean up client output dir 2013-05-30 21:45:04 +00:00
Richard Alam
20c39ea109 - upgrade to the applet with fix for java block popup when stopping deskshare 
- generate an unsigned applet so other can sign using their own cert
 2013-05-16 20:10:33 +00:00
Chad Pilkey
e785e80629 viewers and listeners modules wiped from record 2013-05-14 11:40:21 -07:00
Felipe Cecagno
eb6035177b Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into video-profiles 2013-04-28 18:28:56 -04:00
Felipe Cecagno
99d6d959f9 Implementation done during the 2nd BigBlueButton Hackfest on April 2013; implemented the concept of video profiles - the sysadmin can specify in a XML file the video profiles that the users will use to broadcast video; it includes width, height, key interval, fps, enableH264 among other parameters; a hack was done to enable the user subscribe to a different profile than the one that is being broadcasted - on the server-side there will be a transcoder component that will handle this kind of subscription 2013-04-28 18:18:17 -04:00
Richard Alam
9a338b8105 - don't delete locales folder unless building locales 2013-04-28 17:15:05 +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
9d20b66e5f - remove copying of join-mock.xml as we don't support that anymore 2013-04-27 13:08:44 -07:00
Richard Alam
2f30fd4485 - check if user can connect using RTMP or RTMPT 2013-04-17 21:47:12 +00:00
Richard Alam
dc69530bf0 - start add cam check 2013-04-16 21:17:00 +00:00
Richard Alam
420e7fe339 Merge branch 'implement-pre-flight' 
Conflicts:
	bigbluebutton-client/build.xml
 2013-04-16 17:43:24 +00:00
Richard Alam
3481b80230 - check for microphone 2013-04-16 15:42:31 +00:00
Richard Alam
9252447a92 - make polling module run with latest master 2013-04-15 20:48:10 +00:00
Hugo Lazzari
ac7faa4708 Add shared_notes.js to sharedNotes Module and to build. 2013-03-26 12:30:10 -03:00
Richard Alam
d9dc599b24 - add a black theme file 2013-03-23 20:48:55 +00:00
Chad Pilkey
df557b89af changed all internal references to participants to users 2013-03-15 18:53:39 -04:00
Hugo Lazzari
d2ff0885f1 Continuing to remove old files. 2013-03-14 12:36:48 -03:00
Richard Alam
c24cf55d9c Merge branch 'master' into unify-users-and-listeners 
Conflicts:
	bigbluebutton-client/build.xml
 2013-02-19 21:31:56 +00:00
Richard Alam
93311e6464 Merge branch 'master' into merge-master-into-polling-module 
Conflicts:
	bigbluebutton-client/build.xml
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/src/BigBlueButton.mxml
 2013-02-04 19:34:23 +00:00
Chad Pilkey
875df8ca30 all strings are now localised 2013-02-01 17:51:09 -05:00
Markos Calderon
6389cda5e0 updating deskshare applet 2013-01-28 14:01:29 -05:00
Chad Pilkey
3ecaab1ba5 participant window added 2013-01-18 18:00:03 -05:00
Richard Alam
777ce82156 - add notes module into build 2012-12-31 18:51:29 +00:00
Richard Alam
767d933bea - build the right default style 2012-12-28 17:44:41 +00:00
Richard Alam
6b36e0011a - build BBB default style 2012-12-28 17:32:14 +00:00
Richard Alam
39953cf78e - drag in broadcast module into 0.81 2012-12-19 16:08:17 +00:00
Richard Alam
5ca219523e - add webcam view standalone app 2012-12-13 21:02:44 +00:00
Richard Alam
1fd4504613 - build a webcam preview standalone app 2012-12-06 20:23:03 +00:00
Richard Alam
1cd682e1e0 - pass avatar in avatarURL during join API call. Have a default avatarURL 2012-12-02 10:57:58 +00:00
Richard Alam
7485de0c74 - remove building unneeded modules 2012-11-23 21:25:22 +00:00
Richard Alam
d0bba49293 - enable debugging 2012-11-23 21:20:15 +00:00
Felipe Cecagno
2cd83eb0e6 Merge commit 'v0.8' into sharedNotes 2012-10-17 14:59:32 -03:00
Hugo Lazzari
996699078e Feature #431 new url and favicon. 2012-10-02 11:55:36 -03:00
Chad Pilkey
f9b501f1f0 Merge remote branch 'origin/master' into poll-access 2012-09-24 15:16:02 +00:00
Richard Alam
c90ae01f09 - take layout.xml from resources dir 2012-08-22 21:27:27 +00:00
jtrobinson
50a2e83153 Fixed permission issue 2012-08-22 16:23:18 +00:00
Gustavo Salazar
7735ff6d62 build client for Flash Player 11 2012-07-31 17:49:09 -05:00
Richard Alam
cbe0ee60cc - merge some new stuff 
Conflicts:
	bigbluebutton-web/.gitignore
 2012-07-29 16:06:39 +00:00
Fred Dixon
091a6855a8 Updated build.xml for client to copy layout.xml to /conf/layout.xml directory 2012-07-25 14:40:33 -04:00
Richard Alam
b3b74a191b - remove unneeded modules from build 2012-07-13 20:31:02 +00:00
Richard Alam
1d4ee2862c Merge branch 'layout-module' 2012-07-06 15:03:49 +00:00
Richard Alam
d4b1c41298 - updating deskshare applet filename to 0.8 2012-06-05 21:09:37 +00:00
Felipe Cecagno
c38186cf6f some minor updates; fixed a bug when the restored windows doesn't show up with the minimize button 2012-05-23 13:51:00 -03:00
Felipe Cecagno
f0214fa580 implements the very first prototype of the layout module; the admin put the layout definitions in a XML file, and the user may apply the layouts independently; the users also can extract the current layout to add directly to the xml file with the layout definitions 2012-05-22 23:13:12 -03:00
Felipe Cecagno
c8477fc15b fixed the compilation of the shared notes module; created the class to encapsulate the config options for the shared notes module; improved the layout implementation, and added the "autoStart" feature to the shared notes module 2012-03-13 16:34:27 -03:00
firstuser
ff493885c9 Merge branch 'master' into sharedNotes0.8 2012-03-12 12:26:54 -03:00
Fred Dixon
9fd046a961 remove code to copy config.xml and join-mock.xml, will leave these steps to the instructions 2012-02-22 19:41:47 -05:00
Fred Dixon
24c1c69156 Added logic in build.xml to copy config.xml and join-mock.xml if not in the bigbluebutton-client source tree 2012-02-22 17:32:55 -05:00
Felipe Cecagno
334ed6db81 Merge branch 'master' into sharedNotes0.8 
Conflicts:
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
	bigbluebutton-client/build.xml
	bigbluebutton-client/html-template/index.template.html
	bigbluebutton-client/html-template/sharednotes/diff_match_patch_uncompressed.js
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/ServerConnection.as
 2012-02-17 14:04:31 -02:00
Richard Alam
0bad7f6a59 - statically link RSLs to amke sure dependencies are available and those behind strict firewalls that can't download from 
Adobe will be able to run the client
 2012-01-03 22:25:57 +00:00
Richard Alam
51bd29b094 allow embedding of runtime shared lib (RSL) by passing -DSTATIC_RSL=true in ant 
ie. ant -DSTATIC_RSL=true
 2011-10-06 22:16:40 -04:00
Richard Alam
7d512f0f5d embed audio file for voice checking 2011-10-04 18:30:23 -04:00
Richard Alam
51f8fa0c04 add the expressIinstall.swf file to trigger installing/upgrading of Flash Player if it doesn't meet 
minimum requirement
 2011-09-26 10:52:11 -04:00
Richard Alam
5ae3ec24d7 modify BigBlueButton.html to use swfobject. 2011-09-22 16:48:49 -04:00
Richard Alam
e6aae4aa80 don't delete locales when running "ant clean" 2011-09-21 16:50:23 -04:00
Richard Alam
345c37ae1b add more comments on build 2011-09-21 10:11:20 -04:00
Richard Alam
709f1c25cd look into locale directory on what locales to build instead of relying on hardcoded locale string 2011-09-20 18:28:22 -04:00
Richard Alam
faf6520e74 separate building of locales as it takes a long time for the client to build. The steps now are 
ant
   ant localization
 Also, fix bundle problem when building locates by adding the required resources. Otherwise, Flash will
 choke when the bundled resource (e.g. effects) hasn't been compiled when loading the locale SWF file.
 2011-09-20 14:50:41 -04:00
Richard Alam
f2253e4878 compile all locales 2011-09-20 09:41:39 -04:00
Richard Alam
11e08ebde2 Merge video docking module from mconf. There are minor bugs which may be due 
to using Flex 4.5
 2011-09-19 16:40:18 -04:00
Felipe Cecagno
7390c477f8 Merge branch 'sharedNotes' into sharedNotes-updated 
Conflicts:
	bigbluebutton-client/build.xml
	bigbluebutton-client/resources/prod/BigBlueButton.html
 2011-09-19 15:56:04 -03:00
Richard Alam
b32b0001eb - add audio sample file 2011-09-09 21:03:27 +00:00
Richard Alam
558f5961e8 - change Flash Player version from 11.2 to 10.3 as Flash 11 is still beta 2011-08-17 14:16:07 +00:00
Richard Alam
93805c1101 - generate config.xml from template when build from hudson 2011-07-23 16:54:05 +00:00
Richard Alam
7cec704916 - play around with h264 2011-07-21 17:21:52 +00:00
Richard Alam
869ea7662f - Merge branch 'echo-cancel' of git://github.com/bigbluebutton/bigbluebutton into echo-cancel 
- Make compile with Flex SDK 4.5 and with v0.71a VM

Conflicts:
	bigbluebutton-client/build.xml
	bigbluebutton-client/html-template/index.template.html
	bigbluebutton-client/src/org/bigbluebutton/main/views/LanguageSelector.mxml
 2011-06-24 19:31:08 +00:00
BigBlueButton
09d3a55654 Removed localization building from build.xml. Moved the ant build to Flex 4 w/ Flex 3 compatibility. Client now builds with Flex 4 from command line, but needs Adobe's non-OS Flex SDK to work (but only because the OS version of Flex 4.5 is corrupted and can't be downloaded). The SDK also needs playerglobal.swc for Flash 10.3 added to it. 2011-05-10 21:30:04 +00:00
deniszgonjanin
5e41c46ea6 Added Settings Module to build.xml 2011-04-22 23:05:08 +00:00
@deniszgonjanin
8b1f180a1d Serbian (Latin) and Croatian translations 2011-04-21 14:46:21 -04:00
@deniszgonjanin
c07478c39e Serbian translation 2011-04-17 17:57:51 -04:00
deniszgonjanin
c0d9b16c91 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-03-27 21:45:55 +00:00
deniszgonjanin
46eb5c7dc7 Cleaned up HTML template of the client. Moved all javascript functionality to external java script files 2011-03-27 21:45:08 +00:00
Localization Server
3a775bbd35 Adding the Nepali locale 2011-06-08 17:49:00 +00:00
Localization Server
2fd282eef7 Adding the Basque Locale 2011-06-06 14:26:35 +00:00
Localization Server
708c3201e0 Adding the mongolian locale 2011-06-01 15:46:54 +00:00
Omar Shammas
0b2161bee0 Adding the Bengali locale. 2011-05-18 08:35:38 -07:00
Marco Calderon
01a5490421 added korean and update dutch locale 2011-03-07 03:45:42 +00:00
Marco Calderon
5a58b9ba11 - added indonesian and portuguese (brazil) locales 2011-03-06 07:35:59 +00:00
deniszgonjanin
20ab541cf4 New task for client's build.xml to allow for building a single module only, to save time when developing from outside Flash Builder 2011-03-05 15:20:13 +00:00
deniszgonjanin
63cb08fbd6 Added ClassAudioModule to build.xml and config.xml.template 2011-03-04 21:37:46 +00:00
Marco Calderon
a3231b4b39 added danish locale 2011-02-23 17:06:09 +00:00
Richard Alam
4a92404295 - add th_TH to the build 2011-02-16 10:39:57 -05:00
Richard Alam
dee59aa806 - ooooppssss.. forgot the commit build.xml 2011-02-15 12:14:44 -05:00
deniszgonjanin
c130105b2c SharedNotesModule task to the build.xml script 2011-02-13 19:19:13 +00:00
deniszgonjanin
71b7ff1ccb Added the Example module to the client's build.xml, so it can be compiled in the dev environment as well as in Flash Builder 2011-02-12 08:42:02 +00:00