Commit Graph

533 Commits

Author SHA1 Message Date
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
Maxim Khlobystov
eb6062a0e7 Minor style fix for the hamburger buttons: eliminated the light-colored bottom border on a dark background. 2015-07-30 16:48:36 -04:00
Maxim Khlobystov
e0417ff4c8 Added a tooltip to the hamburger button that toggles the right-hand menu. 2015-07-30 16:34:44 -04:00
Maxim Khlobystov
52425394b7 Fixed the issue with the navbar's audio icon disappearing on hovering and made all the navbar buttons behave consistently on hovering or focusing. 2015-07-30 16:26:44 -04:00
Oleksandr Zhurbenko
3bbca33fca Keeping colors consistent 2015-07-29 15:37:41 -07:00
Maxim Khlobystov
5b16f3b0c1 Fixed the positioning of the navbar's audio button and made the presentation title's width flexible. 2015-07-29 16:19:59 -04:00
Oleksandr Zhurbenko
69c4405cdb Added the UI for sending back answers 2015-07-29 11:09:37 -07:00
Oleksandr Zhurbenko
aee51542a3 A polling element appears when the poll is published for a current user 2015-07-28 13:25:04 -07:00
Oleksandr Zhurbenko
b07e49b6e2 When there is a poll waiting for a current user, a whiteboard shrinks 2015-07-28 13:21:56 -07:00
Oleksandr Zhurbenko
83ec5b8892 Added Polling related functions to the bbb_api_brigde 2015-07-28 13:14:03 -07:00
Richard Alam
2aaf36a0df Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into development 2015-07-28 18:52:07 +00:00
Maxim Khlobystov
9a7e52274e Made the vertical centering of the navbar title work in Firefox. 2015-07-28 14:15:43 -04:00
Oleksandr Zhurbenko
a813298e56 Small corrections 2015-07-27 16:35:27 -07:00
Oleksandr Zhurbenko
10be3d03e0 Added permissions for viewers and a presenter. Viewers can't retreive the total number of votes. Also, viewers can't retreive any data if they have voted already 2015-07-27 15:55:29 -07:00
Maxim Khlobystov
37dcd5f652 Made sure the screen is never darkened when both menus are closed on a mobile device. 2015-07-27 17:28:00 -04:00
Maxim Khlobystov
acc1c3183f Cleaning up (minimized session calls). 2015-07-27 17:21:25 -04:00
Maxim Khlobystov
fd000912d8 Set the right-hand menu to open/close during a pan gesture. 2015-07-27 16:14:29 -04:00
Oleksandr Zhurbenko
4288fd19b8 Added handling for 'poll_stopped_message' 2015-07-27 11:23:29 -07:00
Maxim Khlobystov
c89828c898 Allowed users to click the left hamburger button or apply a pan gesture in any combination. 2015-07-27 11:54:46 -04:00
Maxim Khlobystov
5675f5bfc0 Added animations to the opacity of the opened menu's background + improved synchronization between opening left-hand menu manually and triggering it with a button. 2015-07-26 21:51:18 -04:00
Oleksandr Zhurbenko
8a45acef92 Added a meetingId and an initial number of votes to the Polls collection 2015-07-26 15:12:08 -07:00
Maxim Khlobystov
4ea901b5dd Made the click event work faster on mobile devices. 2015-07-26 16:03:14 -04:00
Oleksandr Zhurbenko
d48734044a Keeping only the array of id's in the poll info, without any unnecessary parent elements 2015-07-25 20:46:32 -07:00
Maxim Khlobystov
4c38ba1169 Limited the left-hand menu movements to the specific range (fully closed to fully opened) + let the pan gesture work only when it starts very close to the left edge of the screen. 2015-07-25 22:28:01 -04:00
Oleksandr Zhurbenko
48e2bfbc53 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui
Conflicts:
	bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee
2015-07-25 19:08:15 -07:00
Oleksandr Zhurbenko
4a36514338 Improved the way we store a poll object into the collection and added the list of current users there 2015-07-24 16:09:27 -07:00
Maxim Khlobystov
4fbdbefb6c Added the ability to open/close the left-hand menu with a pan gesture on mobile devices. 2015-07-24 18:20:00 -04:00
Oleksandr Zhurbenko
27ca4bacea Made the RegExp recognize URLs in the lines which contains text 2015-07-24 12:11:21 -07:00
Richard Alam
9b9d291117 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into development 2015-07-24 14:27:20 +00:00
Oleksandr Zhurbenko
12b34cc8fb Applied a new URL regex 2015-07-23 18:07:26 -07:00
Maxim Khlobystov
b44385d866 Minor UI fixes: disabled the blue border highlight on focused hamburder button + centered the navbar title vertically. 2015-07-23 08:14:41 -04:00
Oleksandr Zhurbenko
80ff67b6f2 First prototype of the functions for polls 2015-07-22 20:31:08 -07:00
Maxim Khlobystov
b7b88dfa8b Prevented the whiteboard-chat border from harsh shifting due to the whiteboard's minimum width. 2015-07-22 18:32:10 -04:00
Maxim Khlobystov
eaa8fda2c0 Set the client to monitor the content of the textarea and adjust its height while resizing the userlist/whiteboard/chat horizontally. 2015-07-22 17:25:46 -04:00
Maxim Khlobystov
7c02dc4f81 Allowed users to change horizontal proportion between the whiteboard and chat. 2015-07-22 17:15:20 -04:00
Maxim Khlobystov
c0af831e77 Made the userlist menu horizontally resizable in landscape mode. 2015-07-22 16:34:15 -04:00
Oleksandr Zhurbenko
fbdc50281c Created a new collection named Polls, able to catch a message and save it there 2015-07-21 16:55:42 -07:00
Maxim Khlobystov
a398426917 Made the automatic resizing of the chat input area work after opening/closing a private chat (template containing the textarea is rerendered every time, so the event handler needs to be reapplied). 2015-07-21 17:47:05 -04:00
Maxim Khlobystov
0a386ce67e Finished up the work on automatically resizing the chat input area based on its content. 2015-07-21 16:59:25 -04:00
Oleksandr Zhurbenko
922283ce2e The prototype of the viewer's pooling UI 2015-07-20 18:23:42 -07:00
Maxim Khlobystov
552b86e9bc Beginning work on making the manual and automatic methods of the message box resizing work together properly. 2015-07-20 18:23:51 -04:00
Maxim Khlobystov
63d51bc437 Made the chat input box resizable vertically. 2015-07-19 20:34:07 -04:00
Oleksandr Zhurbenko
d79de8f50b Added Diego Perini's URL validation RegEx 2015-07-19 17:15:36 -07:00
Maxim Khlobystov
148d533c38 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-client-resizable-elements 2015-07-19 15:25:59 -04:00
Oleksandr Zhurbenko
da4ea8d38b Cleanup 2015-07-18 18:33:02 -07:00
Oleksandr Zhurbenko
760ceef08b Switched notifications to counters, added the styling for notifications for desktop views 2015-07-17 14:50:49 -07:00
Maxim Khlobystov
f063e0bf92 Tied the height of message input to its content. 2015-07-16 19:01:54 -04:00
Oleksandr Zhurbenko
291f0d8847 Replaced icons to the status column, removed outline from switching slide buttons, increased space for usernames 2015-07-16 14:09:46 -07:00
Oleksandr Zhurbenko
1983374e3a Styling for the userlist, also centered meeting name in desktop-portrait view 2015-07-15 14:25:25 -07:00
Maxim Khlobystov
68529c8c0f Added changes to HTML5 client to handle SVG URI field. 2015-07-15 17:17:19 -04:00
Oleksandr Zhurbenko
98fb3a66ed Changed styling for the raise hand, sendMessage, settings and signOut buttons, removed the whiteboard's top borders, centered and styled the meeting title 2015-07-15 12:02:52 -07:00
Oleksandr Zhurbenko
25ec59d9b4 added truncating to the opponents' username in the private chat, fixed a bug with the width of the private chat and removed outline from the Public button 2015-07-14 18:38:38 -07:00
Oleksandr Zhurbenko
43e50c3641 Added Status column to the userlist, fixed a bug with the userlist's size, removed unnecessary classes, changed the styling for the userlist and navbar 2015-07-14 15:42:24 -07:00
Oleksandr Zhurbenko
358dc5d16b Added status column on the left of the username 2015-07-13 16:43:30 -07:00
Oleksandr Zhurbenko
b4cd2dac6d Implemented counters for unread chat messages 2015-07-10 13:42:10 -07:00
Oleksandr Zhurbenko
b58fad25b9 Keep notifications and private chat tabs open when users refresh the page 2015-07-09 14:59:57 -07:00
Oleksandr Zhurbenko
393ec05dcf Added a way of how we can gistinguish page refreshing from relogin 2015-07-09 14:55:28 -07:00
Oleksandr Zhurbenko
76d27fa84b Refactoring 2015-07-08 10:09:29 -07:00
Oleksandr Zhurbenko
286e052074 Got rid of exceptions which appeared when you login for the first time 2015-07-07 09:25:29 -07:00
Oleksandr Zhurbenko
fc2d0c1275 Styling for unread chat notification in a mobile view 2015-07-06 14:01:58 -07:00
Oleksandr Zhurbenko
bf257c3926 Removed a close user list button from the userlist 2015-07-06 09:50:36 -07:00
Oleksandr Zhurbenko
f353b603be Fixed a hamburger notification for desktop and fixed :hover for the user list 2015-07-06 09:46:20 -07:00
Oleksandr Zhurbenko
7e4b134298 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui
Conflicts:
	bigbluebutton-html5/app/client/globals.coffee
	bigbluebutton-html5/app/client/main.html
	bigbluebutton-html5/app/client/views/sharedTemplates.html
