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

126 Commits

Author SHA1 Message Date
Richard Alam
aafc420d53 Merge branch 'breakout-rooms-porto-algre-2015' of github.com:riadvice/bigbluebutton into merge-bbb-1.1-dev-java8-with-master 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2016-05-24 20:17:47 +00:00
Ghaz Triki
13a65a2a1e Center Alert title and message. 2016-05-04 09:58:45 +01:00
Ghaz Triki
64068cc30e Updated BreakoutRoomSettings layout and style. 2016-04-27 14:25:32 +01:00
Richard Alam
5e45bcf2d7 Merge fix to missing images for brnading. 2016-04-26 20:16:31 -04:00
Chad Pilkey
bf7d3332b9 add two branding images back to the client 2016-04-27 11:26:12 -07:00
Richard Alam
b86f32b8c1 Sync with upstream repository 
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
 2016-04-26 20:01:20 -04:00
Ghaz Triki
01335b6e8a Merge branch 'master' into mobile-client 2016-04-25 19:58:13 +01:00
Richard Alam
b9cb2298b3 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into bbb-1.1-dev-java8 2016-04-14 20:05:22 +00:00
Chad Pilkey
6784c4c36d fixed a couple of accessibility bugs in 1.0 2016-04-04 12:23:51 -07:00
Ghaz Triki
bb6d62e071 Implemented video chat for web and mobile clients. 2016-04-01 15:34:54 +01:00
Richard Alam
7d5c9d63e4 Upgrade to Java 8 
Upgrade to Java 8 and merge screenshare feature.

Conflicts:
	bigbluebutton-client/.actionScriptProperties
 2016-03-21 20:19:48 +00:00
Richard Alam
7fe44355d4 Merging breakout rooms with the master branch 
Merge breakout rooms feature with master branch. This
 also includes closed captioning feature.

Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-web/.classpath
	bigbluebutton-web/.settings/org.eclipse.jdt.core.prefs
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2016-03-21 17:52:23 +00:00
Ghaz Triki
990e786340 Merge branch 'master' into breakout-rooms-porto-algre-2015 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
#	bigbluebutton-web/.classpath
#	bigbluebutton-web/.settings/org.eclipse.jdt.core.prefs
#	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
#	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2016-02-28 21:34:33 +01:00
Richard Alam
dd37445b7d - screenshare client 2016-02-10 19:43:38 +00:00
Chad Pilkey
addfe4e502 increase contrast on some font colours 2016-02-08 13:02:00 -08:00
Ghazi Triki
0385d05001 Merge branch 'master' into breakout-rooms-porto-algre-2015 
# Conflicts:
#	akka-bbb-apps/build.sbt
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
#	akka-bbb-fsesl/build.sbt
#	bbb-common-message/build.sbt
#	bigbluebutton-apps/build.gradle
#	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
 2016-01-27 14:16:05 +01:00
Chad Pilkey
a2203ad5e6 unbold the lock settings categories in the popup 2016-01-22 14:52:45 -08:00
Ghazi Triki
85bb2fd47b Display breakout room users list. 2016-01-22 16:50:19 +01:00
Richard Alam
0c2a2e6ce1 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into breakout-rooms-porto-algre-2015 2015-11-17 23:25:54 -05:00
Ghazi Triki
165b3d6103 Fixed BreakoutRoomSettings style. 2015-11-16 17:32:16 -02:00
Ghazi Triki
423c0c0ecd String localised for the breakout room feature. 2015-11-11 20:25:30 +01:00
Ghazi Triki
083aeb42c8 Improved presentation backButton and forwardButton buttons styles. (reverted from commit eb5371d90c with custom update) 2015-10-20 22:31:48 +01:00
Ghazi Triki
99f6ab2499 Minor CSS fixes. 2015-10-10 14:30:39 +01:00
Ghazi Triki
eb5371d90c Improved presentation backButton and forwardButton buttons styles. 2015-10-10 12:37:32 +01:00
Ghazi Triki
c5a3b713ba Improved EmojiGrid layout. 2015-09-02 10:07:40 +01:00
Ghazi Triki
9fcaf6c6ca Fixed missing emoji locales and minor improvement for the EmojiGrid padding. 2015-09-01 00:06:47 +01:00
Ghazi Triki
f0eed97bb8 Remove status button is correctly displayed. 2015-08-28 19:50:34 +01:00
Ghazi Triki
7ec8c6e3b7 Merge branch 'master' into emoji-status 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
 2015-08-28 19:06:48 +01:00
