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
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
Maxim Khlobystov
50c74ce5ee Corrected the position of Full Screen button and the size of Raise Hand button to align them together on mobile devices. 2015-11-01 15:49:25 -08:00
Maxim Khlobystov
1c93dfa588 Replaced the FAB trigger's icon with a raised hand + did some code refactoring for the sliding menu and FAB. 2015-11-01 15:34:49 -08:00
Maxim Khlobystov
a23dc18c78 Fixed the issue with unselectable text in Chrome. 2015-10-31 21:20:38 -07:00
Anton Georgiev
39f90d2f8b cleaning up 2015-10-30 21:30:58 +00:00
Anton Georgiev
47cee3138f use UPSERT for chat messages too 2015-10-30 21:27:56 +00:00
Anton Georgiev
a4dd3d63e4 use UPSERT for meetings and users 2015-10-30 20:23:41 +00:00
Anton Georgiev
67b4ab69fb it was trying to reuse username from cache 2015-10-29 22:10:33 +00:00
Anton Georgiev
d490dc9ef4 work on fixing the userlist discrepancies (extra users) 2015-10-29 21:23:03 +00:00
Anton Georgiev
4b53c3d874 omit users with authToken undef; improve logs 2015-10-28 16:12:40 +00:00
Anton Georgiev
e89c37f8ae lock settings - missed these 2015-10-28 16:00:55 +00:00
Anton Georgiev
940dd4b9b2 hide joinAudio with mic icon if permissions prohibit mic 2015-10-27 20:58:41 +00:00
Anton Georgiev
1a7d91dcf2 adapt to the restructured lock settings message format 2015-10-27 20:34:03 +00:00
Anton Georgiev
7d624edbb8 leave global audio when exiting 2015-10-26 22:54:49 +00:00
Anton Georgiev
f54fcd9035 improve redis log 2015-10-26 22:53:34 +00:00
Oleksandr Zhurbenko
2f9a990663 Moving options' template to modal 2015-10-23 16:29:24 -07:00
Oleksandr Zhurbenko
b53d6454b1 Fixed a bug where horizontal scrolling appeared when users got long chat messages in mobile views 2015-10-16 14:49:06 -07:00
Oleksandr Zhurbenko
f963798952 Resetting resized input box after switching from landscape to portrait on desktop 2015-10-16 14:38:20 -07:00
perroned
30332602ed Made ahandlers for picking up orientation switching 2015-10-16 12:00:23 -07:00
Oleksandr Zhurbenko
f552f8a4cc Restricted textbox resizing to landscape only 2015-10-16 12:00:16 -07:00
Anton Georgiev
a3e7721db9 update welcome message 2015-10-09 15:36:56 +00:00
Anton Georgiev
8a6c713237 while in audio display exit audio 2015-10-07 15:21:25 +00:00
Anton Georgiev
a38f5b642a Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-fix 2015-10-07 15:10:55 +00:00
perroned
99e0b75997 Simplify loading protocol process for libraries 2015-10-06 12:56:50 -07:00
perroned
3a738caa90 Load libraries from same protocl as page was served from 2015-10-06 12:48:34 -07:00
perroned
9f69fc4105 Merge remote-tracking branch 'bbb/master' into html5-client-https-audio 2015-10-06 12:42:37 -07:00
Maxim Khlobystov
4b14abfc9d Slightly changed the color palette for FAB. 2015-10-06 08:15:08 -07:00
Maxim Khlobystov
d5fddab14d Cleaning up. 2015-10-06 08:10:38 -07:00
perroned
9e9002b6bd When in audio only display exit button, remove join for other method 2015-10-05 13:46:54 -07:00
Anton Georgiev
8093ec3a66 adapt to internal userId (same for html5 as externalId) 2015-10-05 19:19:36 +00:00
perroned
343bcf86d0 Load external JS libraries using HTTPS 2015-10-05 12:07:14 -07:00
Maxim Khlobystov
5b97d359b3 Changed the color palette for the floating action button to use the existing colors. 2015-10-05 11:45:35 -07:00
Maxim Khlobystov
426adee719 Prevented the FAB from triggering on clicking invisible buttons. 2015-10-05 11:34:10 -07:00
Maxim Khlobystov
4231de1f51 Made FAB disappear smoothly after user clicks one of its buttons. 2015-10-05 10:02:52 -07:00
Maxim Khlobystov
e9f204b681 Added the ability to clear emoji status. 2015-10-02 18:07:28 -07:00
Maxim Khlobystov
65a7ac4b70 Implemented emoji status detection. 2015-10-01 15:24:43 -07:00
Maxim Khlobystov
d8ecfd8e04 Added the ability to set emoji status. 2015-10-01 12:41:43 -07:00
Maxim Khlobystov
da50169319 Updated Meteor. 2015-10-01 11:34:00 -07:00
Chad Pilkey
ad03486971 Merge pull request #2804 from OZhurbenko/whiteboard-modifications 
Polling shape correction
 2015-09-24 13:37:34 -04:00
