BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,440 Commits 13 Branches 260 Tags 1.1 GiB
3f049ec644
Commit Graph

580 Commits

Author SHA1 Message Date
Ghazi Triki
7b6583461b Fix locale names for breakout room join prompt. 2016-01-12 15:36:13 +01:00
Ghazi Triki
78c4045d41 Handled breakout join URL in the client. 2015-11-23 11:50:47 +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
b370c36dde Display the number of remaining minutes for the breakout rooms. 2015-11-17 11:33:14 -02:00
Ghazi Triki
3b84120074 Create breakout rooms event parameters are correctly filled from user choices. 2015-11-11 22:18:49 +01:00
Ghazi Triki
423c0c0ecd String localised for the breakout room feature. 2015-11-11 20:25:30 +01:00
Richard Alam
8f83ada786 - update locales 2015-11-06 21:02:31 +00:00
Chad Pilkey
03d2a376ad added in a 30s total timeout on iceGathering 2015-11-04 16:44:15 -08:00
Richard Alam
2b3e38c45b Merge branch 'breakout-rooms' of https://github.com/riadvice/bigbluebutton into breakout-rooms-wip 2015-10-22 19:54:44 +00:00
Richard Alam
c3aa194e00 - update to latest locales (oct 5, 2015) 2015-10-05 15:59:07 +00:00
Ghazi Triki
03eda0f072 First implementation of the breakout rooms window. 2015-09-22 18:07:00 +01:00
Richard Alam
c13e17a7d4 Merge pull request #2770 from riadvice/chat-message-limit 
Add a maximum allowed length to chat message
 2015-09-16 15:04:26 -04:00
Richard Alam
ac838e741a - pulling locales from transifex (sept 10, 2015) 2015-09-10 15:25:00 +00:00
Ghazi Triki
f773cfa9f9 Added message too long in client locales. 2015-09-07 16:18:49 +01:00
Fred Dixon
1b882a2062 Changed wording of Network Failure 2015-09-03 05:58:45 -04:00
Ghazi Triki
3906247dc7 Removed smile eomji status. 2015-09-02 13:08:06 +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
95a093ca0c Update status icons. 2015-08-31 23:47:40 +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
66a7f23146 Added userId to EmojiStatusEvent to able to send a request for a different user. 2015-08-28 11:08:18 +01:00
Chad Pilkey
760b7b306a add in an ICE connection timeout set to 60s 2015-08-26 16:56:52 -04:00
Ghazi Triki
b360212612 Custom polling window simplified. 2015-08-24 14:34:08 -04:00
Ghazi Triki
49ef1e3618 Custom polling window simplified. 2015-08-21 11:09:45 +01:00
Ghazi Triki
98f33db751 Added new window for adding custom polling choices. 2015-08-20 18:37:15 +01:00
Chad Pilkey
7125687951 Make it clear that PollingResultsModal is live 2015-08-13 17:19:25 -04:00
Chad Pilkey
bfd6e15ad7 moved stuff around in PollResultsModal 2015-08-11 15:35:12 -04:00
Pedro Beschorner Marin
20085e0f3b Merge remote-tracking branch 'origin/auto-reconnect' into pedrobmarin-development-auto-reconnect 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml
 2015-07-24 13:25:25 -03:00
Pedro Beschorner Marin
24619cad08 Added localization and testing parenting in Loading window 2015-07-24 16:00:59 +00:00
Chad Pilkey
abab8c3e3b added an accessible poll results chat message 2015-07-23 13:06:46 -04:00
Chad Pilkey
387c0770e3 added some extra content to the PollResultsModal 2015-07-17 18:05:29 -04:00
Chad Pilkey
087223b3fe first pass at a UI for voting and viewing votes 2015-06-26 18:31:14 -04:00
Chad Pilkey
46840dd727 moved some poll strings to locales 2015-06-24 14:17:25 -04: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
Richard Alam
7970a26756 Merge pull request #603 from capilkey/-chrome-42-warning 
chrome 42 warning
 2015-04-08 18:18:41 -04:00
Chad Pilkey
d6bd54825f fixed the footer link 2015-04-08 15:14:47 -07:00
Chad Pilkey
b8bfedcded added a desktop sharing warning for Chrome 42 2015-04-08 14:31:55 -07:00
Richard Alam
ec23e69d3e - pdate locales 2015-04-08 21:30:39 +00:00
Richard Alam
1d32fb7dc4 - update locales 2015-03-27 21:58:21 +00:00
Chad Pilkey
d8a3325337 moved 'Ready' text to locales 2015-03-23 14:33:16 -07:00
Richard Alam
3c73519ec3 - update locales 2015-03-13 15:18:11 -07:00
Fred Dixon
cf5ab25ca0 Revert "Revert "Bbb lock settings fix"" 2015-03-04 16:47:35 -05:00
Chad Pilkey
34fdfb9f83 Revert "Bbb lock settings fix" 2015-03-04 11:49:13 -05:00
Tiago Daniel Jacobs
34e2e48be2 Merging 2015-03-03 06:52:56 +00:00
Tiago Daniel Jacobs
bf62dd66a2 Fixed mute on start, added lock on join option 2015-03-02 18:06:09 +00:00
Richard Alam
edaeaf6bf4 Merge pull request #521 from capilkey/webrtc-fixes 
WebRTC fixes
 2015-02-17 19:26:07 -05:00
Chad Pilkey
e6d3cd551d fixed a race condition in the webrtc javascript code, and added cause for error 1004 2015-02-17 16:11:42 -08:00
Calvin Walton
8e7a34b5dd Add webrtc 1009 error to translations 2015-02-17 13:29:27 -05:00
Chad Pilkey
d6ef5168c0 add support for webrtc call transferring, cuts join time in half 2015-02-12 14:25:41 -08:00
Richard Alam
cd9ef88567 - update locales 2015-02-09 16:30:23 +00:00