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

12558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pedro Beschorner Marin
694c9564a5 Added record_id to redis recording events 2016-09-21 20:12:57 +00:00
Pedro Beschorner Marin
49d5f9c41c Refactored redis recording events 2016-09-21 16:32:11 +00:00
Felipe Cecagno
7c53a22bae Merge pull request #341 from pedrobmarin/fix-conf-mate-ulr 
Fixed API Mate URL
 2016-09-09 16:45:48 -03:00
Pedro Beschorner Marin
bd82a036a3 Fixed API Mate URL 2016-09-09 19:28:24 +00:00
Felipe Cecagno
57047b5964 fix bigbluebutton cron job 2016-09-05 12:50:41 -03:00
Felipe Cecagno
4aa2a732e2 Merge branch 'mconf-live0.7.5' of github.com:mconf/bigbluebutton into mconf 
Conflicts:
	record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js
 2016-09-01 18:00:43 -03:00
Felipe Cecagno
c2a2b7c87a enable mconf-decrypter to fetch the recordings even if mconf-live is using a self-signed certificate 2016-09-01 17:56:55 -03:00
Felipe Cecagno
d5d28e7dc0 Merge pull request #338 from pedrobmarin/fix-bbb-voice-dependency 
Fixed one broken lib in bbb-voice
 2016-09-01 14:13:00 -03:00
Felipe Cecagno
a7978abd03 Merge pull request #337 from pedrobmarin/adapting-freeswitch-1.6.x 
Adjusting configurations to fit FreeSWITCH 1.6.X changes
 2016-09-01 14:12:48 -03:00
Felipe Cecagno
8daaf5d599 Merge pull request #333 from pedrobmarin/fix-video-reconnection 
Fix video reconnection
 2016-09-01 14:11:09 -03:00
Felipe Cecagno
c5917f6a92 update presentation_export playback to be responsive as the playback format 2016-09-01 14:07:33 -03:00
Felipe Cecagno
83d6f37f06 Merge pull request #332 from pedrobmarin/mconf-responsive-playback 
Responsive playback
 2016-09-01 13:49:58 -03:00
Felipe Cecagno
2a68455142 Merge pull request #331 from pedrobmarin/window-dragging-resizing 
Window dragging resizing
 2016-09-01 12:34:07 -03:00
Felipe Cecagno
66ad08e616 Merge branch 'mconf' of github.com:mconf/bigbluebutton into mconf 2016-09-01 12:24:15 -03:00
Felipe Cecagno
b14ad98084 Merge pull request #330 from pedrobmarin/mconf 
Chat time from server
 2016-09-01 12:25:18 -03:00
Pedro Beschorner Marin
00c565d17a Fixed one broken lib in bbb-voice 2016-09-01 13:25:45 +00:00
Pedro Beschorner Marin
66e318cd91 Adjusting configurations to fit FreeSWITCH 1.6.X changes 2016-08-31 19:35:07 +00:00
Felipe Cecagno
d884264852 update Gemfile and Gemfile.lock, will start to deploy Gemfile.lock and execute ruby using bundler 2016-08-18 16:23:33 -03:00
Felipe Cecagno
714aba46ef set to debug some of the new log messages on mconf-decrypter 2016-08-18 16:22:40 -03:00
Leonardo Crauss Daronco
d860d166df Make mconf-decrypter work with HTTPS and redirects 
It now works with HTTPS URLs and will follow one redirect. The redirect is
useful for when the server being requested redirects HTTP to HTTPS.
 2016-08-16 13:09:19 -03:00
Felipe Cecagno
f44c25f3f6 do not use hardcoded http to load resources in the playback 2016-08-01 23:53:49 -03:00
Pedro Beschorner Marin
e0af0524b2 Merge remote-tracking branch 'fix-video-reconnection' into mconf 2016-07-22 16:05:07 +00:00
Pedro Beschorner Marin
abebee010f Merge branch 'daronco/responsive-playback' into mconf 
Conflicts:
	record-and-playback/presentation/playback/presentation/0.9.0/logo.png
	record-and-playback/presentation/playback/presentation/0.9.0/playback.html
 2016-07-12 16:26:47 +00:00
Pedro Beschorner Marin
fac305f8f6 Merge commit '427a288dfe61cfdb28cc1c20a11a36c84f3a33d9' from daronco/responsive-playback into bigbluebutton/v1.0.x-release 
Conflicts:
	record-and-playback/presentation/playback/presentation/0.9.0/playback.html
 2016-07-12 14:21:04 +00:00