Oleksandr Zhurbenko
e4277691d4 Corrected Back to Public button in a private chat tab 2015-09-15 10:51:31 -07:00
Anton Georgiev
233707395a limit flooding logs 2015-09-14 19:56:25 +00:00
Anton Georgiev
d7e414fa43 [un]mute message was not going to the correct redis channel 2015-09-14 19:55:04 +00:00
Oleksandr Zhurbenko
cfccc3aae2 Added outer whitespace to the poll shape, as in the Flash client 2015-09-11 13:07:50 -07:00
Oleksandr Zhurbenko
41c453c470 cleanup 2015-09-10 15:09:55 -07:00
Oleksandr Zhurbenko
d208da2c31 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui 
Conflicts:
	bigbluebutton-html5/app/client/globals.coffee
 2015-09-10 15:01:09 -07:00
Oleksandr Zhurbenko
2feabdc65b Fixed a bug with whiteboard's width in case when poll controllers appeared 2015-09-10 14:50:38 -07:00
Oleksandr Zhurbenko
f9b2cdb01c Removed unnecessary Tracker.autorun and cleaned up things 2015-09-09 10:24:57 -07:00
Oleksandr Zhurbenko
db3b95e990 Added proper scaling for the whiteboard when a polling or bottom presenter buttons templates are rendered or destroyed 2015-09-08 16:57:39 -07:00
Oleksandr Zhurbenko
0d00fb786b Prevented a whiteboard from unnecessary redrawing and improved scaling 2015-08-28 20:12:44 -07:00
Oleksandr Zhurbenko
621ebc169d Prevented whiteboard's redrawing when one of the shapes is redrawn 2015-08-27 17:55:28 -07:00
Maxim Khlobystov
89b4bac21a Made the userlist hidden by default on phones. 2015-08-27 17:47:40 -04:00
Maxim Khlobystov
4ecf1ea16a Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-client-mobile-view 
Conflicts:
	bigbluebutton-html5/app/client/stylesheets/whiteboard.less
 2015-08-27 17:19:43 -04:00
Maxim Khlobystov
5be21ee80a Made sure the width and position of the Settings window are set appropriately on any device. 2015-08-27 17:11:59 -04:00
Oleksandr Zhurbenko
ea8fe5d146 Fixed a bug with an endless array which became bigger while cursors' moving and slowed down a whiteboard 2015-08-26 16:12:20 -07:00
Maxim Khlobystov
ec33e1404b Made the notifications look appropriately sized regardless of the device type or screen orientation. 2015-08-26 17:37:27 -04:00
Maxim Khlobystov
b362cb95f3 Polished up the sizing of Settings window. 2015-08-25 14:49:04 -04:00
Oleksandr Zhurbenko
30a1d0d880 Fixed a bug with publishing a custom poll containing just one answer 2015-08-24 15:59:45 -07:00
Oleksandr Zhurbenko
8b6ebe63b6 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui 2015-08-24 15:31:50 -07:00
Oleksandr Zhurbenko
e77c6377be Removed 40px restriction for the width and increased a default font-size for calculations 2015-08-24 15:22:59 -07:00
Maxim Khlobystov
092274e8ef Continued transitioning the mobile views to CSS pixels, corrected the sizes of Settings window's fonts/elements. 2015-08-24 17:20:14 -04:00
Oleksandr Zhurbenko
953a98b038 Added scaling and truncating to the bar with poll buttons with answers 2015-08-21 10:14:56 -07:00
Maxim Khlobystov
21f1bd6a60 Polishing up the font and element sizes for phones and tablets. 2015-08-21 10:59:09 -04:00
Maxim Khlobystov
81a2ce5827 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-client-mobile-view 
Conflicts:
	bigbluebutton-html5/app/client/stylesheets/chat.less
	bigbluebutton-html5/app/client/stylesheets/whiteboard.less
 2015-08-21 09:55:23 -04:00
Maxim Khlobystov
88fb41263e Modified the UI styling to start using CSS pixels + separated phone, tablet and desktop views. 2015-08-20 15:45:26 -04:00
Oleksandr Zhurbenko
39e51604a0 Made a raise hand button transparent 2015-08-20 12:21:48 -07:00
Richard Alam
dbe2e1c389 Merge pull request #2730 from OZhurbenko/meteor-ui 
Polling, Sorting and URL Validation
 2015-08-19 21:06:45 -04:00
