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

10571 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
d63b54d291 Merge branch 'development' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-development 2015-07-23 19:45:19 +00:00
Pedro Beschorner Marin
1eef689a0a Cleanup 2015-07-23 19:08:06 +00: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
Richard Alam
7997d8b511 Merge pull request #713 from capilkey/translate-poll-answers 
Translate poll answers
 2015-07-23 13:25:11 -04:00
Chad Pilkey
abab8c3e3b added an accessible poll results chat message 2015-07-23 13:06:46 -04:00
Chad Pilkey
be0e43baa2 translate the poll answers 2015-07-23 13:06:09 -04:00
Fred Dixon
7f611d1d44 Merge pull request #707 from capilkey/update-polling-modal 
Update polling modal
 2015-07-17 18:19:47 -04: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
387c0770e3 added some extra content to the PollResultsModal 2015-07-17 18:05:29 -04:00
Richard Alam
1fed229b63 Merge pull request #704 from ritzalam/add-num-responders 
- set the font of polling to arial
 2015-07-14 16:30:38 -04:00
Richard Alam
4de982bf7c - set the font of polling to arial 2015-07-14 20:28:43 +00:00
Richard Alam
7ee0043f54 Merge pull request #703 from ritzalam/add-num-responders 
- change the background color of poll result and size of window
 2015-07-14 15:41:49 -04:00
Richard Alam
7c862a10aa - change the background color of poll result and size of window 2015-07-14 19:40:09 +00:00
Richard Alam
7ac6262411 Merge pull request #702 from ritzalam/add-num-responders 
- hardcode poll result display position on server side so different …
 2015-07-14 14:48:49 -04:00
Richard Alam
aa630e52fb - hardcode poll result display position on server side so different clients won't have to recalculate 
position
 2015-07-14 18:45:55 +00:00
Richard Alam
7116bec582 Merge pull request #701 from ritzalam/add-num-responders 
Add num responders
 2015-07-14 14:16:02 -04:00
Richard Alam
82f2033d18 Merge pull request #699 from ritzalam/add-more-logging-to-video-disconnect 
- only remove stream if present
 2015-07-14 14:15:40 -04:00
Richard Alam
909091d426 - display poll result in lower-right corner of presentation 2015-07-14 18:14:21 +00:00
Richard Alam
9958479077 - reset presentation page to 100% when starting poll 2015-07-14 18:13:56 +00:00
Richard Alam
1abf2a1b48 Merge pull request #700 from ritzalam/add-num-responders 
- handle number of responders in client
 2015-07-14 11:29:27 -04:00
Richard Alam
c1ccc79b28 - handle number of responders in client 2015-07-14 15:28:13 +00:00
Richard Alam
10ef6bec01 - only remove stream if present 2015-07-14 14:22:17 +00:00
Richard Alam
847caa2488 Merge pull request #698 from capilkey/position-poll-wb 
remove the hardcoded poll whiteboard position
 2015-07-13 17:23:48 -04:00
Chad Pilkey
22b7d7bc69 remove the hardcoded poll whiteboard position 2015-07-13 17:20:30 -04:00
Richard Alam
2bad0501b5 Merge pull request #697 from ritzalam/add-more-logging-to-video-disconnect 
- add more logging to determine who detects the disconnect first
 2015-07-13 16:51:39 -04:00
Richard Alam
007a13d0e9 - add more logging to determine who detects the disconnect first 2015-07-13 20:50:38 +00:00
Richard Alam
88be8696f8 Merge pull request #696 from ritzalam/add-num-responders 
Add num responders
 2015-07-13 16:44:31 -04:00
Richard Alam
087c07a6a8 Merge branch 'development' of https://github.com/bigbluebutton/bigbluebutton into add-num-responders 2015-07-13 19:20:31 +00:00
Richard Alam
822b319440 - add number of responders on poll result 2015-07-13 19:18:37 +00:00
Richard Alam
116c274519 Merge pull request #692 from ritzalam/put-outgw-into-actor 
- put message sender and recorders into actors to isolate meeting ac…
 2015-07-13 14:48:42 -04:00
Richard Alam
511ec68d6a Merge pull request #695 from capilkey/hide-poll-button 
Remove poll button when the Polling Module isn't running
 2015-07-13 14:48:25 -04:00
Chad Pilkey
abc3966598 clear the vote buttons when the results are published 2015-07-13 13:51:06 -04:00
Pedro Beschorner Marin
5dfa655003 Removed unused resource 2015-07-13 17:42:51 +00:00
Chad Pilkey
9f5ebab201 clean up some unused code in PresentationWindow 2015-07-13 13:30:57 -04:00
Chad Pilkey
bf96c3a4bf hide the poll start button when the polling module is absent 2015-07-13 13:30:14 -04:00
Richard Alam
25ea23eb8d Merge pull request #693 from riadvice/improve-gitignore 
Improved .gitignore files with better patterns.
 2015-07-13 11:58:03 -04:00
Richard Alam
57cc039f9a Merge pull request #694 from capilkey/fix-issue-1964 
Fix issue 1964 - Meeting name label truncation
 2015-07-13 11:57:46 -04:00
Fred Dixon
2bf855543e Enable logging in redis publisher 2015-07-11 19:52:04 -04:00
Chad Pilkey
c06b1f9919 turn scrollpolicy off in MainApplicationShell 2015-07-10 12:51:12 -04:00
Chad Pilkey
0132f62f65 fixed issue 1964 making meeting name label truncate 2015-07-09 18:45:19 -04:00
Ghazi Triki
1ac5a308b5 Improve .gitignore files with better patterns. 2015-07-09 16:13:09 +01:00
Richard Alam
e52e6e7f43 - put message sender and recorders into actors to isolate meeting actor. This hopefully 
will isolate the meeting actor from exceptions when sending to pusub and recording to redis
 2015-07-08 22:21:12 +00:00
Richard Alam
9e022e2b9e Merge pull request #691 from ritzalam/display-poll-result 
- specify location of poll result display
 2015-07-08 16:58:33 -04:00
Richard Alam
95ff9d0925 - specify location of poll result display 2015-07-08 20:57:16 +00:00
Richard Alam
71c416d34c Merge pull request #690 from ritzalam/display-poll-result 
- store poll result into whiteboard history
 2015-07-08 13:34:04 -04:00
Richard Alam
ed271d41f4 - store poll result into whiteboard history 2015-07-08 17:30:38 +00:00
Richard Alam
905233b26b Merge pull request #689 from ritzalam/display-poll-result 
Display poll result
 2015-07-08 13:08:49 -04:00
Richard Alam
0693b83fc8 - fix exception when recording poll result 2015-07-08 17:07:40 +00:00
Richard Alam
d9e71196a9 - record poll result (Still need to fix the data) 2015-07-08 15:14:30 +00:00
Richard Alam
d9fdbe132a - minimize logging 2015-07-08 15:12:42 +00:00