BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,838 Commits 13 Branches 260 Tags 1.1 GiB
56818e8dce
Commit Graph

204 Commits

Author SHA1 Message Date
jfederico
61c5571a4e Added logic for autoclose index page when close=tru parameter is included 2016-06-30 14:59:41 -04:00
Pedro Beschorner Marin
17fc566975 Merge remote-tracking branch 'mconf/mconf' into bigbluebutton-v1.0.0 
Conflicts:
	bigbluebutton-client/locale/es_LA/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml
	bigbluebutton-config/web/default.pdf
	bigbluebutton-config/web/index.html
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
 2016-06-17 18:00:51 +00:00
Fred Dixon
bd9124d286 Bump version on index.html page to 1.1-dev 2016-05-28 13:03:26 -04:00
Richard Alam
41a258dd59 Merge branch 'bbb-web_fix-maxParticipants-by-tracking-joins' of https://github.com/jfederico/bigbluebutton into jfederico-bbb-web_fix-maxParticipants-by-tracking-joins 
Conflicts:
	bigbluebutton-config/web/index.html
 2016-05-20 15:28:19 +00:00
jfederico
0ce17ca9c2 bbb-config: index.html is now able to handle error messages when used as the default logoutURL 2016-05-18 16:07:13 -04:00
Fred Dixon
6964f69acd Added blank pages to defaut.pdf for whiteboard 2016-05-14 09:49:50 -04:00
Fred Dixon
2a5469f269 Move from 1.0-RC to 1.0 2016-05-14 09:45:26 -04:00
Fred Dixon
7dc0871a28 Change from 1.0.0-Beta to 1.0.0-RC 2016-04-13 17:14:40 -04:00
Fred Dixon
4f73858521 Update index.html 
Bump the copyright date.
 2016-02-06 13:55:43 -05:00
Fred Dixon
c9c107014d Update index.html 2015-10-05 11:44:47 -04:00
Fred Dixon
d8cd5f7edd Update index.html 
Changed footer to show 1.0-beta
 2015-10-05 10:55:49 -04:00
Fred Dixon
2051913359 Added Chat, Emoji, and Polling to index page 2015-09-23 17:00:26 -04:00
Fred Dixon
c2ca2e13e3 Incremented version to 1.0.0-dev 2015-07-02 17:10:09 -04:00
Felipe Cecagno
2a5f4ebedb cleanup; reverted the implementation which avoid the user to join twice using the same internal user id because the enter call was modified to change the internal user id everytime it's called; reverted a few files with different line endings than the original; merged properly the html5 client code 2015-05-17 23:08:41 -03:00
Fred Dixon
9261791fc9 Updated footer link with new docs 2015-04-29 20:41:53 -04:00
Fred Dixon
8a27d4496c Updating strings for 0.9.0-RC 2015-04-15 11:20:01 -04:00
Fred Dixon
1150572f3f Updated copyright date on home page demo 2015-01-15 18:25:30 -05:00
Fred Dixon
eeebed20f1 added support for utf-8 characters in submit form on index.html 2014-12-14 15:53:00 -05:00
Felipe Cecagno
f188976fbc put back the guest access in the mconf demo; reverted the index.html to not use iframe anymore 2014-12-11 09:48:38 -02:00
Felipe Cecagno
a3acb00893 Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 
Conflicts:
	bbb-video/build.gradle
	bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
	bigbluebutton-config/web/default.pdf
 2014-11-22 20:28:39 -02:00
Fred Dixon
b6ab48000b Updates to default.pdf for 0.9.0 2014-10-25 17:37:53 -04:00
Felipe Cecagno
4b70ab8aca copied the demo page from mconf-live0.5.2, removing the guest flag which hasn't been integrated into this branch yet 2014-10-10 19:51:10 +00:00
Felipe Cecagno
59debc5d1e Merge branch '090-mconf-branding' into mconf-live0.6.1 2014-10-05 23:32:43 -03:00
Felipe Cecagno
015d708d7c Merge branch 'mconf-branding-0.81' into 090-mconf-branding 
Used the following command to comment the default copyright label for all languages except en_US
find -name bbbResources.properties | xargs sed -i "s:^\(bbb.mainshell.copyrightLabel2.*\):# \1:g"

Conflicts:
	bigbluebutton-client/resources/prod/MconfLive.html
	bigbluebutton-client/src/BigBlueButton.mxml
	record-and-playback/presentation/playback/presentation/playback.html
 2014-10-05 19:36:43 -03:00