Ghazi Triki
a7d2820c24 Improved emoji feature components. 2015-08-28 19:02:52 +01:00
Ghazi Triki
35e8d03949 - Added new EmojiGrid component. 
- Replaced raise hand feature by emoji status in client (WIP)
 2015-08-27 21:31:46 +01:00
Chad Pilkey
0994e90d6d increased the audio dialog font size 2015-08-26 16:50:59 -04:00
Chad Pilkey
2240ff0cd3 added a checkbox for audible chat notifications 2015-08-24 14:34:08 -04:00
Ghazi Triki
98f33db751 Added new window for adding custom polling choices. 2015-08-20 18:37:15 +01:00
Chad Pilkey
0dc0b7221c increase the size of the responders label 2015-08-13 17:20:15 -04:00
Chad Pilkey
bfd6e15ad7 moved stuff around in PollResultsModal 2015-08-11 15:35:12 -04:00
Pedro Beschorner Marin
b1ccea37a1 Merge branch 'auto-reconnect' into development 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
 2015-07-23 18:44:21 +00:00
Chad Pilkey
be9971c2cd fixed the weird colouring in the TitleWindow headers and removed uneeded duplication in CSS 2015-07-17 18:06:11 -04:00
Chad Pilkey
0132f62f65 fixed issue 1964 making meeting name label truncate 2015-07-09 18:45:19 -04:00
Chad Pilkey
628d47968d fixed the poll start button css 2015-06-23 15:09:44 -04:00
Chad Pilkey
078f9accb9 added a poll image to the branding folder 2015-06-23 11:34:43 -04:00
Chad Pilkey
49366a5782 started on the publish poll client code 2015-06-23 11:34:09 -04:00
Felipe Cecagno
19e54bfe66 refactored the autoreconnect capability 
- multiple disconnections are reestablished in order, first the main bigbluebutton connection, then the other connections
- if the user was sharing video, and the video connection drops, the video views close and it reconnect in a consistent state
- if the user is connected to webrtc and the main connection drops, the webrtc connection will still be active, then the server will send a UserLeft message to everyone and will reconnect the user as a phone user, so the UI continues consistent; when the user reconnects, it will reuse the voice information

IMPORTANT: modify external.xml in order to disable media timeout
/opt/freeswitch/conf/sip_profiles/external.xml:    <param name="rtp-timeout-sec" value="0"/>
 2015-05-08 12:43:25 -03:00
Felipe Cecagno
f8d5198177 implement time and multiple occurrences in the client warning window 2015-05-08 12:37:26 -03:00
Mateus Dalepiane
0662a242aa Merge branch 'bigbluebutton/master' into 090-new-videodock 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/VideoHolder.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoWindowItf.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml
 2015-04-29 12:10:41 -03:00
Felipe Cecagno
9a7bae79a8 Merge branch '090-new-videodock' into HEAD 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	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/VideoEventMap.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/ToolbarButton.mxml
	record-and-playback/deploy.sh
 2015-01-28 20:33:28 -02:00
Felipe Cecagno
162e6899a4 added back the css for the video warning message 2015-01-28 19:18:58 -02:00
Chad Pilkey
19fb9b9671 Revert "Revert "Added Java check to the configuration notifications"" 
This reverts commit 82545a03f3.
 2015-01-27 14:19:02 -08:00
Fred Dixon
82545a03f3 Revert "Added Java check to the configuration notifications" 2015-01-27 17:11:54 -05:00
Chad Pilkey
84d6c5e132 added deskshare help information for Chrome users 2015-01-27 13:54:24 -08:00
Chad Pilkey
9be9cca051 added a configuration warning system to the flash client 2015-01-15 16:14:49 -08:00