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

493 Commits

Author SHA1 Message Date
Richard Alam
83d15332d6 Merge pull request #387 from SenecaCDOT-BigBlueButton/chrome-webcam-permission-prompt 
Chrome webcam permission prompt
 2014-09-08 14:54:09 -04:00
Richard Alam
0d3e23db21 - update locales 2014-09-02 12:01:20 -07:00
Fred Dixon
e02476071d Make clear this is a private echo test 2014-09-01 16:48:00 -04:00
syeshchenko
1d148ef624 Merge branch 'master' into chrome-webcam-permission-prompt 2014-09-01 13:18:32 -07:00
syeshchenko
ae6a4d5fa1 on Chrome show webcam permission prompt before webcam preview opened 2014-09-01 13:10:50 -07:00
Fred Dixon
88a0455248 Tweak phrasing for private echo test 2014-08-29 11:51:31 -04:00
Fred Dixon
9380a73dac Added message to let administration know that monit will restart bbb-record-core and LibreOffice. Tweaked the language for audio settings dialog. 2014-08-28 17:39:59 -04:00
Richard Alam
94cfbafb0a Merge pull request #380 from SenecaCDOT-BigBlueButton/unsupported-deskshare-chrome-on-mac 
identify if user is on mac and chrome and show the warning during deskto...
 2014-08-26 16:47:38 -04:00
syeshchenko
5ccc49cde9 properly resized presentation file list, centered file format hint text and fixed typo 2014-08-26 13:25:32 -07:00
syeshchenko
77b7d4b327 identify if user is on mac and chrome and show the warning during desktop share 2014-08-26 12:02:08 -07:00
Richard Alam
4cb7faaa49 - update localization 2014-08-24 11:02:00 -07:00
Fred Dixon
a374c59e30 Renamed 'WebRTC' -> 'WebRTC Audio' so users have a better chance of knowing what this indicator means 2014-08-23 21:57:03 -04:00
Fred Dixon
35b3c6b1bf Corrected wording in prompt for user to give permission to access microphone (FireFox) 2014-08-23 18:47:31 -04:00
Richard Alam
ba5b2d357f Merge pull request #379 from SenecaCDOT-BigBlueButton/sort-raisehand-better 
minor client updates
 2014-08-23 15:35:19 -04:00
Chad Pilkey
8e9477bbe8 sort based on handraised, move strings to locale, minor tweaks to the audio dialogs 2014-08-23 12:31:28 -07:00
Fred Dixon
9d37588495 Minor tweaks in language strings 2014-08-23 08:06:52 -04:00
Fred Dixon
55baf5b0be Minor updates to prompts 2014-08-21 21:18:10 -04:00
syeshchenko
85d3e5f72a properly resized upload presentation window, removed unnecessary text 2014-08-21 10:48:13 -07:00
Chad Pilkey
84c5197097 Merge remote-tracking branch 'upstream/master' into enable-raisehand-for-all 2014-08-19 10:57:10 -07:00
Chad Pilkey
1689a86113 the raise hand button is now visible for all users 2014-08-19 10:56:03 -07:00
Fred Dixon
ec707f829f Minor tweak to the webRTC notification (lower right-hand corner) 2014-08-19 13:10:47 -04:00
Fred Dixon
374828105f Tweaking the language for the Audio Test dialog 2014-08-19 13:02:15 -04:00
Chad Pilkey
3dee8327f6 Merge pull request #366 from SenecaCDOT-BigBlueButton/misc-client-fixes 
Misc client fixes
 2014-08-18 12:27:38 -04:00
Chad Pilkey
7595dbebd2 added notifications to the users window for room mute and lock state 2014-08-18 09:25:00 -07:00
Fred Dixon
1db651ffcd Minor tweaks to text phrases and icons 2014-08-17 22:15:49 -04:00
Chad Pilkey
9daf1d7a16 added styling to the fileupload help, also cleaned up some text 2014-08-17 13:56:15 -07:00
Chad Pilkey
d044596b82 added a notification for when you are using webrtc 2014-08-16 11:35:00 -07:00
Richard Alam
19de54ce9e Merge pull request #360 from SenecaCDOT-BigBlueButton/audio-button-click-bug 
Fixed mic button won't change status when flash voice stopped. Added use...
 2014-08-15 13:53:04 -04:00
syeshchenko
d34db11f43 Fixed mic button won't change status when flash voice stopped. Added user feedback when flash echo test in progress and flash echo test failed. 2014-08-15 09:42:49 -07:00
Chad Pilkey
3aedc92187 Merge remote-tracking branch 'upstream/merge-polling-with-master' into recording-notification 2014-08-14 11:22:38 -07:00
Chad Pilkey
f38ff557a1 added a reminder to the recording button 2014-08-14 11:21:21 -07:00
Richard Alam
c56fde0c42 Merge pull request #348 from speakserve/unify-version-number 
Unify version number
 2014-08-13 14:17:45 -04: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
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
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
Chad Pilkey
8607c78c2a moved echo test strings to localization, and animated the dots 2014-08-10 07:56:08 -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
e6f1c6a852 - add string to locale 2014-08-05 11:14:23 -07: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
Richard Alam
806a09ec3f - update copyright year 2014-07-25 08:03:32 -07:00
Richard Alam
0dd1b37afd Merge branch 'merge-polling-with-master' into broadcast-layout 2014-06-06 22:14:32 -07:00
Richard Alam
aac2dd3c3c - chnage label on lock settings 2014-06-06 21:26:01 -07:00
Richard Alam
262f94b69c Merge branch 'merge-polling-with-master' into broadcast-layout 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2014-06-06 15:34:35 -07:00
Chad Pilkey
632096fd64 the phone option is now somewhat configurable 2014-06-05 13:52:37 -07:00
Chad Pilkey
9b86798f21 cleaned up the file upload window and made it so that when you click the file name it will open the native file dialog 2014-06-04 11:47:24 -07:00
Chad Pilkey
344103922a moved the webrtc call failed alertbox text to locales 2014-06-03 13:14:05 -07:00
Chad Pilkey
f6cb040908 moved the audio selection window strings to the locale file 2014-06-03 09:00:41 -07:00
Richard Alam
04c271996d Merge branch 'broadcast-layout' of github.com:mconf/bigbluebutton into broadcast-layout 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/layout/LayoutApp.scala
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/events/LayoutEvent.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/services/LayoutService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/services/MessageReceiver.as
 2014-05-29 11:21:01 -07:00