Commit Graph

11462 Commits

Author SHA1 Message Date
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
c435d8d748 Changed the styling of currently selected emoji button. 2015-11-18 21:25:27 -08: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
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
Oswaldo Acauan
5b82ad6e08 Changed from the session from localStorage to sessionStorage on HTML5 client 2015-11-17 16:32:38 -02:00
Oswaldo Acauan
1441ac0d3b Merge branch 'master' of https://github.com/oswaldoacauan/bigbluebutton
* 'master' of https://github.com/oswaldoacauan/bigbluebutton:
  Working on HTML5 displaying the last slide when presentation is deleted
  Working on HTML5 displaying the last slide when presentation is deleted
  Increased the overflow limit on user name at the sidebar
2015-11-17 15:02:25 -02:00
Oswaldo Acauan
5dddcb819f Working on HTML5 displaying the last slide when presentation is deleted 2015-11-17 15:01:27 -02:00
Oswaldo Acauan
2f7ad91b3e Working on HTML5 displaying the last slide when presentation is deleted 2015-11-17 14:59:16 -02:00
Oswaldo Acauan
af2bba668f Working on HTML5 displaying the last slide when presentation is deleted 2015-11-17 14:57:55 -02:00
Gabriel Campes
14110cdd5f Aligned mobile side menu, changed menu background color 2015-11-17 14:39:22 -02:00
Richard Alam
093e09a594 Merge pull request #2895 from oswaldoacauan/master
User list design changes on HTML5 client
2015-11-17 10:36:01 -05:00
Oswaldo Acauan
5a84874b75 Increased the overflow limit on user name at the sidebar 2015-11-17 12:02:33 -02:00
Oswaldo Acauan
b6b52f9626 Added padding on sidebar icons so they don't touch the edge 2015-11-17 11:32:42 -02:00
Oswaldo Acauan
ed59945b3f Increased the sidebar to 2/3 of the screen on mobile 2015-11-17 11:24:22 -02:00
Chad Pilkey
8d321b2493 Merge pull request #2849 from riadvice/client-fixes
Minor Client fixes
2015-11-16 07:35:39 -05:00
Richard Alam
54883969c2 Merge pull request #2893 from daronco/webhook-fixes
Webhooks: Fix "ReferenceError: hook is not defined" when removing hook
2015-11-13 11:18:25 -05:00
Chad Pilkey
f9c241a041 Merge pull request #2891 from OZhurbenko/chat-improvements
Slide Loading and Resizing corrections
2015-11-12 14:06:18 -05:00
Leonardo Crauss Daronco
0a9376f9b2 Fix "ReferenceError: hook is not defined" when removing hook 2015-11-12 16:43:11 -02:00
Oleksandr Zhurbenko
3e4572d6b5 Removed unused code 2015-11-11 15:31:03 -08:00
perroned
41a433e25d Notification for local deskshare preview 2015-11-11 07:45:35 -08:00
perroned
fde796f9da Hide slide controls during a local video preview 2015-11-11 07:34:50 -08:00
Oleksandr Zhurbenko
8a17a295b9 Fixed a problem with displaying tall slides on the first load 2015-11-10 19:44:48 -08:00
Richard Alam
443d6ba976 Merge pull request #2890 from antobinary/audio-fix
html5client:Queue updates
2015-11-10 17:33:46 -05:00
Fred Dixon
a418f3977a Merge pull request #2889 from capilkey/add-audio-left-sound
Added a client side audio queue when you leave the voice conference
2015-11-09 18:09:50 -05:00
Anton Georgiev
e300e0376f cleaning up 2015-11-09 22:03:11 +00:00
Anton Georgiev
975f512b74 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-fix 2015-11-09 21:36:11 +00:00
Anton Georgiev
d3f9f4e8a7 keep track of queue length; omit some messages from entering the queue (pong,..) 2015-11-09 21:35:03 +00:00