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

11182 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
1efea72d09 Merge pull request #748 from ritzalam/remove-some-printlns 
- remove some printlns to lessen noise
 2015-08-07 17:42:30 -04:00
Richard Alam
15a368f444 - remove some printlns to lessen noise 2015-08-07 21:37:16 +00:00
Fred Dixon
4c6935a1ca Merge pull request #747 from ffdixon/development 
Updated bbb-conf to assign hostname to publishURI parameter in config…
 2015-08-07 15:58:57 -04:00
Fred Dixon
b23a6df190 Updated bbb-conf to assign hostname to publishURI parameter in config.xml 2015-08-07 15:56:35 -04:00
Richard Alam
6fa29a4077 Merge branch 'gthacoder-svg-conversion' into development 2015-08-07 19:48:47 +00:00
Richard Alam
3357529104 - update properties file 2015-08-07 19:48:27 +00:00
Richard Alam
bc7aadcd22 - create new bbb-commons jar 2015-08-07 19:46:52 +00:00
Richard Alam
839e7ebf58 Merge branch 'svg-conversion' of https://github.com/gthacoder/bigbluebutton into gthacoder-svg-conversion 2015-08-07 18:28:16 +00:00
Fred Dixon
7d571de04b Merge pull request #745 from capilkey/change-quickpoll-regex 
changed quick poll regex to match only one character
 2015-08-07 13:16:57 -04:00
Chad Pilkey
445b37616d changed quick poll regex to match only one character 2015-08-07 13:13:13 -04:00
Richard Alam
a18098929b Merge pull request #744 from ritzalam/log-auto-reconnect 
- allow to externally log auto-reconnects
 2015-08-07 13:05:08 -04:00
Richard Alam
576d027c8d - allow to externally log auto-reconnects 2015-08-07 17:02:32 +00:00
Richard Alam
7a4ebcb415 Merge pull request #743 from ritzalam/merge-leonardo-api-changes 
Merge leonardo api changes
 2015-08-07 11:11:45 -04:00
Richard Alam
839473395a Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merge-leonardo-api-changes 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
 2015-08-07 15:06:40 +00:00
Oleksandr Zhurbenko
d3b59103b4 Added Poll properties to the object 2015-08-06 16:32:41 -07:00
Richard Alam
00c5cac9c9 Merge pull request #632 from daronco/api-merges 
API merges
 2015-08-06 17:58:34 -04:00
Maxim Khlobystov
5c0cb9c3d8 Merge branch 'meteor-client-pdf-conversion' of https://github.com/gthacoder/bigbluebutton into development 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/PesentationMessageToJsonConverter.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationModel.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/red5/PresentationClientMessageSender.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/redis/PresentationEventRedisRecorder.scala
 2015-08-06 16:21:31 -04:00
Richard Alam
1a1a3bcb9d Merge pull request #742 from ritzalam/investigate-video-disconnect 
- trying to determine why client isn't receiving timestamp data from…
 2015-08-06 13:58:21 -04:00
Richard Alam
44c7d4ab77 - trying to determine why client isn't receiving timestamp data from the server 2015-08-06 17:54:08 +00:00
Richard Alam
82e8f724a2 Merge pull request #741 from ritzalam/investigate-video-disconnect 
- add timestamps on client side log to correlate webcam stopping
 2015-08-06 11:13:17 -04:00
Richard Alam
fbc3dc54f3 - add timestamps on client side log to correlate webcam stopping 2015-08-06 15:11:41 +00:00
Oleksandr Zhurbenko
400a0db0f4 Parsing the message and sending shape information further 2015-08-05 16:54:44 -07:00
Richard Alam
77e5cf5b55 Merge pull request #739 from ritzalam/investigate-video-disconnect 
- add more information on the logs to track down webcam disconnections
 2015-08-05 15:59:10 -04:00
Richard Alam
1f3cff06b3 - add more information on the logs to track down webcam disconnections 2015-08-05 19:55:12 +00:00
Richard Alam
ed8f66c8f7 Merge pull request #738 from ritzalam/change-logging-level 
- change logging level as it was logging too much
 2015-08-05 14:04:53 -04:00
