BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,568 Commits 13 Branches 260 Tags 1.1 GiB
90680f31ef
Commit Graph

664 Commits

Author SHA1 Message Date
Maxim Khlobystov
ec8c1f83ab Fixed a small typo. 2016-01-15 11:41:16 -05:00
Maxim Khlobystov
cc6ffe15df Got all the single-line comments back. 2016-01-15 00:46:41 -05:00
Maxim Khlobystov
a844cb9356 Started using ES2015 inheritance for the whiteboard models instead of the auxiliary function created by the transpiler. 2016-01-13 18:30:58 -05:00
Maxim Khlobystov
e74ebe25fb Removed unnecessary CoffeeScript dependancy. 2016-01-12 15:24:12 -05:00
Maxim Khlobystov
52220a42cb Moved to ES2015. 2016-01-12 15:15:16 -05:00
Oleksandr Zhurbenko
da7242737b Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into chat-improvements 
Conflicts:
	bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee
 2015-12-13 20:20:10 -08:00
Oleksandr Zhurbenko
b051765713 Fixed position of Raise Hand button in tablet/cellphone portrait views 2015-12-13 20:07:14 -08:00
Gabriel Campes
791290e8b9 Add set presenter to HTML5 2015-12-07 13:33:52 -02:00
Gabriel Campes
be9e582a1d Add kick user to HTML5 2015-12-04 14:38:19 -02:00
Anton Georgiev
ed8b38478c Merge pull request #2923 from antobinary/pr-test 
html5client:clear slide when presenter removes current presentation
 2015-12-03 18:17:01 -05:00
Anton Georgiev
f5adeb34d8 reuse existing functionality 2015-12-03 23:15:29 +00:00
Anton Georgiev
f1d547bf42 clear slide when presenter removes current presentation 2015-12-03 23:04:17 +00:00
Anton Georgiev
0fa709441d Merge pull request #2922 from antobinary/pr-test 
html5client: reworked viewing slide change; moved the cursor out of Presentation collection
 2015-12-03 15:24:21 -05:00
Anton Georgiev
007911ad85 remove extra callback 2015-12-03 20:23:20 +00:00
Anton Georgiev
1e4477d1c2 moved the cursor into its own collection 2015-12-03 20:01:27 +00:00
Anton Georgiev
59f1ff2394 force display of slide even if .rendered does not trigger. Will need to decouple pointer coord from Presentation 2015-12-03 17:03:04 +00:00
Oleksandr Zhurbenko
3581e8abeb Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into chat-improvements 
Conflicts:
	bigbluebutton-html5/app/client/stylesheets/whiteboard.less
 2015-12-02 17:09:51 -08:00
Oleksandr Zhurbenko
bd6db1afb6 Corrected styling for whiteboard controls and an upload container 2015-11-30 17:46:38 -08:00
Oleksandr Zhurbenko
ff33347114 Took the whiteboard controls out of the whiteboard container, removed check for the opened upload window 2015-11-29 11:45:08 -08:00
Maxim Khlobystov
04528eeafe Made the horizontal border between chat and presentation areas one pixel wide on mobile. 2015-11-28 21:44:41 -08:00
Maxim Khlobystov
7cd8702d98 Removed border radius on both chat and presentation areas for mobile devices. 2015-11-28 21:36:54 -08:00
Maxim Khlobystov
ad0a23c02e Changed the mobile navbar icons (thus reducing the number of animations) and redesigned the Settings menu. 2015-11-28 21:18:58 -08:00
Maxim Khlobystov
f7eb9b2a06 Included the navbar under the dark overlay when offset menu is open in portrait, removed some redundant code. 2015-11-28 18:49:53 -08:00
Oleksandr Zhurbenko
cb33ef7586 presentationProgress() didn't work and didn't display slide numbers for a presenter 2015-11-27 16:54:26 -08:00
Oleksandr Zhurbenko
ab7affc1f2 Got rid of exceptions in the console 2015-11-27 13:40:33 -08:00
Oleksandr Zhurbenko
d7287a9309 Unnecessary important 2015-11-27 12:20:03 -08:00
Anton Georgiev
0aa7038ae1 fix bug-shapes were flushed no matter which meeting ends 2015-11-27 16:40:31 +00:00
Oleksandr Zhurbenko
c14995a14b Unused and duplicated code 2015-11-26 17:04:54 -08:00
Oleksandr Zhurbenko
cc92e186ca Corrected the centering for raise hand button in case when there is no current presentation 2015-11-26 17:03:06 -08:00
Oleksandr Zhurbenko
38eaf0252d Removed vertical scrolling in the desktop view 2015-11-26 15:38:04 -08:00
Anton Georgiev
1b0dca557d remove (presenter) in useritem 2015-11-24 19:40:45 +00:00
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
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
e4df76f98f Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-client 2015-11-21 20:29:46 -08: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
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
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
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
Anton Georgiev
f7de07970a fix for presentation slide change from html5 presenter 2015-11-18 09:47:36 -05:00
Gabriel Campes
b342699efc uncommented the change to app/start.sh 2015-11-18 10:01:53 -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
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
Oswaldo Acauan
5b82ad6e08 Changed from the session from localStorage to sessionStorage on HTML5 client 2015-11-17 16:32:38 -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
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
f9c241a041 Merge pull request #2891 from OZhurbenko/chat-improvements 
Slide Loading and Resizing corrections
 2015-11-12 14:06:18 -05:00