Fred Dixon
f305a9b3cb Slightly lower memory check for 4G for servers to avoid warnings on servers with close to 4G 2014-09-14 14:09:15 -04:00
Fred Dixon
51dbe652ff Minor change to URL for bigbluebutton.org on index.html 2014-09-14 13:56:39 -04:00
Fred Dixon
34bb061312 Change 0.9.0-dev to 0.9.0-beta on index.html 2014-09-01 20:36:20 -04:00
Fred Dixon
b00be616da More tweaks on the language in index.html 2014-09-01 20:14:02 -04:00
Fred Dixon
7301d35941 Updates to text and tutorial videos on home page 2014-09-01 20:00:01 -04:00
Fred Dixon
93f6dcafab Upping version from 0.9.0-dev to 0.9.0-beta 2014-09-01 17:05:33 -04:00
Fred Dixon
8d3a2249f5 Updated default PDF with text on each blank page 2014-08-21 21:17:51 -04:00
Fred Dixon
854e581cd5 text changes to bbb-conf and index.html 2014-08-21 20:49:23 -04:00
Fred Dixon
f2efd93210 bbb-cond now ignores if redis.pass is blank in bigbluebutton.properties 2014-08-19 12:58:18 -04:00
Fred Dixon
24ea43ba8f Updates to images for webRTC audio 2014-08-17 19:36:31 -04:00
Fred Dixon
c1b325f92f Test commit 2014-08-17 17:07:39 -04:00
Fred Dixon
5c6449ad27 Updated index.html page 2014-08-17 16:48:14 -04:00
Fred Dixon
7269e76143 Minor updates to index.html 2014-08-10 18:35:32 -04:00
Ubuntu
8ef66d8b11 Updated landing page for 0.9.0-dev 2014-08-06 23:15:53 +00:00
Fred Dixon
2642cd0486 Added some blank pages to default presentation to use as a whiteboard 2014-06-12 17:36:50 -04:00
Fred Dixon
f217cbc786 updated release to 0.9.0-dev 2014-03-13 01:19:25 +00:00
Fred Dixon
b12188fbed Changing lables for 0.81 2013-11-07 20:08:36 -05:00
Fred Dixon
149ea185f2 Updating version to 0.81-RC5 2013-10-30 14:47:16 -07:00
Richard Alam
c4855876c3 - change test java link 2013-10-21 21:50:38 +00:00
Fred Dixon
8cc76d5c61 Updating label to RC4 2013-10-20 15:46:12 -04:00
Jesus Federico
a4987f84b8 Update index.html 
bigbluebutton-config: Fixed typo error on "Google Plus" logo
 2013-10-18 15:45:10 -04:00
