Ghazi Triki
|
8e8fee7826
|
Re-enable recording option for breakout rooms.
|
2016-10-13 17:43:53 +01:00 |
|
Ghazi Triki
|
b078628ad9
|
Store breakout room externalMeetingID to be used for generating join URL.
|
2016-10-13 17:17:47 +01:00 |
|
Richard Alam
|
80dfca37c4
|
Merge pull request #3408 from capilkey/cleanup-deskshare
Remove old deskshare module and out-dated Java checks
|
2016-10-13 11:04:43 -04:00 |
|
Anton Georgiev
|
e47c63f84f
|
Merge pull request #3407 from JaeeunCho/userlist_dot
HTML5 - Userlist Switcher
|
2016-10-13 10:54:37 -04:00 |
|
Anton Georgiev
|
11f0c2da03
|
Merge pull request #3401 from KDSBrowne/Localization-update
Localization update #1
|
2016-10-13 10:44:13 -04:00 |
|
Richard Alam
|
d6a181f095
|
Merge pull request #3406 from ffdixon/remove-java-reference
Remove reference to deployJava.js
|
2016-10-13 10:29:44 -04:00 |
|
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 |
|
Ghazi Triki
|
5e002d845e
|
Store breakout room sequence in akka-apps and bbb-web.
|
2016-10-13 12:53:53 +01:00 |
|
Ghazi Triki
|
054037c6d6
|
Revert replacing the deprecated shaHex DigestUtils by sha1Hex and updated API controller.
|
2016-10-13 09:04:41 +01:00 |
|
KDSBrowne
|
6a580e9e0c
|
Replaced Ajax with fetch()
|
2016-10-12 18:16:34 -07:00 |
|
Chad Pilkey
|
fef5acace6
|
remove old deskshare module and out-dated Java checks
|
2016-10-12 18:13:02 -04:00 |
|
Matthew Marangoni
|
28af2439d1
|
Renamed a few props to be more consistent with component names and for readability
|
2016-10-12 13:09:47 -07:00 |
|
Matthew Marangoni
|
5c386ceba3
|
Reworked modal to dynamically change content
|
2016-10-12 12:55:02 -07:00 |
|
Ghazi Triki
|
bf5de153a0
|
Deleted unused imports from bigbluebutton-apps and bigbluebutton-web
|
2016-10-12 20:24:51 +01:00 |
|
Ghazi Triki
|
a80b6d9c45
|
Replace the deprecated shaHex DigestUtils by sha1Hex.
|
2016-10-12 20:20:37 +01:00 |
|
Ghazi Triki
|
ff9bc17c15
|
Send sequence number when creating breakout rooms and correctly generate a unique externalMeetingId for breakout rooms.
|
2016-10-12 19:55:20 +01:00 |
|
KDSBrowne
|
993dc70525
|
Cleaned up code
|
2016-10-12 10:03:10 -07:00 |
|
Ghazi Triki
|
f8beb9e4e7
|
Breakout rooms are now sorted by their sequence number.
|
2016-10-12 12:41:57 +01:00 |
|
Ghazi Triki
|
c95d208da7
|
Added sequence property breakout room.
|
2016-10-11 22:13:22 +01:00 |
|
Ghazi Triki
|
f7be426305
|
Breakout rooms refactoring: generated uniques external ID and internal ID.
|
2016-10-11 20:50:51 +01:00 |
|
Matthew Marangoni
|
77d76a3adc
|
added join audio files
|
2016-10-11 12:10:06 -07:00 |
|
Matthew Marangoni
|
918ae83fc8
|
Added initial Join Audio modal
|
2016-10-11 12:04:50 -07:00 |
|
JaeeunCho
|
d214eff554
|
added css for red dot and fixed code
|
2016-10-11 10:36:28 -07:00 |
|
JaeeunCho
|
fd38b2eb24
|
Merge remote-tracking branch 'upstream/master' into userlist_dot
|
2016-10-11 10:24:27 -07:00 |
|
Anton Georgiev
|
a147009c74
|
Merge pull request #3392 from Lajellu/EmojiReworked
Emoji reworked
|
2016-10-11 10:56:40 -04:00 |
|
Fred Dixon
|
53583d5a8f
|
Remove reference to deployJava.js
|
2016-10-09 21:27:26 -05: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 |
|
KDSBrowne
|
7e718d0a75
|
changed functions to start with lowercase
|
2016-10-07 10:12:18 -07:00 |
|
KDSBrowne
|
720c16f3ac
|
Moved over the previous solution to the server side and cleaned up the code
|
2016-10-07 09:36:27 -07: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 |
|
Ghazi Triki
|
b10237ebad
|
Upgrade commons-codec dependency version to 1.10
|
2016-10-05 17:29:37 +01:00 |
|
JaeeunCho
|
04e9d1818c
|
HTML 5 - added to display the state of unreaded messages right next to the user icon
|
2016-10-04 12:23:43 -07: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 |
|
KDSBrowne
|
b811f01ad1
|
Fixed lint issues
|
2016-10-03 08:10:20 -07:00 |
|
KDSBrowne
|
d2cc6e1b18
|
Localization update
|
2016-10-02 08:46:15 -07: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 |
|