Oleksandr Zhurbenko
5f6bd654d4 Changed the whole way of how we calculate height and width of text elements, as the previous one didn't work in Firefox. Also, if the number of the votes doesn't fit the box then it's displayed in black on the right. Changed the colors to dark grey 2015-08-19 17:42:38 -07:00
Maxim Khlobystov
8b06d43aec Fixed the mechanism of toggling the chat bar and made sure user is unable to resize the whiteboard when the chat is closed. 2015-08-19 12:47:00 -04:00
Maxim Khlobystov
f5fe166b50 Styling for the side menus. 2015-08-18 20:02:00 -04:00
Maxim Khlobystov
9fb02eae05 Made sure all the side menu elements are clickable. 2015-08-18 19:35:14 -04:00
Maxim Khlobystov
e98c96bd8b Fixed the issue of not being able to toggle userlist in landscape mode on mobile devices. 2015-08-18 18:09:24 -04:00
Maxim Khlobystov
3b73497bea Added phone/tablet detection, made the navbars look bigger on a mobile phone in landscape orientation. 2015-08-18 15:01:49 -04:00
Maxim Khlobystov
6d0808c93b Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-client-mobile-view 2015-08-17 17:25:20 -04:00
Maxim Khlobystov
e676b2b1c4 Set the client to store the slide URI in a more general way to be able to handle old PNG links. 2015-08-17 16:55:28 -04:00
Oleksandr Zhurbenko
cd9625dd84 Putting everything in order 2015-08-16 15:19:43 -07:00
Oleksandr Zhurbenko
5eb6166db3 Added a 'number of votes' text column to the center of the each black bar 2015-08-14 17:12:25 -07:00
Oleksandr Zhurbenko
d8af3bedba Line bars change according to a number of people voted for that particular answer 2015-08-14 17:10:51 -07:00
Oleksandr Zhurbenko
6c1e2ca385 Fixed a bug with the poll shape not being removed properly 2015-08-13 22:28:30 -07:00
Oleksandr Zhurbenko
c9f802ce68 Calculations and positioning for the 'percentages' column 2015-08-13 16:31:48 -07:00
Oleksandr Zhurbenko
58018da679 Calculations and positioning for the 'key' column 2015-08-13 14:06:28 -07:00
Oleksandr Zhurbenko
1f8d41595f Added all the needed calculations for the sizes and positioning of the line bars 2015-08-13 12:50:25 -07:00
Oleksandr Zhurbenko
967fef5191 Added a function which calculates the font-size of the text fields and checks if the text fields meet all the requirements and fit the box. Also, it calculates the maximum width for the first and last column. 2015-08-12 19:19:05 -07:00
Oleksandr Zhurbenko
3f7f37c862 Initialized the box for the poll shape, and left and right text columns 2015-08-12 19:11:00 -07:00
Oleksandr Zhurbenko
9a016011ad Initialized and filled a 2D array with all the text objects I need to draw later 2015-08-12 19:07:15 -07:00
Oleksandr Zhurbenko
cc8a2ffee5 Cleanup 2015-08-11 19:00:55 -07:00
Oleksandr Zhurbenko
585af9b974 WhiteboardPollModel class initial commit 2015-08-10 17:31:52 -07:00
Oleksandr Zhurbenko
8402efc07e Added WhiteboardShapeModel's calls 2015-08-07 18:24:37 -07:00
Richard Alam
839e7ebf58 Merge branch 'svg-conversion' of https://github.com/gthacoder/bigbluebutton into gthacoder-svg-conversion 2015-08-07 18:28:16 +00:00
Richard Alam
839473395a Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merge-leonardo-api-changes 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
 2015-08-07 15:06:40 +00:00
Oleksandr Zhurbenko
d3b59103b4 Added Poll properties to the object 2015-08-06 16:32:41 -07:00
Maxim Khlobystov
5c0cb9c3d8 Merge branch 'meteor-client-pdf-conversion' of https://github.com/gthacoder/bigbluebutton into development 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/PesentationMessageToJsonConverter.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationModel.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/red5/PresentationClientMessageSender.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/redis/PresentationEventRedisRecorder.scala
 2015-08-06 16:21:31 -04:00
Oleksandr Zhurbenko
400a0db0f4 Parsing the message and sending shape information further 2015-08-05 16:54:44 -07:00
Oleksandr Zhurbenko
3afad5db50 Fixed an issue with the 'get_users_reply' message and sorting 2015-08-04 14:12:28 -07:00
Oleksandr Zhurbenko
d3e318f6f2 Fixed a mistake with phone_user's priorities 2015-08-04 09:51:02 -07:00
Oleksandr Zhurbenko
2ebf44a3b7 Added Sorting to the userlist 2015-08-03 17:23:57 -07:00
Oleksandr Zhurbenko
0b3606350f Handling for 'poll_show_result_message' 2015-08-02 15:57:54 -07:00
Maxim Khlobystov
63588ede10 Made sure the animation of the userlist's items still works after a pan gesture ends. 2015-08-02 14:11:24 -04:00
Maxim Khlobystov
16658f1c0f Fixed the issue with wrong file references in Chrome/Firefox CSS inspector. 2015-08-01 15:28:19 -04:00
Oleksandr Zhurbenko
84840f1830 Added handling for 'user_voted_poll_message' 2015-08-01 12:27:01 -07:00
Oleksandr Zhurbenko
147e1942fb Removing the userIds of the users who already voted from the collection, added null pointer validation 2015-07-31 11:07:27 -07:00
Oleksandr Zhurbenko
bae52f4f4b Added the ability to send responses to polls back to the server 2015-07-30 17:08:12 -07:00