Oleksandr Zhurbenko
3e4572d6b5 Removed unused code 2015-11-11 15:31:03 -08:00
Oleksandr Zhurbenko
8a17a295b9 Fixed a problem with displaying tall slides on the first load 2015-11-10 19:44:48 -08:00
Anton Georgiev
e300e0376f cleaning up 2015-11-09 22:03: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
Anton Georgiev
e3efd24a2b fix function def typo 2015-11-09 18:45:31 +00:00
Anton Georgiev
c18aef9f5e Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-fix 2015-11-06 22:01:34 +00:00
Anton Georgiev
84e8cb0d48 fix issue with join user for Flash users 2015-11-06 22:01:03 +00:00
Anton Georgiev
247349e9b4 working on serializing message handling 2015-11-06 21:38:18 +00:00
Oleksandr Zhurbenko
849b58d8cb Fixed chatbody's srolling on increasing font-size 2015-11-06 13:06:17 -08:00
Oleksandr Zhurbenko
4b0bce343b Added input textarea resizing on font-size change 2015-11-06 12:26:41 -08:00
Oleksandr Zhurbenko
f6700df896 Applied dynamic font-size for the input textarea 2015-11-05 15:16:33 -08:00
Anton Georgiev
db62de4e2f in the process of serializing message handling 2015-11-05 22:22:14 +00:00
perroned
8a8e81da55 Uniform height for settings components 2015-11-05 12:42:47 -08:00
perroned
98e4034ca3 Prevent horizontal scrollbars for chat 2015-11-05 10:22:17 -08:00
perroned
6b198daa36 Unify height for chat controls 2015-11-05 10:17:09 -08:00
perroned
b17ee7b7bf Fix centering of fieldsets in Firefox 2015-11-05 10:16:35 -08:00
Oleksandr Zhurbenko
a6e38c69f1 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into modal-improvements 
Conflicts:
	bigbluebutton-html5/app/client/main.html
	bigbluebutton-html5/app/client/stylesheets/style.less
 2015-11-04 15:47:14 -08:00
Oleksandr Zhurbenko
12a00553d2 Getting rid of duplicating code 2015-11-04 15:34:54 -08:00
Oleksandr Zhurbenko
cb610535bb Modal window changes: removed cancel buttons and a save button, added 'Close' instead, fixed centering problem 2015-11-04 15:33:29 -08:00
Anton Georgiev
1ef29a034b push the redis messages in a FIFO queue to avoid race cond 2015-11-04 20:57:56 +00:00
Anton Georgiev
6cec8d0c81 change the default font on mobile to 16 2015-11-04 20:54:42 +00:00
Anton Georgiev
c4d7d70dce fix placement of welcome message issue 2015-11-03 22:19:17 +00:00
Anton Georgiev
7f07e686dd Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-fix 2015-11-03 21:08:16 +00:00
Anton Georgiev
9e56192e4b improve logs to detect correct sequence of events and detect race cond 2015-11-03 21:07:56 +00:00
Oleksandr Zhurbenko
2b96e6f723 Added spinning bar which is displayed while the data is loading 2015-11-03 12:04:02 -08:00
Oleksandr Zhurbenko
a97eba6d8b Making sure that the data is downloaded before starting rendering the client 2015-11-03 12:03:05 -08:00
Richard Alam
03a7110a92 Merge pull request #2869 from gthacoder/meteor-client 
HTML5 client: UI fixes and code refactoring.
 2015-11-02 14:40:41 -05:00
Anton Georgiev
2ca161124e do not store flash client users while reconnecting 2015-11-02 19:37:23 +00:00
Maxim Khlobystov
f4f4a119d9 Got rid of some old unused code related to the raise hand functionality. 2015-11-01 16:08:12 -08:00
Maxim Khlobystov
50e3000b85 Made Raise Hand button invisible in full screen mode. 2015-11-01 15:55:22 -08:00