Fred Dixon
381ddbf3a9 Updated labels for 0.81-RC3 2013-10-09 14:05:55 -04:00
Fred Dixon
a84c6ca8e8 Configuration updates for moving to 0.81-RC2 2013-09-26 16:42:27 -04:00
Nadia Noori
c2c344ed79 Changing lable to RC1 2013-09-04 14:24:19 -04:00
Fred Dixon
a306eac7cf Modified test Java link in default.pdf 2013-07-27 19:34:25 -07:00
Fred Dixon
c60d739584 Updated defaut.pdf to have a link to test running a Java applet (for testing desktop sharing) 2013-07-27 19:16:15 -07:00
Tyler Copeland
57b85b9c58 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-07-19 11:48:19 -04:00
Tyler Copeland
c40ae796d8 Updates to demo landing page 2013-07-19 11:47:32 -04:00
Fred Dixon
54d7bfeab0 Fixed date on my VM, commits now have proper timestamp. Updated index.html to read 0.81-beta-2 2013-07-16 19:32:59 -07:00
Fred Dixon
253636ebf6 Updated version to 0.81-beta-2 2013-06-18 05:07:56 -07:00
Fred Dixon
81988c2e68 Updated index.html page to read 0.81-beta 2013-06-16 06:59:08 -07:00
Fred Dixon
37cecc3259 Removed auto focus from joining demo meeting 2013-06-11 17:51:49 -07:00
Fred Dixon
8080c4c969 Simplifying the default welcome presentation 2013-06-11 16:23:19 -07:00
Fred Dixon
5935f8b1b0 More tweeks to the default presentation 2013-06-08 15:48:26 -07:00
Fred Dixon
b5080d7aca Reording of content on index.html page 2013-06-08 15:03:47 -07:00
Fred Dixon
bc0f5c8987 Minor font changes to default presentation for BigBlueButton 0.81 2013-06-08 12:57:06 -07:00
Fred Dixon
086c49633c Updated default presentation for BigBlueButton 0.81 2013-06-08 12:40:20 -07:00
Fred Dixon
2cdaf09be1 Minor updates to index.html page 2013-06-08 10:46:41 -07:00
Fred Dixon
33a9c92b39 Reformatting of the index.html page 2013-06-07 14:14:20 -07:00
Tyler Copeland
813816d18d Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-06-05 23:46:05 -04:00
Tyler Copeland
a786af2b57 fixed images on landing page 2013-06-05 23:45:57 -04:00
Tyler Copeland
067e33d64b Updated images on demo landing page 2013-05-31 16:42:06 -04:00
Tyler Copeland
663dcac797 demo landing page updates 2013-05-31 16:38:44 -04:00
Fred Dixon
ba7ba649b2 Added direct link to developer video 2013-06-02 04:27:54 -07:00
Fred Dixon
676408e646 Minor tweak to increase the height of border on default landing page 2013-05-12 11:54:57 -04:00
Tyler Copeland
63eb97db66 Updated image for 081 landing page 2013-05-03 15:21:33 -04:00
Fred Dixon
7ff8bb2cff Updated image for 0.81 overview video 2013-04-20 18:10:28 -07:00
Fred Dixon
8ebf42ccdf Updated text on index.html page 2013-04-20 18:00:06 -07:00
Fred Dixon
ef9dc77c51 Updated index.html to link to overview video 2013-04-20 17:55:13 -07:00
Fred Dixon
bdf3663bc4 Added link to BigBlueButton Google+ page on index.html 2013-04-12 21:00:26 -04:00
Fred Dixon
ac79e858bf updated copyright on index.html to 2013 2013-04-10 23:16:04 -04:00
Fred Dixon
2addc78f59 Incremented version on landing page to 0.81-dev 2012-07-17 16:30:35 -04:00
Fred Dixon
f6caf218a4 Updated Copyright to 2012 2012-06-08 21:02:53 -04:00
Fred Dixon
27d01b29e7 Updated Copyright to 2012 2012-06-08 20:46:17 -04:00
Fred Dixon
c0c688a743 Updated Copyright to 2012 2012-06-08 20:44:45 -04:00
Fred Dixon
c5fc27731b Updated Fork Me on GitHub banner to use proper URL 2012-06-08 20:43:35 -04:00
Fred Dixon
079c830647 Changed index.html page to state 0.8 2012-06-08 20:25:19 -04:00
Richard Alam
b4c939a99f - change to RC3 2012-06-03 15:08:39 +00:00
Richard Alam
172205e107 - making change on landing page to say 0.8 2012-06-03 14:57:55 +00:00
Fred Dixon
52302ce0a0 Updated version on index.html to RC2 2012-05-11 04:04:02 -04:00
Fred Dixon
aba4c587fe Minor edit on version in index.html 2012-04-27 10:55:07 -04:00
Fred Dixon
5a076109e2 Updated version number to 0.8-RC1 -- more testing 2012-04-27 10:40:53 -04:00
Fred Dixon
907aed9077 Increased version number to 0.8-beta-4c -- we're getting close 2012-04-25 17:17:39 -04:00
Fred Dixon
3aada13ae2 Added link for BigBlueButton in index.html 2012-04-05 10:56:05 -04:00
Fred Dixon
36c701eb4a Updated demo page to show 0.8-beta-4b 2012-04-04 18:13:04 -04:00
Fred Dixon
4d6c2c1bea Updated default.pdf for the new mute/unmute buttons 2012-03-04 21:32:14 -05:00
Fred Dixon
870fc275c6 Updating the default.pdf (which is loaded by default on each session) with more information for first-time users. 2012-02-10 14:44:41 -05:00
Tyler Copeland
352e3a4eec BigBlueButton CSS fixes 2012-01-26 16:08:13 -05:00
Tyler Copeland
b50a89436d New BigBlueButton Landing Page 2012-01-26 15:38:35 -05:00
Tyler Copeland
fa54fdbf98 New BigBlueButton Landing Page 2012-01-26 15:35:04 -05:00
Fred Dixon
dfa84d031f Preparting for release of 0.8-beta-4 2012-01-15 12:32:59 -05:00
Richard Alam
9c8aeae213 - if there are no pre-uploaded presentation passed through the api, pre-upload a default presentation 2012-01-10 16:25:46 +00:00
Fred Dixon
1832ed1da4 Updating index.html for beta-3 2011-11-08 18:51:53 -08:00
Fred Dixon
1b92aff1ef Updated index.html page to read 0.8-beta-2 2011-09-29 18:15:20 -07:00
Fred Dixon
3ce3820e89 More cleanup for the API demos 2011-09-04 15:27:19 -07:00
Fred Dixon
9e9db371e2 Modified index.html for 0.8-beta. Added checks in bbb-conf --check to ensure redis was running 2011-08-20 12:13:03 -07:00