Pedro Beschorner Marin
2533a3f553 Sharednotes window dragging and resizing control 2016-07-11 21:35:41 +00:00
Pedro Beschorner Marin
d0fe350172 Merge branch 'avoid-shift-dragging' into mconf 2016-07-11 20:03:21 +00:00
Pedro Beschorner Marin
b64c1e26c5 Merge remote-tracking branch 'origin/fix-chat-selection' into avoid-shift-dragging 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindow.mxml
 2016-07-11 19:50:29 +00:00
Felipe Cecagno
4f96eaab01 Merge branch 'mconf' of github.com:mconf/bigbluebutton into mconf 2016-07-07 22:50:19 -03:00
Pedro Beschorner Marin
83e78f2bfa Cleanup 2016-07-06 15:59:13 +00:00
Pedro Beschorner Marin
796a29157e Removed time from welcome message 2016-07-06 15:53:42 +00:00
Pedro Beschorner Marin
81e1678b0a Merge remote-tracking branch 'RafaFP/fix-1915' into mconf 2016-07-06 13:44:12 +00:00
Felipe Cecagno
10ab1ef74d Merge pull request #329 from pedrobmarin/mconf 
Avoid opening the guest window for a promoted user when the guest list is empty
 2016-07-01 12:50:51 -03:00
Pedro Beschorner Marin
22830cf23a Avoid opening the guest window for a promoted user when the guest list is empty 2016-07-01 15:22:27 +00:00
Pedro Beschorner Marin
487b39c00e Avoid closing client's videoconf module window when reconnecting 2016-06-30 18:19:46 +00:00
Felipe Cecagno
c1c309a650 rename function from clearPublicChatMessage to clearPublicChatMessages 2016-06-30 14:39:30 -03:00
Felipe Cecagno
b62f94e165 Merge pull request #326 from pedrobmarin/merging-to-1.0 
Merging to 1.0
 2016-06-30 12:45:47 -03:00
Pedro Beschorner Marin
85e68a66ca Merge remote-tracking branch 'origin/inactivity-timeout' into merging-to-1.0 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
 2016-06-27 19:57:48 +00:00
Pedro Beschorner Marin
c40684b13d Update guest window when changing participant role 2016-06-27 18:44:19 +00:00
Pedro Beschorner Marin
415393ca30 Merge remote-tracking branch 'mconf/mconf-live0.7.5' into merging-to-1.0 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
 2016-06-27 13:10:58 +00:00
Pedro Beschorner Marin
3fd65405e2 Merge branch 'merging-to-1.0' of https://github.com/pedrobmarin/bigbluebutton into merging-to-1.0 2016-06-27 12:50:47 +00:00
Pedro Beschorner Marin
5e27b3e6fd Merge pull request #1 from RafaFP/fix-closeSharedNotes 
now when a user is kicked by moderator the sharedNotes windows will b…
 2016-06-27 09:55:30 -03:00
RafaFP
8830f0a1d6 now when a user is kicked by moderator the sharedNotes windows will be closed too 2016-06-24 21:13:25 +00:00
Pedro Beschorner Marin
6c5ef1f012 Refactored the way moderator's waiting for acceptance status is checked before creating the guest window 2016-06-24 20:46:05 +00:00
Felipe Cecagno
775d8a7d3b download presentations configurable by an attribute in the config.xml 2016-06-24 12:31:14 -03:00
Pedro Beschorner Marin
0a802d63db This fixes issue #328. Empty polling button when changing presenter 2016-06-23 17:54:49 +00:00
Pedro Beschorner Marin
4373a59a05 Reverting some line ending changes made in while merging 2016-06-23 12:48:02 +00:00
Pedro Beschorner Marin
c2b69e885c Merge remote-tracking branch 'rafael/fix-1670' into rafafp-branches-merged-1.0 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/components/SharedNotesRichTextEditor.mxml
 2016-06-22 14:34:24 +00:00
Pedro Beschorner Marin
78313fda46 Merge remote-tracking branch 'rafael/feature-1944' into rafafp-branches-merged-1.0 2016-06-22 14:23:59 +00:00
Pedro Beschorner Marin
915d04cb5e Merge branch 'feature-1826' into rafafp-branches-merged-1.0 2016-06-22 14:22:25 +00:00
Pedro Beschorner Marin
4c432ee5bd Merge branch 'feature-1931' into rafafp-branches-merged-1.0 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatToolbar.mxml
	record-and-playback/presentation/scripts/publish/presentation.rb
 2016-06-22 13:06:51 +00:00