BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,784 Commits 13 Branches 260 Tags 1.1 GiB
1722db573a
Commit Graph

6784 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
1f080c78e0 - now late comers can display current presentation page 2014-02-10 19:39:05 +00:00
Gustavo Salazar
edf9518a31 Merge master branch to add style in mic settings. 2014-02-10 11:03:15 -08:00
Richard Alam
20f3e41038 - alittle bit of formatting 2014-02-09 20:20:01 -05:00
Richard Alam
03d4b05217 - continue fixing presentation. Looks like it synchs. Need to fix why 
current page of presentation doesn't display for late comer.
 2014-02-09 15:51:05 -05:00
Richard Alam
0993a06af3 - fix issue where in goto page, the previous page is still marked as current page 2014-02-09 15:17:42 -05:00
Richard Alam
d4b02df765 - fix go to slide message 2014-02-08 19:51:46 -05:00
Richard Alam
f12ec75377 - slowly making presentation work again 2014-02-08 17:56:13 -05:00
Richard Alam
aa8f68076f - try to figure out logging 
- send presentation messages as JSON
 2014-02-08 15:29:12 -05:00
Richard Alam
ff333b9232 - handle get presentation info message 2014-02-08 14:20:05 -05:00
Richard Alam
9fa2ca2e38 - fix presentation conversion message 2014-02-07 22:35:52 -05:00
Gustavo Salazar
ea0c763712 Merged with https://github.com/mconf/bigbluebutton/tree/webrtc_support 2014-02-07 16:56:23 -08:00
Richard Alam
1c5c3cbdf3 - try to fix presentation messages 2014-02-07 17:23:11 -05:00
Richard Alam
cf321098ac - try to get presentation working again 2014-02-07 14:14:28 -05:00
Richard Alam
307e9856c4 - breakdonw presentation messages into spearate messages 2014-02-07 09:10:14 -05:00
Richard Alam
1430eff18d - update locales to show java7u51 2014-02-06 16:53:26 -05:00
Richard Alam
f70d82f1ca - fix message handling issue 2014-02-06 16:17:40 -05:00
Richard Alam
06d03298c4 - wire app voice conference service 2014-02-06 15:00:31 -05:00
Chad Pilkey
fcb8188c02 Merge pull request #304 from SenecaCDOT-BigBlueButton/pretty-micsettings 
Pretty micsettings
 2014-02-06 11:27:02 -05:00
syeshchenko
850558ac15 Disable file list when file upload process running 2014-02-05 11:06:57 -08:00
syeshchenko
06bf0fe049 Add file format hint message 2014-02-05 11:01:23 -08:00
Chad Pilkey
d8bbfbfa36 moved the Mic Warning strings to the locale file and fixed up a bug with the chrome warning popup 2014-02-04 15:42:46 -08:00
Chad Pilkey
9594efcadb Merge remote branch 'upstream/master' into pretty-micsettings 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MicSettings.mxml
 2014-02-04 15:27:06 -08:00
Chad Pilkey
ecac0b7a1d fixed up the ui of the audio settings a little bit 2014-02-04 14:43:20 -08:00
Gustavo Salazar
921405f3b6 change style in audio warning 2014-02-04 14:12:18 -08:00
Gustavo Salazar
fe21539a6c hide 'chrome allow' image when user joins anyway 2014-02-04 12:51:05 -08:00
Fred Dixon
b8a04f18d5 Fixed typo that prevented wget from making API call 2014-02-03 11:51:55 -05:00
Chad Pilkey
0a4336e24e Merge pull request #303 from SenecaCDOT-BigBlueButton/enable-colorpicker 
Enabled colorpicker
 2014-01-31 15:26:44 -08:00
syeshchenko
4a0a702165 enabled colorpicker 2014-01-30 14:27:54 -08:00
Gustavo Salazar
99866d43a7 Print audio file name with problems. 2014-01-30 10:45:43 -05:00
Chad Pilkey
8728670e7e Merge pull request #302 from SenecaCDOT-BigBlueButton/fix-bug-1716 
fixed bug 1716 - fixed an index out of bounds exception in repeatChatMessage
 2014-01-29 12:45:44 -08:00
Chad Pilkey
8b86dc82eb fixed bug 1716 - fixed an index out of bounds exception in repeatChatMessage 2014-01-29 12:40:23 -08:00
Richard Alam
753cac6b03 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audiosettings 2014-01-28 18:27:21 +00:00
Richard Alam
d6335d0874 Merge branch 'master' into audiosettings 2014-01-28 18:26:43 +00:00
Gustavo Salazar
8a32c657d5 Handle negative index in slide number. 
Related to issue #1710
 2014-01-23 16:36:28 -05:00
Gustavo Salazar
614cbdde92 Fix #1711 
Support pdf extension in uppercase https://code.google.com/p/bigbluebutton/issues/detail?id=1711
 2014-01-23 14:03:09 -05:00
Chad Pilkey
bdc12d7f4e Merge pull request #296 from mconf/presentation-arrow-keys 
Re-enabling the common shortcut keys to change the slides
 2014-01-20 10:21:35 -08:00
Gustavo Salazar
6c51099e26 Merge branch 'audiosettings' of github.com:gugat/bigbluebutton 2014-01-20 09:25:06 -08:00
Tiago Daniel Jacobs
a62d19dc06 Merge remote-tracking branch 'remotes/origin/master' 2014-01-20 01:21:02 -02:00
Tiago Daniel Jacobs
ac265adb1e Fixed lockSettings config loading with dynamic config.xml; 2014-01-20 01:20:04 -02:00
Richard Alam
c2bda20c82 - implement handling of FS ESL messages 2014-01-17 16:25:14 -05:00
Richard Alam
5037c4472c - propagate voice user join event 2014-01-17 04:13:45 -05:00
Richard Alam
8a74d3a41a - fix compile issues 2014-01-16 23:19:23 -05:00
Richard Alam
d3d259527e - update to java 7u51 2014-01-16 20:58:39 -05:00
Richard Alam
973237f6ca - fix compile issue 2014-01-16 18:40:05 -05:00
Richard Alam
a6a58e6ecb - update java string to u51 2014-01-16 17:57:31 -05:00
Richard Alam
5b583368ff - fix some compile errors 2014-01-16 17:12:15 -05:00
Richard Alam
baa735dbc9 - refactor how we process voice commands and events 2014-02-03 22:55:39 +00:00
Richard Alam
579b10b96b - start simplifying integration with FreeSWITCH 2014-01-31 22:43:31 +00:00
Richard Alam
b209dad293 Merge branch 'merge-master-with-new-polling-feature-branch' into merge-polling-with-master 
Conflicts:
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/lock/LockService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonGateway.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/User.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
 2014-01-31 20:07:55 +00:00
Richard Alam
d8f1c2eabb - cleanup 2014-01-31 16:33:30 +00:00