Ghazi Triki
27dcead4d6
Fixed duplicate users and breakout rooms when creating breakout rooms.
2015-11-23 13:42:46 +01:00
Ghazi Triki
78c4045d41
Handled breakout join URL in the client.
2015-11-23 11:50:47 +01:00
Ghazi Triki
1bb3d4a197
MessageSenderActor handles BreakoutRoomStartedOutMessage, UpdateBreakoutUsersOutMessage and MeetingTimeRemainingUpdate and convert them to json.
2015-11-23 10:19:17 +01:00
Ghazi Triki
6e9b95e347
BreakoutRoomStarted event finally arrives to the client.
2015-11-20 19:06:11 -02:00
Ghazi Triki
924a8cbefd
Added BreakoutRoomStartedOutMessage handler to MessageSenderActor
2015-11-20 15:26:34 -02:00
Ghazi Triki
bc18e92601
fixed do not create a new internal meeting id for breakout rooms
2015-11-20 12:32:39 -02:00
Richard Alam
9e3f0fb2b6
- do not create a new internal meeting id for breakout rooms
2015-11-18 04:57:32 -05:00
Richard Alam
68f9cb8689
Merge branch 'breakout-rooms-porto-algre-2015' of github.com:riadvice/bigbluebutton into breakout-rooms-porto-algre-2015
2015-11-18 03:14:01 -05:00
Ghazi Triki
c27a9baf5b
Fixed the number of breakout rooms to create when sending the message from the client.
2015-11-19 16:54:32 -02:00
Ghazi Triki
7989b897f3
Create breakout room and send the message to akka-bbb-apps
2015-11-19 16:54:06 -02:00
Ghazi Triki
5a6266e395
bbb-web sends back the breakout room created event to bbb-akka-apps
2015-11-19 12:33:00 -02:00
Ghazi Triki
a623443b16
Fixed breakout room default presentation URL
2015-11-19 12:32:37 -02:00
Ghazi Triki
b3dabfdf69
Fixed compile errors on akka-bbb-apps
2015-11-19 10:32:46 -02:00
Richard Alam
2a610c0704
Merge branch 'cancel-message-sending-task' into breakout-rooms-porto-algre-2015
...
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
2015-11-18 03:13:47 -05:00
Richard Alam
0c2a2e6ce1
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into breakout-rooms-porto-algre-2015
2015-11-17 23:25:54 -05:00
Richard Alam
dc39a89986
Merge pull request #2907 from oswaldoacauan/emoji-mobile-fix
...
Fix emoji buttons overlapping the slide buttons on portrait view
2015-11-19 11:30:49 -05:00
Oswaldo Acauan
e5cd8aab2c
Fix emoji buttons overlaping the prev/next slide buttons on portrait on HTML5 client
2015-11-19 14:19:30 -02:00
Richard Alam
de71d17d73
Merge pull request #2904 from oswaldoacauan/user-list-fix
...
Fix a bug introduced on the user list design changes on HTML5
2015-11-19 11:03:18 -05:00
Richard Alam
d021dd5971
Merge pull request #2905 from bigbluebutton/fix-presentation-back-button
...
Correct the presentation back button enabled check
2015-11-19 11:02:53 -05:00
Chad Pilkey
d1a939b797
Correct the presentation back button enabled check
2015-11-19 09:45:44 -05:00
Oswaldo Acauan
2e5449bde2
Fix a bug introduced on the user list design changes on HTML5
2015-11-19 12:07:01 -02:00
Richard Alam
af21c7b84e
Merge pull request #2903 from antobinary/pres-changes2
...
html5client: modified the handling of users on meteor started
2015-11-19 09:00:37 -05:00
Richard Alam
662dd37516
Merge pull request #2902 from oswaldoacauan/presenter-file-upload
...
Work on HTML5 client file uploader for presenters.
2015-11-19 08:17:15 -05:00
Oswaldo Acauan
844c753454
Merge remote-tracking branch 'upstream/master' into presenter-file-upload
...
* upstream/master:
Reduced the amount of LESS code for emoji animations by using a loop.
Fixed the size and internal proportions of the Exit Fullscreen button.
Removed the thin black lines inside the happy face and sad face icons occurring due to an implicit SVG path closure.
2015-11-19 11:06:25 -02:00
Oswaldo Acauan
9142565def
Polished the file uploader for presenters on HTML5 client
2015-11-19 10:53:09 -02:00
Richard Alam
c46a465a66
Merge pull request #2901 from gthacoder/meteor-client
...
HTML5 client: UI bug fixes and some code optimization.
2015-11-19 06:45:41 -05:00
Maxim Khlobystov
c01a60eb06
Reduced the amount of LESS code for emoji animations by using a loop.
2015-11-18 21:09:48 -08:00
Oswaldo Acauan
fc41e9c349
Polished the file uploader for presenters on HTML5 client
2015-11-18 20:47:30 -02:00
Anton Georgiev
550a24a638
fix for incorrect user list on an existing meeting when meteor starts
2015-11-18 14:55:50 -05:00
Anton Georgiev
38478eccea
removed params and message that are not needed
2015-11-18 13:53:55 -05:00
Oswaldo Acauan
a303f7875c
Merge with master
2015-11-18 16:12:42 -02:00
Oswaldo Acauan
d1b13b93a8
Working on the file uploader.
2015-11-18 16:05:55 -02:00
Richard Alam
d59fd4971d
Merge pull request #2900 from antobinary/pres-changes2
...
html5client:fix presentation slide change from html5 presenter
2015-11-18 10:43:09 -05:00
Anton Georgiev
f7de07970a
fix for presentation slide change from html5 presenter
2015-11-18 09:47:36 -05:00
Chad Pilkey
e8b30b626b
Removed three unused polling shortcuts
2015-11-18 07:51:48 -05:00
Richard Alam
6191ce58df
Merge pull request #2896 from Gcampes/master
...
Aligned mobile side menu, changed menu background color
2015-11-18 07:07:37 -05:00
Gabriel Campes
b342699efc
uncommented the change to app/start.sh
2015-11-18 10:01:53 -02:00
Gabriel Campes
370f1e7f13
Merge branch 'master' of https://github.com/Gcampes/bigbluebutton
2015-11-18 09:23:41 -02:00
Gabriel Campes
759ae5fbe5
Merge remote-tracking branch 'upstream/master'
2015-11-18 09:20:04 -02:00
Gabriel Campes
ef4bb74441
Fixed the hand overlapping hamburger menu button
2015-11-18 09:13:33 -02:00
Maxim Khlobystov
aa07ca114b
Fixed the size and internal proportions of the Exit Fullscreen button.
2015-11-17 22:07:57 -08:00
Maxim Khlobystov
31a4e4afc4
Removed the thin black lines inside the happy face and sad face icons occurring due to an implicit SVG path closure.
2015-11-17 21:47:22 -08:00
Richard Alam
22b3a4e2a0
- cancel the message sending task when it takes a long time to complete. The thread
...
may have blocked when the rtmp connection was closed.
2015-11-17 20:44:15 -05:00
Richard Alam
1e31055b9f
Merge pull request #2899 from oswaldoacauan/round-poll-results
...
Rounded percentage results on polls at HTML5 client
2015-11-17 15:03:27 -05:00
Richard Alam
f7630bdc74
Merge branch 'breakout-rooms-porto-algre-2015' of github.com:riadvice/bigbluebutton into breakout-rooms-porto-algre-2015
2015-11-17 14:33:57 -05:00
Ghazi Triki
b299e3fd50
Accept processing RequestBreakoutJoinURL message in akka-bbb-apps
2015-11-18 18:20:56 -02:00
Richard Alam
6a85afa430
- format out message
2015-11-17 14:33:15 -05:00
Oswaldo Acauan
f1b559f6bb
Rounded percentage results on polls at HTML5 client
2015-11-17 17:20:27 -02:00
Gabriel Campes
2b83a29a8d
Aligned mobile side menu, changed menu background color
2015-11-17 16:53:07 -02:00
Richard Alam
2c782f52dd
Merge pull request #2897 from oswaldoacauan/master
...
Work on HTML5 client bug when deleting a presentation.
2015-11-17 13:40:01 -05:00