2015-07-03 12:48:05 -07:00
Oleksandr Zhurbenko
77a201099c Added styling for the hamburger and Public buttons and changed Public button's event which handles read public messages 2015-07-03 11:06:40 -07:00
Oleksandr Zhurbenko
b0f0099a6a Changed usernames' cursor 2015-07-03 10:57:23 -07:00
Maxim Khlobystov
ddad7b1589 Corrected the size of a hamburger icon for landscape and desktop portrait modes. 2015-07-02 18:46:06 -04:00
Maxim Khlobystov
50a2b794fd Unified the button structure and added a tooltip to the hamburger button. 2015-07-02 18:20:31 -04:00
Oleksandr Zhurbenko
02825e3fbc Added notifications for the hamburger and Public buttons 2015-07-02 13:18:05 -07:00
Oleksandr Zhurbenko
28d31f9b8c Fixed a bug with notifications' appearing on relogin 2015-06-29 09:54:02 -07:00
Oleksandr Zhurbenko
33b2c8becd Fixed a bug with an open private chat on relogin 2015-06-29 09:01:20 -07:00
Oleksandr Zhurbenko
b970298f05 Added styling and icons as notifications for the user list 2015-06-26 15:58:23 -07:00
Oleksandr Zhurbenko
0f6f553e3e Added notifications for unread private messages 2015-06-24 17:21:50 -07:00
Richard Alam
2e65d9bcec Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into implement-polling-v3 2015-06-19 14:30:49 +00:00
Maxim Khlobystov
e765987170 Fixed the issue with the screen not darkening after opening one of the menus while the other one is open. 2015-06-18 17:05:18 -04:00
Maxim Khlobystov
21ff2bdffb Removed unused sliding menu code and restructured some event handlers. 2015-06-18 16:33:48 -04:00
Maxim Khlobystov
ed83915fc6 Made sure the page is never darkened in landscape orientation. 2015-06-18 16:22:16 -04:00
Maxim Khlobystov
b5530a6f0e Made the page darker when side menu is open. 2015-06-18 16:14:54 -04:00
Maxim Khlobystov
2a0c002ebc Added animations to the sliding menu. 2015-06-18 12:09:17 -07:00
Anton Georgiev
89086d4143 adapt html5 client to message changes 2015-06-16 15:58:45 +00:00
Oleksandr Zhurbenko
1743aa47d6 Added focus to the chat input area after opening a private chat tab 2015-06-15 13:19:55 -07:00
Oleksandr Zhurbenko
76b6720497 Fixed a bug with detecting a desktop landskape view and added a way of how to detect desktop portrait 2015-06-12 14:25:22 -07:00
Oleksandr Zhurbenko
b61c4d0cd8 Clicking your own username now leads to a public chat 2015-06-12 14:17:13 -07:00
Maxim Khlobystov
8226f9212b Correctly positioned the whiteboard buttons and made the Raise/Lower Hand button hidden in fullscreen mode. 2015-06-10 12:52:25 -07:00
Maxim Khlobystov
edbfd8f161 Removed some old unused code. 2015-06-10 12:19:50 -07:00
Maxim Khlobystov
7a51be1be8 Removed the blue outline from the whiteboard buttons that are selected. 2015-06-10 12:15:31 -07:00
Maxim Khlobystov
af25c8f448 Changed the style of the Raise/Lower Hand and Enter/Exit Full Screen buttons to make them obviously clickable. 2015-06-10 12:10:06 -07:00
Maxim Khlobystov
1a102ee864 Added the ability to raise/lower hand. 2015-06-10 11:45:11 -07:00
Richard Alam
d14c10bf42 Merge pull request #654 from OZhurbenko/meteor-ui
UI Changes for a desktop view
2015-06-10 11:54:16 -04:00
Oleksandr Zhurbenko
fd71fdfa5a Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui 2015-06-10 08:52:26 -07:00
Oleksandr Zhurbenko
25e164a2b6 Cleanup 2015-06-09 17:02:27 -07:00
Oleksandr Zhurbenko
05b8ba3499 Changing UI according to Tyler's specs 2015-06-09 16:55:18 -07:00
Chad Pilkey
101e44c8fe Merge pull request #653 from gthacoder/meteor-client-whiteboard-slowdown
HTML5 client: merging the whiteboard optimizations.
2015-06-09 15:37:13 -04:00
Oleksandr Zhurbenko
e44617b581 Adjusting Tyler's corrections 2015-06-08 16:29:49 -07:00
Maxim Khlobystov
8f89bfd427 Suppressed the log messages from timesync (clock discrepancy and re-sync attempts). 2015-06-08 12:16:57 -07:00
Maxim Khlobystov
1eb6932317 Merge branch 'fix-clean-message-slowdown' of https://github.com/lfzawacki/bigbluebutton into meteor-client 2015-06-08 10:41:36 -07:00
Maxim Khlobystov
73838c7e78 Allowed users to mute/unmute themselves by clicking a userlist icon. 2015-06-04 15:25:07 -07:00
Maxim Khlobystov
d0b76d9c31 Made sure mute/unmute icon changes when hovered. 2015-06-04 14:31:59 -07:00
Maxim Khlobystov
2f3a777944 Eliminated some code duplication. 2015-06-03 16:13:18 -07:00
Maxim Khlobystov
fd018ca29e Changed the icon of Exit Fullscreen button. 2015-06-03 16:03:02 -07:00
Maxim Khlobystov
b47bc010ad Fixed the size of Exit Fullscreen icon in Firefox. 2015-06-03 15:54:39 -07:00
Maxim Khlobystov
1a532f9dd3 Cleaning up. 2015-06-03 15:34:40 -07:00
Maxim Khlobystov
f03fa56734 Adjusted the size of Exit Fullscreen button to the mobile screen. 2015-06-03 15:27:22 -07:00
Maxim Khlobystov
80183dda34 Vertically centered the whiteboard slide in full screen mode. 2015-06-03 14:54:52 -07:00
Maxim Khlobystov
4b9c76dcd9 Added the ability to exit the full screen mode by clicking a button. 2015-06-03 14:49:26 -07:00
Maxim Khlobystov
b5e0f6b856 Limited the full screen button to mobile devices. 2015-06-03 14:26:52 -07:00
Maxim Khlobystov
f6fc8d13f7 Corrected the size of buttons on mobile devices. 2015-06-03 13:50:39 -07:00
Maxim Khlobystov
f29c63e25b Replaced the button's inline CSS with the proper LESS declaration. 2015-06-03 11:38:56 -07:00
Maxim Khlobystov
bb86817a44 Added the full screen button. 2015-06-03 11:20:59 -07:00
Maxim Khlobystov
8ec8ad3072 Restored the ability to request the full-screen whiteboard mode. 2015-06-02 14:44:06 -07:00
perroned
f357942eed Shrink notification area to contents 2015-06-02 07:02:54 -07:00
Oleksandr Zhurbenko
8cf7328373 Merge branch 'meteor-ui' of https://github.com/OZhurbenko/bigbluebutton into meteor-ui 2015-05-28 14:28:58 -07:00
Oleksandr Zhurbenko
fe9cc6e31f Fixed private tab's height 2015-05-28 14:19:51 -07:00
Maxim Khlobystov
a53b88f5e7 Made the whiteboard properly resize when the slide navigation controllers appear/disapper. 2015-05-28 10:06:57 -07:00
Maxim Khlobystov
cb140cce99 Repaired the styling of slide navigation buttons. 2015-05-27 10:48:25 -07:00
Maxim Khlobystov
1fa46ab6dd Made the whiteboard's height flexible depending on the presence of the slide navigation controllers. 2015-05-27 10:29:59 -07:00
Maxim Khlobystov
71fe855fa7 Prevented the slide from going beyond the whiteboard's top border. 2015-05-27 09:58:06 -07:00
Maxim Khlobystov
0b7749ec3c Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-client-right-hand-menu
Conflicts:
	bigbluebutton-html5/app/client/stylesheets/style.less
