Commit Graph

17 Commits

Author SHA1 Message Date
Oswaldo Acauan
e6412275a6 Linter auto fix 2017-06-02 19:25:02 +00:00
Oswaldo Acauan
edd64a97f4 Fix merge conflicts 2017-04-28 16:15:29 +00:00
Oswaldo Acauan
5fa27107cb Fix merge conflicts 2017-04-18 19:42:55 +00:00
Oswaldo Acauan
334026833b Refactor Modal related components 2017-04-18 19:38:26 +00:00
Anton Georgiev
450d2f3435 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-restructuring 2017-04-17 11:37:49 -04:00
Anton Georgiev
f4aeb3f7ee move phone api to audio/service.js 2017-03-28 10:02:23 -04:00
KDSBrowne
93d1aed4c3 remove unneeded variable 2017-03-24 12:27:45 -07:00
Anton Georgiev
8bb1386699 moved audio-modal and audio-settings under audio/ 2017-03-24 12:01:35 -04:00
KDSBrowne
a633492b98 move user and presenter views to main render function 2017-03-24 08:34:45 -07:00
Anton Georgiev
5575d32438 Merge pull request #3730 from KDSBrowne/action-buttons-center
Actions Bar Positioning
2017-03-21 12:18:46 -04:00
KDSBrowne
8f76ec495c remove unused imports 2017-03-21 07:35:09 -07:00
KDSBrowne
7479570a8c move handleExitAudio to service 2017-03-21 07:29:54 -07:00
Oswaldo Acauan
2090883b03 Refactor Auth logout and credentials getter 2017-03-17 14:23:00 +00:00
KDSBrowne
d2405d4c61 pass props down from createContainer 2017-03-16 16:30:46 -07:00
Lajellu
b3f1d9f804 HTML5 - Add the three emojis: applause, thumbs up, thumbs down and fixes some master lint issues 2016-12-20 10:06:01 -08:00
KDSBrowne
cba6e75735 cleaning up 2016-11-14 18:48:56 -08:00
KDSBrowne
2296a122f5 Actions button only available to Presentor 2016-11-07 10:19:00 -08:00