gcampes
66e9680d48
Merge remote-tracking branch 'upstream/master' into dropdown-mobile-fix
...
* upstream/master:
add isBreakoutRoom on render
pass flag as a property
pass flag as a property
evaluate in container, pass boolean flag to component
apply recommendations from pr comments
reuse isMeetingBreakout
don't allow kick user in breakout rooms
Linting
Corrected the fix
[HTML5] Open first submenu for settings
Fixed permissions and some exceptions
2017-03-15 17:16:02 -03:00
gcampes
9ed21657c5
Adds localization to dropdown
2017-03-15 17:11:34 -03:00
Anton Georgiev
85a445b919
add isBreakoutRoom on render
2017-03-15 15:03:56 -04:00
gcampes
7c42f3a535
Makes dropdown usable on mobile devices
2017-03-15 15:09:20 -03:00
Anton Georgiev
70ad071d5b
pass flag as a property
2017-03-15 14:03:58 -04:00
Anton Georgiev
26582033f2
pass flag as a property
2017-03-15 13:54:40 -04:00
Anton Georgiev
29de597e10
evaluate in container, pass boolean flag to component
2017-03-15 13:43:03 -04:00
Anton Georgiev
9315b79b6c
apply recommendations from pr comments
2017-03-15 12:21:26 -04:00
Anton Georgiev
64c43f4084
reuse isMeetingBreakout
2017-03-14 17:06:52 -04:00
Anton Georgiev
ae7aa7b3df
don't allow kick user in breakout rooms
2017-03-14 16:57:22 -04:00
Gabriel Carvalho de Campes
bc969c8aad
[HTML5] Open first submenu for settings
2017-03-13 17:03:18 -03:00
gcampes
ed4f1cf5c2
Fix issues based on PR comments
2017-03-13 08:48:00 -03:00
gcampes
985b9d6939
Change icon names to the new ones
2017-03-09 13:49:28 -03:00
gcampes
b422ab10e9
Merge conflicts
2017-03-09 11:42:31 -03:00
gcampes
417b2e4500
Fix issues based on PR comments
2017-03-09 11:34:33 -03:00
Oleksandr Zhurbenko
ccef7e9562
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into icons-update
2017-03-06 12:44:19 -08:00
JaeeunCho
e2964d2c8f
HTML5 - changed the location of slide's arrow buttons
2017-03-03 09:55:11 -08:00
Oleksandr Zhurbenko
7b3bc48be4
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into icons-update
2017-03-02 10:11:59 -08:00
Anton Georgiev
c92baed843
Merge pull request #3685 from OZhurbenko/whiteboard-restructuring
...
HTML5 Whiteboard Restructuring
2017-03-02 11:37:18 -05:00
Oleksandr Zhurbenko
80666bd688
Updated icons in the html5 client
2017-03-01 17:03:02 -08:00
Oleksandr Zhurbenko
7e54305850
Fixed warnings in the polling component
2017-03-01 14:55:44 -08:00
gcampes
8d2a51a00a
Remove console log
2017-03-01 17:29:18 -03:00
gcampes
91da3e0262
Fix font size not showing in settings modal
2017-03-01 14:37:55 -03:00
gcampes
4918cf9160
fix bug with focus
2017-03-01 09:22:11 -03:00
gcampes
439e7a97f2
fix font size on modal cancel
2017-02-24 17:38:16 -03:00
gcampes
8e2bb6a799
revert unwanted changes
2017-02-24 17:35:41 -03:00
gcampes
420918abe8
merge conflicts
2017-02-24 17:28:42 -03:00
gcampes
ef6bc76ea3
remove old settings folder
2017-02-24 17:20:22 -03:00
gcampes
3c02848478
hide moderator settings, implement default settings
2017-02-24 17:19:53 -03:00
Oleksandr Zhurbenko
fe01f81e27
changed slide-controls to presentation-toolbar
...
.. and removed duplicate strings from the locales
2017-02-23 12:20:21 -08:00
Oleksandr Zhurbenko
48c3c5252e
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into whiteboard-restructuring
2017-02-23 10:26:03 -08:00
Oleksandr Zhurbenko
119beae88b
Restructured whiteboard code
2017-02-23 10:20:45 -08:00
Oleksandr Zhurbenko
09090eda13
Removed an unnecessary import from the cursor service
2017-02-23 10:20:29 -08:00
Oleksandr Zhurbenko
8f74e984ac
Restructured the whiteboard code
2017-02-23 10:19:59 -08:00
Oleksandr Zhurbenko
649b0a2738
Fixed presentation imports
2017-02-23 10:15:25 -08:00
Oleksandr Zhurbenko
10c8b86a0d
Renamed whiteboard to presentation
2017-02-23 10:14:35 -08:00
Oswaldo Acauan
8bd65c1a43
Merge remote-tracking branch 'upstream/master' into refactor-api-users
...
* upstream/master: (47 commits)
Updated with correct version
Check for initial values in application.conf
remove defaultMessage
Remove wrong selector when upserting captions
Localize other labels through the application
localize labels for AudioSettings component
localize label for AudioTest component
hide option to reset status if there is no status (emojis)
drop voice in main room when joining breakout room
add defaultMessage for Public Chat
localize Join/Leave Audio labels
Remove console logs
Fix ´get_all_meetings_request´ being published multiple times
Clean captions when handling the history reply
Fix presentation slide coordinates
- when we get invalid coordinate for presentation slide, change coordinate so it falls within bounds
use localized Public Chat label
finish locals for the audio modal
Returning number of users that participated in each meeting in getRecordings call
add comment for condition
...
2017-02-23 17:46:30 +00:00
Oswaldo Acauan
f16926c94d
Refactor emojiStatus method
2017-02-22 13:11:47 +00:00
Oswaldo Acauan
09481987ce
Refactor assignPresenter method
2017-02-22 12:56:32 +00:00
gcampes
f941eaea3d
solve closed captions settings issue, continue settings implementation
2017-02-21 17:29:36 -03:00
Anton Georgiev
327ea70ce3
Merge pull request #3669 from antobinary/locals-2
...
HTML5: Localize more client side strings
2017-02-17 13:48:12 -05:00
Anton Georgiev
e7345ed7a2
remove defaultMessage
2017-02-17 13:44:17 -05:00
Anton Georgiev
1577fbd35a
Merge pull request #3591 from oswaldoacauan/refactor-api-captions
...
[HTML5] Refactor API Closed Captions
2017-02-17 13:21:20 -05:00
Anton Georgiev
f4ea3445d7
Localize other labels through the application
2017-02-16 17:14:10 -05:00
Anton Georgiev
216f494346
localize labels for AudioSettings component
2017-02-16 15:57:57 -05:00
Anton Georgiev
b1f0282c52
localize label for AudioTest component
2017-02-16 14:47:12 -05:00
Anton Georgiev
c6a15d6f7f
Merge pull request #3664 from antobinary/drop-voice-in-main
...
HTML5: Drop voice in main room when joining breakout room
2017-02-16 14:04:28 -05:00
Anton Georgiev
3581023b91
hide option to reset status if there is no status (emojis)
2017-02-16 10:53:54 -05:00
gcampes
3243ff32cf
Changes to settings modal
2017-02-15 16:49:40 -02:00
Anton Georgiev
a8df05f3e6
drop voice in main room when joining breakout room
2017-02-15 13:36:30 -05:00