2015-05-26 14:15:12 -07:00
Maxim Khlobystov
74b85b56fc Made the Toggle Chat button work. 2015-05-26 14:09:54 -07:00
Chad Pilkey
3ce0fcc0e5 Merge pull request #644 from OZhurbenko/meteor-ui
Private chat
2015-05-26 17:09:39 -04:00
Maxim Khlobystov
d9f8b95680 Corrected the size of the Logout dialog in portrait mode. 2015-05-26 13:38:00 -07:00
Maxim Khlobystov
db15a173bb Made the Logout dialog work in portrait orientation. 2015-05-26 13:27:41 -07:00
Maxim Khlobystov
60ad8ab631 Adjusted the size of the Settings modal window in mobile view. 2015-05-26 13:21:56 -07:00
Maxim Khlobystov
531ada09df Moved the inline CSS related to the Settings modal window to the LESS file. 2015-05-26 12:45:48 -07:00
Maxim Khlobystov
06496b4835 Made the Settings button functional in portrait orientation. 2015-05-26 11:05:19 -07:00
Maxim Khlobystov
934edd5a75 Made sure the presentation progress label never contains an undefined slide number, thus becoming too long and making the scrollbar appear. 2015-05-25 15:30:57 -07:00
Maxim Khlobystov
6ca9bb1465 Got back the label indicating the current slide's number. 2015-05-25 15:27:06 -07:00
Maxim Khlobystov
b8e32bf316 Added the presenter's slide navigation to the new UI. 2015-05-25 14:36:43 -07:00
Oleksandr Zhurbenko
933ffe102f Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui
Conflicts:
	bigbluebutton-html5/app/client/views/chat/chat_bar.coffee
2015-05-24 20:32:13 -07:00
Oleksandr Zhurbenko
42515fd477 Private chat styling 2015-05-24 20:24:21 -07:00
Oleksandr Zhurbenko
0571237619 Search for a username to display on the private chat tab 2015-05-24 20:19:57 -07:00
Maxim Khlobystov
1487a0e28c Removed the userlist's X button from the portrait view. 2015-05-21 09:37:21 -07:00
Maxim Khlobystov
ef88685536 Changed the colour of a menu toggle button when its menu is opened. 2015-05-21 09:33:27 -07:00