BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,817 Commits 13 Branches 260 Tags 1.1 GiB
8dd374c78c
Commit Graph

7817 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fred Dixon
b1c22ad8fd Set autoJoin to true to display audio options on loading 2014-08-12 22:38:25 -04:00
Fred Dixon
3818fd5ae9 Removed execute permissions from lti.nginx 2014-08-12 18:32:19 -04:00
Chad Pilkey
42bd6885d1 Merge branch 'merge-polling-with-master' of https://github.com/bigbluebutton/bigbluebutton into fix-whiteboard-toolbar-visibility 2014-08-12 12:05:35 -07:00
Chad Pilkey
fb9b1b9f1e fixed the height of the locale combobox 2014-08-11 14:42:13 -07:00
Fred Dixon
24f7789712 Merge pull request #354 from kepstin/recording-updates 
Switch "post" scripts to be a drop-in directory.
 2014-08-11 16:01:24 -04:00
Calvin Walton
8f7bf010fd Switch "post" scripts to be a drop-in directory. 2014-08-11 14:57:32 -04:00
Chad Pilkey
f48855697f cleaned up the meeting name display logic a little 2014-08-11 10:20:53 -07:00
Chad Pilkey
e2079cc358 added escape to the username in sipjs user agent 2014-08-11 10:04:02 -07:00
Chad Pilkey
3ad3693933 Merge branch 'merge-polling-with-master' of https://github.com/bigbluebutton/bigbluebutton into minor-client-fixes 2014-08-10 20:35:01 -07:00
Chad Pilkey
4962e8e208 removed the speed indicator from mxml, styled the layout selector, changed the default layout from 'Default' to 'Default Layout' 2014-08-10 20:22:23 -07:00
Fred Dixon
7269e76143 Minor updates to index.html 2014-08-10 18:35:32 -04:00
Chad Pilkey
b5cc4ec31d Merge remote-tracking branch 'upstream/merge-polling-with-master' into fix-chrome-webrtc 2014-08-10 13:42:54 -07:00
Chad Pilkey
980100dad6 fixed an issue when leaving the audio 2014-08-10 13:39:27 -07:00
Richard Alam
5b449a89a2 Merge branch 'switch-to-sipjs' into merge-polling-with-master 2014-08-10 09:28:25 -07:00
Richard Alam
b98bd3fc25 Merge branch 'switch-to-sipjs' of https://github.com/SenecaCDOT-BigBlueButton/bigbluebutton into switch-to-sipjs 2014-08-10 09:28:03 -07:00
Richard Alam
9244dd19d0 - allow forcing user to join listen only when autoJoin=true 2014-08-10 08:42:11 -07:00
Chad Pilkey
8607c78c2a moved echo test strings to localization, and animated the dots 2014-08-10 07:56:08 -07:00
Chad Pilkey
ba6628256a changed a jssip filename to sipjs 2014-08-09 12:46:53 -07:00
Chad Pilkey
20239454bd the sipjs call is successful, added extra states to the echo test window for more feedback 2014-08-09 12:39:37 -07:00
Richard Alam
1994eece36 Merge branch 'switch-to-sipjs' of https://github.com/SenecaCDOT-BigBlueButton/bigbluebutton into switch-to-sipjs 2014-08-09 12:24:35 -07:00
Chad Pilkey
02bb29ae29 sipjs connects to the echo test and stops correctly 2014-08-09 09:38:48 -07:00
Richard Alam
281d9a8efe Merge branch 'switch-to-sipjs' of https://github.com/SenecaCDOT-BigBlueButton/bigbluebutton into switch-to-sipjs 2014-08-09 09:15:26 -07:00
Chad Pilkey
750579e342 the sipjs media request now works 2014-08-08 14:17:28 -07:00
Richard Alam
5bd7b3e793 Merge branch 'switch-to-sipjs' of https://github.com/SenecaCDOT-BigBlueButton/bigbluebutton into switch-to-sipjs 2014-08-08 13:55:03 -07:00
Richard Alam
654c93831e Merge branch 'merge-polling-with-master' into switch-to-sipjs 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2014-08-08 13:46:53 -07:00
Chad Pilkey
9a5343aac5 Merge remote-tracking branch 'upstream/master' into fix-chrome-webrtc 2014-08-08 13:19:42 -07:00
Chad Pilkey
ac7a688965 swapped jssip for sipjs, cleaned up the webrtc events, changed instances of Rtc to RTC 2014-08-08 13:19:38 -07:00
Richard Alam
e0f8272ddf Merge pull request #349 from speakserve/chat-paste-xml 
Ability to paste in XML into Chat
 2014-08-08 10:57:03 -04:00
Ghazi Triki
de8b886be8 Fixed string replacement index in ChatUtil.parseURLs 2014-08-07 23:49:59 +01:00
Richard Alam
723ee43830 - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1695 2014-08-07 13:24:52 -07:00
Richard Alam
92254d4853 - allow voice conf button to be stylized 2014-08-07 11:42:57 -07:00
Richard Alam
9c19b0d8f8 Merge pull request #352 from SenecaCDOT-BigBlueButton/fix-slide-zoom 
fixed presentation zooming on a point
 2014-08-07 14:31:10 -04:00
adam-sharpe
39cea99616 fixed presentation zooming on a point 2014-08-07 11:15:15 -07:00
Richard Alam
b04916fd84 - minor format 
- put recording indicator before meeting name
 2014-08-07 11:04:39 -07:00
Richard Alam
7ca8933ea8 - fix exception when start/stop recording 2014-08-07 11:03:49 -07:00
Richard Alam
62f9ed3944 - move locale settings to bottom 
- add recording lable to meeting name in toolbar
 2014-08-07 10:32:10 -07:00
Richard Alam
109f973cbd - check on create api call if meeting has been forcibly ended 2014-08-07 09:32:18 -07:00
Ghazi Triki
2394b34d49 Better string cleanup html/xml entities as suggested by markoscalderon. 2014-08-07 15:06:44 +01:00
Ghazi Triki
930d4d4d25 RegEx inside parseURLs method is executed only once instead of two times : fixes first match not found where there is only one match. 2014-08-07 14:48:43 +01:00
Fred Dixon
f3b4e09ae3 Merge pull request #350 from ffdixon/update-landing-page 
Updated landing page for 0.9.0-dev
 2014-08-06 19:21:28 -04:00
Ubuntu
8ef66d8b11 Updated landing page for 0.9.0-dev 2014-08-06 23:15:53 +00:00
Ghazi Triki
39cae0e920 Added missing right brace for parseURLs method. 2014-08-06 15:32:20 +01:00
Ghazi Triki
90cfc95fa1 Added missing right brace in a condition for "parseURLs" method. 2014-08-06 15:22:33 +01:00
Ghazi Triki
930048317c Chat messages can contain XML code and all links starting with http, https, ftp and www are parsed and sent correctly to chat service. 2014-08-06 15:09:44 +01:00
Richard Alam
bc8f22ff70 - allow joining audio skipping mic check 2014-08-05 13:59:01 -07:00
Richard Alam
49687d2f8a - fix setconfigxml exception 2014-08-05 11:14:35 -07:00
Richard Alam
e6f1c6a852 - add string to locale 2014-08-05 11:14:23 -07:00
Richard Alam
11c9d21229 - add string to locale 2014-08-05 11:13:58 -07:00
Richard Alam
1323492180 - cleanup 2014-08-05 11:13:40 -07:00
Richard Alam
0eb48379f2 - add recording indicator label 2014-08-05 09:31:27 -07:00