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

13434 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
44e3d5b728 Merge pull request #3404 from ritzalam/record-sender-id-in-chat 
- add senderId when recording publish chat message
 2016-10-13 10:29:10 -04:00
Anton Georgiev
a147009c74 Merge pull request #3392 from Lajellu/EmojiReworked 
Emoji reworked
 2016-10-11 10:56:40 -04:00
Fred Dixon
05a3c704f8 Merge pull request #3405 from ffdixon/minor-fix-bbb-conf 
fix sed for bbb-conf --check
 2016-10-09 22:14:13 -04:00
Fred Dixon
06c879db37 fix sed for bbb-conf --check 2016-10-09 21:13:30 -05:00
Richard Alam
403665feb6 - add senderId when recording publish chat message 2016-10-07 21:45:56 +00:00
Lajellu
1f114eb908 Merge remote-tracking branch 'origin/EmojiReworked' into EmojiReworked 2016-10-06 13:44:03 -07:00
Lajellu
63c9f94b54 HTML5 - changes status names, and user list sorting logic to match flash client 2016-10-06 13:42:37 -07:00
Laily Ajellu
498d2f040c Merge pull request #1 from antobinary/merge-pr 
Resolve conflicts with master + fix hiredis warning
 2016-10-06 12:15:28 -04:00
Fred Dixon
a1407c71d1 Merge pull request #3402 from riadvice/breakout-rooms-slide-conversion 
Handle non PDF slide conversion for breakout rooms
 2016-10-03 13:22:31 -04:00
Ghazi Triki
27fd992294 Handle non PDF slide conversion for breakout rooms. 2016-10-03 17:39:02 +01:00
Fred Dixon
886f9617ac Merge pull request #3400 from riadvice/fix-file-upload-extension 
Unify uploaded presentation file naming across bigbluebutton-web
 2016-10-01 14:52:08 -04:00
Ghazi Triki
12021467f5 Unify uploaded presentation file naming across bigbluebutton-web. 2016-10-01 19:40:19 +01:00
Fred Dixon
6c2259d8ff Merge pull request #3399 from riadvice/breakout-rooms-use-current-presentation 
Breakout rooms use current presentation - part 2
 2016-10-01 12:24:08 -04:00
Fred Dixon
20f47f5245 Merge pull request #3393 from riadvice/bbb-record-delete-breakout-rooms-directories 
Better recording directories detection rule including breakout rooms in bbb-record
 2016-09-30 17:18:22 -04:00
Fred Dixon
ce4ef05c21 Merge pull request #3388 from jfederico/extension_preview_for_thumbnails_on_recordings 
Extension preview for thumbnails on recordings
 2016-09-30 17:17:48 -04:00
Fred Dixon
3552fca5c5 Merge pull request #3397 from riadvice/breakout-rooms-use-current-presentation 
Breakout rooms use current presentation slide
 2016-09-30 17:16:33 -04:00
Ghazi Triki
a9acf9e3e5 Use apache commongs FilenameUtils.getExtension to extract the extension from the file name. 2016-09-29 18:47:11 +01:00
Ghazi Triki
7b6abc1dbe Reverted deleted methods from PresentationUrlDownloadService.java 2016-09-29 18:46:31 +01:00
Anton Georgiev
09dec1619c Merge pull request #3395 from antobinary/html5-audio 
Add logging for client notifications
 2016-09-28 20:00:17 -04:00
Anton Georgiev
27c1896629 Merge branch 'EmojiReworked' of github.com:lajellu/bigbluebutton into merge-pr 2016-09-28 23:47:28 +00:00
Anton Georgiev
3b7db0f81a put hiredis back in dependencies to avoid warning message 2016-09-28 23:29:05 +00:00
Anton Georgiev
014b536ece Merge pull request #3394 from JaeeunCho/dropdown_open 
HTML5 - Dropdown List
 2016-09-28 18:55:59 -04:00
