Anton Georgiev
b2fd1c32a7
try to re-join instead of alerting error; reset listenOnly defaults
2015-11-24 19:09:00 +00:00
Anton Georgiev
c59b3ed82c
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into pr-test
2015-11-23 22:02:19 +00:00
Anton Georgiev
3e3f7c6c8e
fix lost annotation on presentation change
2015-11-23 22:01:44 +00:00
Anton Georgiev
1d5055e3c6
Merge pull request #2910 from gthacoder/meteor-client
...
HTML5 client: Grunt configuration update + UI bug fixes and adjustments.
2015-11-23 13:20:09 -05:00
Anton Georgiev
954ff55c53
Merge pull request #2909 from Gcampes/master
...
Added auto join audio for the HTML5 client
2015-11-23 11:11:57 -05:00
Maxim Khlobystov
3ab831cb5a
Fixed the internal padding of the currently active emoji button.
2015-11-22 16:03:11 -08:00
Maxim Khlobystov
3ca40ee29e
Added some internal padding to the mobile userlist menu and removed its border radius.
2015-11-22 15:52:00 -08:00
Maxim Khlobystov
fda4f77fdc
Updated the color scheme for the mobile userlist to match the desktop experience.
2015-11-22 15:42:02 -08:00
Maxim Khlobystov
4cc3c1ab65
Got the invisible navbar title back on mobile.
2015-11-22 14:02:25 -08:00
Maxim Khlobystov
421dd23b31
Got the missing right hamburger button back on mobile.
2015-11-22 13:56:14 -08:00
Maxim Khlobystov
65d2c56f8f
Added the ability to run Jasmine tests with a single command.
2015-11-21 22:34:58 -08:00
Maxim Khlobystov
5a91abe468
Made Grunt work without additional step of making grunt command recognizable (added grunt-cli to the default installation).
2015-11-21 22:18:33 -08:00
Maxim Khlobystov
e4df76f98f
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-client
2015-11-21 20:29:46 -08:00
Gabriel Campes
cf72e09103
Merge branch 'master' of https://github.com/Gcampes/bigbluebutton
...
Conflicts:
bigbluebutton-html5/app/config.coffee
2015-11-20 17:37:07 -02:00
Gabriel Campes
34f0b22a91
added auto join voice chat
...
Fixed endless joining voice chat message
Changed config to auto join
2015-11-20 17:21:02 -02:00
Gabriel Campes
93dacb7f1d
added auto join voice chat
...
Fixed endless joining voice chat message
2015-11-20 17:10:54 -02: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
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
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
