Commit Graph

1810 Commits

Author SHA1 Message Date
Ubuntu
a096e25a72 Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2 2017-03-22 20:37:41 +00:00
perroned
c64c97b582 Html5 clean up 2017-03-21 21:46:41 +00:00
perroned
8c338f42d2 Fixes bug with call not always going through x2 2017-03-21 17:00:58 +00:00
perroned
3dfb5bba43 Fixes bug with call not always going through 2017-03-21 15:42:14 +00:00
Ubuntu
4da7d6d03f Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2 2017-03-17 15:55:23 +00:00
Anton Georgiev
59d6f12fad Merge pull request #3734 from Gcampes/settings-refactor
[HTML5] Increases default font size
2017-03-16 10:34:29 -04:00
gcampes
31adb14543 Increases default font size 2017-03-16 10:10:39 -03:00
Anton Georgiev
85a445b919 add isBreakoutRoom on render 2017-03-15 15:03:56 -04: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
Anton Georgiev
4b77c89eff Merge pull request #3728 from Gcampes/patch-2
[HTML5] Open first submenu for settings
2017-03-14 11:08:34 -04:00
Oleksandr Zhurbenko
07502ca172 Linting 2017-03-13 15:35:04 -07:00
Oleksandr Zhurbenko
d8542490c7 Corrected the fix 2017-03-13 15:33:06 -07:00
Gabriel Carvalho de Campes
bc969c8aad [HTML5] Open first submenu for settings 2017-03-13 17:03:18 -03:00
Oleksandr Zhurbenko
d7b5ae3c36 Fixed permissions and some exceptions 2017-03-13 12:15:58 -07: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
Anton Georgiev
9600910319 Merge pull request #3700 from OZhurbenko/icons-update
HTML5 - Updated Icons
2017-03-07 16:51:12 -05:00
Oswaldo Acauan
dc2cc13c70 Fix wrong error message 2017-03-07 17:37:25 +00:00
Oswaldo Acauan
3f946fb6a6 Fix wrong collection imports 2017-03-07 17:32:24 +00:00
Oswaldo Acauan
3c6ccf6cec Skip updating user validated flag if its already valid 2017-03-07 17:18:02 +00:00
Oleksandr Zhurbenko
ccef7e9562 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into icons-update 2017-03-06 12:44:19 -08:00
perroned
dcdd4d0756 Cleans up html5 2017-03-06 20:30:07 +00:00
perroned
03b854e6b1 Update media service for new name 2017-03-06 19:34:30 +00:00
perroned
dab5adb5be Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2
Conflicts:
	bigbluebutton-html5/imports/ui/components/media/container.jsx
	bigbluebutton-html5/server/main.js
2017-03-06 19:21:40 +00:00
Anton Georgiev
71b995ecdf Merge pull request #3699 from OZhurbenko/meteor-update
HTML5 - Meteor 1.4.3.1
2017-03-06 14:18:18 -05:00
JaeeunCho
e2964d2c8f HTML5 - changed the location of slide's arrow buttons 2017-03-03 09:55:11 -08:00
Oleksandr Zhurbenko
bba1d52716 Adjusted history package version to work with the latest react-router 2017-03-02 11:06:51 -08:00
Oleksandr Zhurbenko
6bafa381d6 Updated npm packages to the latest 2017-03-02 10:59:44 -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
e67b2a733e Merge pull request #3686 from oswaldoacauan/fix-reply-messages-remove
[HTML5] Fix presentations/shapes reply messages
2017-03-02 11:44:26 -05:00
Anton Georgiev
c92baed843 Merge pull request #3685 from OZhurbenko/whiteboard-restructuring
HTML5 Whiteboard Restructuring
2017-03-02 11:37:18 -05:00
Oswaldo Acauan
5ef65300b6 Fix user not being able to revalidate 2017-03-02 16:23:53 +00:00
Oswaldo Acauan
5b407d40f4 Remove debug line 2017-03-02 16:08:49 +00:00
Oswaldo Acauan
715b11fe46 Fix emojiStatus undefined logger variable 2017-03-02 16:07:45 +00:00
Oleksandr Zhurbenko
80666bd688 Updated icons in the html5 client 2017-03-01 17:03:02 -08:00
Oleksandr Zhurbenko
0677116ef2 Meteor 1.4.3.1 2017-03-01 15:02:58 -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
a6947bdd17 removes debug code 2017-03-01 09:32:23 -03:00
gcampes
4918cf9160 fix bug with focus 2017-03-01 09:22:11 -03:00
perroned
59435c6020 Cleaning 2017-02-27 19:59:54 +00:00
perroned
05d32bdbd3 Removes html5 video player controls 2017-02-27 18:18:54 +00:00