Richard Alam
aa6191402c - change logging level as it was logging too much 2015-08-05 16:28:16 +00:00
Richard Alam
8a85e0b3a1 Merge pull request #735 from riadvice/fix-mdi-resize 
MainApplicationShell height binding update fix application freeze
 2015-08-05 12:17:15 -04:00
Ghazi Triki
0e42974ed2 Merge branch 'development' into fix-mdi-resize 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2015-08-05 17:13:13 +01:00
Richard Alam
217197af1d Merge pull request #737 from ritzalam/remove-user-session 
- remove user sessions when a user calls the JOIN API but actually f…
 2015-08-05 10:17:30 -04:00
Richard Alam
5444c4fd62 - remove user sessions when a user calls the JOIN API but actually fails to join the meeting. 
Not removing the user sessions results in OOM after a while.
 2015-08-04 22:35:34 +00:00
Oleksandr Zhurbenko
3afad5db50 Fixed an issue with the 'get_users_reply' message and sorting 2015-08-04 14:12:28 -07:00
Richard Alam
ba85882aec Merge pull request #736 from ritzalam/add-get-sessions-api 
- add an api to let us query the user sessions in bbb-web. We use th…
 2015-08-04 14:01:53 -04:00
Richard Alam
d140ca0b40 - add an api to let us query the user sessions in bbb-web. We use this to see what sessions are hanging around 
that may be causing OOM exception on tomcat7
 2015-08-04 17:58:27 +00:00
Oleksandr Zhurbenko
d3e318f6f2 Fixed a mistake with phone_user's priorities 2015-08-04 09:51:02 -07:00
Richard Alam
d49435b5d8 Merge pull request #734 from capilkey/change-poll-label 
Poll label changes
 2015-08-04 12:19:39 -04:00
Chad Pilkey
4cf5fa640b Merge remote-tracking branch 'upstream/development' into change-poll-label 2015-08-04 12:12:02 -04:00
Richard Alam
521afc9143 Merge pull request #733 from gthacoder/meteor-client-navbar 
HTML5 client: navbar bug fixes.
 2015-08-04 11:20:33 -04:00
Richard Alam
fdfd382a28 Merge pull request #712 from riadvice/tab-indexer 
Added TabIndexer class for automating tab indexation.
 2015-08-04 11:07:50 -04:00
Oleksandr Zhurbenko
2ebf44a3b7 Added Sorting to the userlist 2015-08-03 17:23:57 -07:00
Oleksandr Zhurbenko
0b3606350f Handling for 'poll_show_result_message' 2015-08-02 15:57:54 -07:00
Maxim Khlobystov
63588ede10 Made sure the animation of the userlist's items still works after a pan gesture ends. 2015-08-02 14:11:24 -04:00
Ghazi Triki
f6bbe498ee MainApplicationShell height fix to remove the script execution timeout in GraphicsWrapper. 2015-08-02 15:30:08 +01:00
Maxim Khlobystov
16658f1c0f Fixed the issue with wrong file references in Chrome/Firefox CSS inspector. 2015-08-01 15:28:19 -04:00
Oleksandr Zhurbenko
84840f1830 Added handling for 'user_voted_poll_message' 2015-08-01 12:27:01 -07:00
Chad Pilkey
b282dbd7bf cleaned up some event listeners in UsersWindow menu 2015-07-31 18:15:37 -04:00
Chad Pilkey
5a40d9095c the poll menu items are translatable now 2015-07-31 18:14:17 -04:00
Chad Pilkey
120ba2417e better positioned the menu in the UsersWindow 2015-07-31 17:12:41 -04:00
Chad Pilkey
9c69f60437 Changed the quick poll label to be more descriptive 2015-07-31 17:09:59 -04:00
Oleksandr Zhurbenko
147e1942fb Removing the userIds of the users who already voted from the collection, added null pointer validation 2015-07-31 11:07:27 -07:00
Ghazi Triki
d906e6599e Merge branch 'development' into tab-indexer 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
 2015-07-31 09:36:59 +01:00