Ghazi Triki
0e72d7523d Make breakout rooms use the selected slide of the current presentation as default presentation. 2016-09-28 22:19:48 +01:00
Ghazi Triki
87b4b8ca07 Update nuprocess version to 1.1.0 2016-09-28 17:40:10 +01:00
jfederico
d2a633a27b record-and-playback: Forced alt to be included as part of the image thumbnail element in preview extension 2016-09-27 16:02:20 -04:00
jfederico
039d85fe5c bbb-web: Added internalMeetingID to xml response from create and getMeetings 2016-09-27 15:27:28 -04:00
JaeeunCho
28d659ef10 HTML5 - Dropdown List : fixed a bug which is not opened the list at the first time 2016-09-27 12:27:12 -07:00
jfederico
1a4438d459 record-and-playback: Fixed issue with presentations containing less than 3 slides 2016-09-27 15:19:53 -04:00
Ghazi Triki
4f01dd5c00 Generated PDF pages are now saved under "pdfs" directory under the presentation directory instead of the "tmp" directory under "svgs" directory. 2016-09-27 17:29:02 +01:00
Anton Georgiev
32a848622e Merge pull request #3385 from JaeeunCho/settings_msg 
HTML5 - Setting dropdown
 2016-09-27 09:59:08 -04:00
Ghazi Triki
e6671f47d7 Made grep expression in bbb-record more strict to only detect recordings directories including breakout rooms ones. 2016-09-27 11:46:38 +01:00
JaeeunCho
3962349517 HTML5 - Settings : changed to label 2016-09-26 14:55:33 -07:00
JaeeunCho
f7e227a982 Merge remote-tracking branch 'upstream/master' into settings_msg 2016-09-26 14:50:16 -07:00
Lajellu
7d724022e4 HTML5 - changes folder name emojiMenu to emoji-menu for uniform style in project 2016-09-26 14:06:41 -07:00
Lajellu
c68ad3240d HTML5 - adds Emoji showing up on user list 2016-09-26 13:29:44 -07:00
Lajellu
edcf6d51b6 Merge remote-tracking branch 'upstream/master' into EmojiReworked 2016-09-26 13:26:53 -07:00
Anton Georgiev
0e3ffd6a82 add logging for client notifications 2016-09-26 19:12:55 +00:00
Richard Alam
2223393b5d Merge pull request #3391 from ritzalam/record-extern-userid 
- record the external userid in join events.
 2016-09-26 13:35:18 -04:00
Richard Alam
3cfcf057bb - record the external userid in join events. 2016-09-26 17:33:39 +00:00
jfederico
36dfbe7088 bbb-web: Added validation to freemarker template to verify image elements are included when extension preview used 2016-09-24 10:59:26 -04:00
jfederico
0506db4f26 bbb-web: Fixed issue with publish/unpublish removing extensions from metadata.xml 2016-09-24 10:54:09 -04:00
Fred Dixon
aa080c62e8 Merge pull request #3390 from capilkey/1.1-accessiblity 
First round of accessibility fixes for 1.1
 2016-09-22 17:41:56 -04:00
JaeeunCho
b0947c85c1 HTML5 - Settings : added description messages and changed to label 2016-09-22 13:51:00 -07:00
JaeeunCho
0e1728ce50 Merge remote-tracking branch 'upstream/master' into settings_msg 2016-09-22 13:43:23 -07:00
Chad Pilkey
0eabf8ca69 first round of accessibility fixes for 1.1 2016-09-22 16:38:34 -04:00
Lajellu
3a0b4e3fef Merge remote-tracking branch 'upstream/master' into EmojiReworked 2016-09-22 12:12:38 -07:00
jfederico
6839ffeb15 bbb-web: removed text element from extension preview 2016-09-22 13:11:27 -04:00
jfederico
78cb599a5b record-and-playback: removed text element from extension preview 2016-09-22 13:11:01 -04:00
jfederico
d567254b9c bbb-web: Updated internal xml example for a recording descriptor 2016-09-22 10:05:21 -04:00
jfederico
e0b6a9ebf8 recording-and-playback: Removed log used for debugging 2016-09-21 17:31:40 -04:00