Commit Graph

1748 Commits

Author SHA1 Message Date
prlanzarin
eb9d7fb7b4 Updated bbb-webrtc-sfu dependencies 2017-11-28 12:25:27 +00:00
prlanzarin
fdca5356c3 Finished making bbb-webrtc-sfu answer in single path
Started standardizing video and screenshare RPC messages

Video now uses redis message routing
2017-11-24 18:59:40 +00:00
prlanzarin
ce1b0ca85e Added voiceBridge parameter to akka-bbb-transcode
Also forcing h264-only video
2017-11-21 14:11:59 +00:00
prlanzarin
dcab1d8e07 Finished porting screensharing process to core media lib
Also added correct stop logic to the video process
2017-11-17 18:57:39 +00:00
prlanzarin
f43b77c19f Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu
Conflicts:
	bigbluebutton-html5/imports/startup/client/base.jsx
	bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
	bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
	bigbluebutton-html5/imports/ui/components/app/container.jsx
	bigbluebutton-html5/imports/ui/components/screenshare/service.js
	bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
	bigbluebutton-html5/imports/ui/components/video-dock/container.jsx
	bigbluebutton-html5/private/locales/en.json bigbluebutton-html5/server/main.js
2017-11-11 03:41:37 +00:00
prlanzarin
4fd4cc1eb1 Renaming node-bbb-apps to bbb-webrtc-sfu 2017-11-11 01:44:50 +00:00
prlanzarin
f048d30ad6 Cleaning up deprecated kurento video and screensharing apps 2017-11-11 01:40:11 +00:00
prlanzarin
4dc8085648 Making the screenshare process have its own websocket
This is temporary while we fix the server-side message routing
2017-11-11 01:39:04 +00:00
prlanzarin
1170a82906 Temporary fix for ICE exchange race condition 2017-11-11 01:35:01 +00:00
prlanzarin
4d5a671a19 Finished porting the video server app to use base media library 2017-11-10 21:05:51 +00:00
prlanzarin
014bf59d09 Merge remote-tracking branch 'origin/html5-video-screenshare' into node-bbb-apps-packaging 2017-11-06 15:47:53 +00:00
prlanzarin
c04e3da068 Added kurento screensharing viewer stop logic 2017-11-06 14:23:48 +00:00
prlanzarin
9175400c2e Tryin to prevent overlapping video instances from the same connection 2017-11-06 14:22:36 +00:00
prlanzarin
26303748c8 Merge remote-tracking branch 'origin/html5-video-screenshare' into node-bbb-apps-packaging 2017-10-16 13:50:22 +00:00
prlanzarin
340fac36cb Added bbb-webrtc-sfu WS session identification 2017-10-16 13:37:13 +00:00
prlanzarin
07f50252bb Properly close webrtc peers when sharing webcam 2017-10-13 21:13:41 +00:00
prlanzarin
eec9c8c3b1 Removed postinstall from node app package.json 2017-10-13 20:06:16 +00:00
prlanzarin
b49362d8d5 Some screensharing pubsub rework
Added package.json
2017-10-13 19:51:50 +00:00
prlanzarin
6b24bb0080 Configurable client port for node-bbb-apps 2017-10-13 15:00:16 +00:00
prlanzarin
5ce924f892 node-bbb-apps config example and keys dir removal 2017-10-13 14:50:41 +00:00
Augusto Bennemann
ec941bacab Improve video reconnection 2017-10-13 13:50:48 +00:00
prlanzarin
fa1043d432 First draft of node-bbb-apps module 2017-10-13 13:50:17 +00:00
prlanzarin
67da01e81c Merge remote-tracking branch 'gutobenn/html5-kurento-screenshare-presenter' into html5-video-screenshare 2017-10-10 17:10:03 +00:00
Augusto Bennemann
31f2e1cac7 HTML5 ScreenShare Presenter 2017-09-12 17:47:06 -03:00
Augusto Bennemann
1aa5cc5235 HTML5 ScreenShare Viewer
HTML5 ScreenShare Viewer
2017-09-11 13:40:56 -03:00
Augusto Bennemann
5ec827e17d HTML5 video with kurento (port) 2017-09-01 12:26:57 -03:00
prlanzarin
c3ba4eaac4 Fixed kurento-screenshare session ending 2017-07-27 13:17:55 +00:00
prlanzarin
ade78eaff0 Changed kurento-screenshare session index to voiceBridge 2017-07-26 16:59:05 +00:00
prlanzarin
54faf33001 Modified transcode responses to 2x format in kurento-screenshare 2017-07-25 20:13:41 +00:00
Pedro Beschorner Marin
cd34d2c139 Merge remote-tracking branch 'bbb-2x-mconf' into transcode-new-messages
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
2017-07-25 14:47:21 +00:00
Pedro Beschorner Marin
d50f65fce1 Moved akka-transcode messages to 2.0 format 2017-07-25 13:23:20 +00:00
prlanzarin
8c69de35cd Changed kurento screenshare app RTMP broadcast messages to new format 2017-07-19 14:17:01 +00:00
prlanzarin
758bb0142b Added 2x Deskshare RTMP Broadcast messages to kurento-screenshare server
Old 1.1 messages are still available there
2017-07-17 19:36:49 +00:00
prlanzarin
b50cf7b23a Added kurento-screenshare ConnetionManager and media-controller modules 2017-07-10 20:56:00 +00:00
prlanzarin
02a6373c96 Refactored kurento-screenshare server to decouple it from kurento
Theres still some work to do on that regarding ICE handling
2017-07-10 20:51:06 +00:00
prlanzarin
f26a275b05 Updated kurento lib in BigBlueButton.html
Generic addresses for Kurento on the screenshare server
2017-07-05 17:58:19 +00:00
prlanzarin
114be67f29 Added AVPF profile to WebRTC screenshare SDP
Some server-side cleanup
2017-07-03 16:54:00 +00:00
prlanzarin
5a77b1b69d Added first prototype of Kurento WebRTC screensharing server module 2017-06-13 15:53:51 +00:00
mikhailnov
675b4bbaeb old firefox CLI call not working on newer versions, updated to a newer one 2017-03-08 22:15:23 +03:00
Ghazi Triki
875e0a59b7 Rename README to README.md to force its parcing 2016-03-10 22:03:17 +01:00
Fred Dixon
62d46424a5 Remove old php library (new: https://github.com/bigbluebutton/bigbluebutton-api-php) 2016-03-03 08:18:28 -05:00
Felipe Cecagno
6e516c6df8 promote bbb-webhooks to a well-supported module (removed from labs) 2015-05-06 00:11:02 -03:00
Anton Georgiev
d830e3358d move the HTML5 client code outside of labs 2015-03-05 17:55:23 +00:00
Oleksandr Zhurbenko
99f4c51ce7 Rolling back server's IP 2015-03-04 16:47:06 -08:00
Oleksandr Zhurbenko
a2e96394ee Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui
Conflicts:
	labs/meteor-client/app/client/globals.coffee
2015-03-04 16:42:22 -08:00
Oleksandr Zhurbenko
8aa86c8d79 Cleaning 2015-03-04 16:30:50 -08:00
Oleksandr Zhurbenko
94ada286cd Fixing footer 2015-03-04 14:28:30 -08:00
Oleksandr Zhurbenko
deb0f05235 Added default settings to the config file 2015-03-04 13:45:01 -08:00
Oleksandr Zhurbenko
a48b24c8af Set up different default font sizes for mobile/desktop 2015-03-04 13:33:37 -08:00
Maxim Khlobystov
e523ab6b3d Prevented user from closing all of the userlist/whiteboard/chat, made it reopen everything on that attempt. 2015-03-04 12:36:10 -05:00
Maxim Khlobystov
d542640768 Made the userlist toggled off by default when user enters the meeting using mobile device in landscape orientation. 2015-03-04 12:35:52 -05:00
Oleksandr Zhurbenko
85199503a7 Changed sizes' dependencies so now they depend on the width of the device 2015-03-04 09:27:35 -08:00
Oleksandr Zhurbenko
100ea561f1 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui
Conflicts:
	labs/meteor-client/app/lib/router.coffee
2015-03-03 16:03:24 -08:00
Oleksandr Zhurbenko
acdfaeed22 Improved Chat 2015-03-03 15:38:19 -08:00
Fred Dixon
630209330e Merge pull request #538 from gthacoder/meteor-client-landscape
Updates for HTML5 client's landscape view.
2015-03-03 16:27:07 -05:00
Oleksandr Zhurbenko
e18369936f Fixed Chat tab sizes 2015-03-03 13:26:50 -08:00
Anton Georgiev
b1b8eca6e6 rearranged the permissions so that even unvalidated users should be allowed to logoutSelf as long as authenticated
Conflicts:
	labs/meteor-client/app/lib/router.coffee
2015-03-03 19:41:30 +00:00
Maxim Khlobystov
2809396ab2 Made the userlist and chat scrollable when needed. 2015-03-03 14:40:07 -05:00
Maxim Khlobystov
0371752a84 Made sure the footer never covers the rest of the page in landscape orientation. 2015-03-03 14:39:40 -05:00
Maxim Khlobystov
59e1d72d81 Made sure the sliding menu buttons only exist on mobile devices in portrait orientation. 2015-03-03 14:39:22 -05:00
Maxim Khlobystov
10ff076629 Updated the Handlebars handler for the portrait mobile media query. 2015-03-03 14:39:05 -05:00
Oleksandr Zhurbenko
a785b6ad54 Some cleaning, textbox fixed in a mobile view, changed buttons and fonts in a mobile view 2015-03-03 08:36:15 -08:00
Anton Georgiev
5b6573bb0c root_url can be localhost based 2015-03-03 00:42:11 +00:00
Anton Georgiev
38c10aa627 cleaning up 2015-03-03 00:06:14 +00:00
Anton Georgiev
c9d48fe2f0 reworked router so that the params are hidden from url on connect 2015-03-02 23:07:10 +00:00
Oleksandr Zhurbenko
a2d78a59cb Changed fonts in Chat tab 2015-03-02 13:25:44 -08:00
Anton Georgiev
84530e7958 clear ip 2015-03-02 21:14:01 +00:00
Oleksandr Zhurbenko
70eb511c0e Cleaning 2015-03-02 12:30:35 -08:00
Anton Georgiev
ff91a3aea3 Merge branch 'nginx-stuff' of github.com:antobinary/bigbluebutton into nginx-stuff 2015-03-02 17:15:11 +00:00
Oleksandr Zhurbenko
9d7805f924 Fixed partisipants' names' font size 2015-03-02 08:49:49 -08:00
Anton Georgiev
146e6552e5 nginx config, avoid :3000 2015-03-02 16:46:14 +00:00
Anton Georgiev
ea590bbdb9 add bbblogger lib 2015-03-02 16:30:46 +00:00
Oleksandr Zhurbenko
9a187a3bb4 merging conflicts 2015-03-02 08:16:56 -08:00
Oleksandr Zhurbenko
9c51fac7a5 Improving chat 2015-03-02 08:08:08 -08:00
Oleksandr Zhurbenko
885e24933f Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into testing-branch 2015-03-02 07:12:11 -08:00
Anton Georgiev
d0bc2200cb Merge branch 'master' into meteor-failed-signin-stays-out 2015-03-02 14:56:25 +00:00
Anton Georgiev
88cd8bb0b5 ionicons switch to the official package 2015-02-27 16:36:29 +00:00
Anton Georgiev
cf61a49c87 meteor 1.0.3.2 2015-02-27 16:36:18 +00:00
Anton Georgiev
9ee08032d2 auto-focus chat cursor only for landscape orientation. Reduce logging 2015-02-27 16:36:00 +00:00
Anton Georgiev
7553b5292b ionicons fix. store a copy in the specified directory 2015-02-27 16:35:35 +00:00
Anton Georgiev
401b76dda0 rearrange main.html 2015-02-26 19:51:59 +00:00
Anton Georgiev
0e848bba8a bolded username leads to indented chat messages FF 2015-02-26 19:46:27 +00:00
Anton Georgiev
099c6e4ee4 The chat input box is no longer auto focused on login
The reasoning is:
-when the client loads on a touch-screen device (mobile) the keyboard should not be displayed. Or it impedes the view.
-prevent accidental chat messages
2015-02-26 19:39:09 +00:00
Anton Georgiev
01ea96002a footer: visible only on the bottom, resize 2015-02-26 19:38:53 +00:00
Anton Georgiev
b9dc4aab7f add a vertical limit for the userslist
set a vertical limit for users after which the scrollbar appears
2015-02-26 19:38:40 +00:00
perroned
59d5c1025f Fixed the close tab button for different resolutions and oreintations 2015-02-26 19:02:49 +00:00
perroned
480a6288b5 Address border issue on mobile 2015-02-26 19:02:26 +00:00
Maxim Khlobystov
64ee1b56bf Made the vertical whiteboard centering compatible with Internet Explorer and more reliable. 2015-02-26 17:25:42 +00:00
Anton Georgiev
6cededf848 fit to width slide in portrait. substitute jquery resizing for whiteboard 2015-02-26 17:24:47 +00:00
Anton Georgiev
b61932aacf limit the color to mobile only. hide footer when typing 2015-02-26 17:14:21 +00:00
Anton Georgiev
a7d181f862 first steps of making the elements more readable on mobile 2015-02-25 02:39:30 +00:00
Anton Georgiev
4bf12fd721 footer: visible only on the bottom, resize 2015-02-25 01:28:50 +00:00
Anton Georgiev
2aeb982706 add a vertical limit for the userslist
set a vertical limit for users after which the scrollbar appears
2015-02-24 23:09:26 +00:00
Anton Georgiev
89e97577da fit to width slide in portrait. substitute jquery resizing for whiteboard 2015-02-24 21:29:32 +00:00
Maxim Khlobystov
bcbfd60228 Made the vertical whiteboard centering compatible with Internet Explorer and more reliable. 2015-02-24 16:33:05 +00:00
Anton Georgiev
082d524cac The chat input box is no longer auto focused on login
The reasoning is:
-when the client loads on a touch-screen device (mobile) the keyboard should not be displayed. Or it impedes the view.
-prevent accidental chat messages
2015-02-23 23:29:12 +00:00
Anton Georgiev
1c981ec11b css resizeWindows. footer no longer overlaps. height control 2015-02-23 23:04:40 +00:00
Maxim Khlobystov
828114f03f Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-client-restructured-css 2015-02-23 14:00:42 -08:00
Maxim Khlobystov
9ce41b3444 Finished up the restructuring of LESS. 2015-02-21 15:50:47 -08:00
Maxim Khlobystov
3a2f44a9f5 Moved all the chat-related LESS to one file and structured it using media queries inside classes instead of the other way around. 2015-02-20 18:07:50 -08:00
Maxim Khlobystov
428ab03cc4 Introduced the media query aliases. 2015-02-19 19:28:55 -08:00
Anton Georgiev
8550ed926c adjust the logOutUrl 2015-02-17 23:33:13 +00:00
Anton Georgiev
822b6268e3 removing demos. Substituted with demoHTML5.jsp 2015-02-17 23:25:30 +00:00
Oleksandr Zhurbenko
61ea73c2a7 Improved Chat tab 2015-02-17 15:23:27 -08:00
Oleksandr Zhurbenko
3f55033c67 Improved participants tab in a mobile view 2015-02-17 15:02:49 -08:00
Anton Georgiev
e95b63f444 Merge branch 'meteor-client-responsive-ui' of github.com:gthacoder/bigbluebutton into meteor-portrait-improvements 2015-02-17 16:55:04 +00:00
Oleksandr Zhurbenko
1adb366cf3 Merge branch 'meteor-client-responsive-ui' of https://github.com/gthacoder/bigbluebutton into whiteboard-modifications 2015-02-16 17:59:14 -08:00
Maxim Khlobystov
7a068c5c8e Corrected the proportion in which the userlist, whiteboard and chat grow or shrink on horizontal scaling. 2015-02-16 17:49:01 -08:00
Maxim Khlobystov
065cf1e701 Fixed the horizontal scaling in Firefox. 2015-02-16 17:33:26 -08:00
Maxim Khlobystov
7ff7c4a9be Made the userlist width flexible. 2015-02-16 17:16:57 -08:00
Oleksandr Zhurbenko
16973ccd71 Merge branch 'meteor-portrait-improvements' of https://github.com/antobinary/bigbluebutton into whiteboard-modifications 2015-02-16 17:13:37 -08:00
Anton Georgiev
f78dd1e0f8 rearranged the permissions so that even unvalidated users should be allowed to logoutSelf as long as authenticated 2015-02-14 00:14:49 +00:00
Anton Georgiev
64b3929bc5 onBeforeAction requires a this.next() even if we're still waiting before rendering 2015-02-13 23:27:31 +00:00
Anton Georgiev
fc9ebef332 Merge branch 'new-branch' of github.com:perroned/bigbluebutton into meteor-portrait-improvements 2015-02-13 22:47:07 +00:00
Anton Georgiev
cb3fb5806d mini script to run without testing 2015-02-13 21:03:25 +00:00
Anton Georgiev
a4f08680b1 limit expansion of chat + users after a widow resize or orientation switch 2015-02-13 20:54:44 +00:00
Oleksandr Zhurbenko
28ed53eaa2 Merge branch 'meteor-portrait-improvements' of https://github.com/antobinary/bigbluebutton into whiteboard-modifications 2015-02-12 14:51:45 -08:00
Anton Georgiev
91cabcae8e portrait view:the chat section is now vertically restricted 2015-02-12 18:11:11 +00:00
perroned
4d1d29af34 readable text in different orientations 2015-02-12 09:29:55 -08:00
perroned
773d6b0b59 mobile userlist readability 2015-02-12 09:19:58 -08:00
Oleksandr Zhurbenko
4b300a1cf0 Merge branch 'new-branch' of https://github.com/perroned/bigbluebutton into whiteboard-modifications 2015-02-11 13:20:36 -08:00
perroned
10bd9e28fe Merge remote-tracking branch 'anton/meteor-portrait-improvements' into new-branch 2015-02-11 12:50:30 -08:00
perroned
10fe725695 Comments properly explaining line break code 2015-02-11 12:06:19 -08:00
perroned
096d2e5d93 Cleaned up newline conversions 2015-02-11 11:55:50 -08:00
perroned
2f4960e5b2 Newlines between flash and html5 2015-02-11 11:43:46 -08:00
Oleksandr Zhurbenko
dade374971 Fixed chat scaling 2015-02-10 11:01:40 -08:00
perroned
949c40b618 translate incoming and outgoing multiline messages 2015-02-10 08:29:52 -08:00
perroned
1c6abd5793 Prevent user list from getting covered in mobile 2015-02-10 07:48:02 -08:00
perroned
256fbbc1c5 Forgot a class 2015-02-10 07:24:13 -08:00
perroned
570e62143f participants list and options menu 2015-02-10 07:17:26 -08:00
Anton Georgiev
5a07dfd482 added the footer portrait specific font-size to the remaining cases 2015-02-06 23:57:57 +00:00
Anton Georgiev
1d030ac066 bigger font-size on portrait's footer. update footer params 2015-02-06 23:08:56 +00:00
Anton Georgiev
876c3cb9eb meteor 1.0.2.1->1.0.3.1 2015-02-06 23:07:01 +00:00
Anton Georgiev
192a641119 missed during merge 2015-02-06 20:50:49 +00:00
Anton Georgiev
a1d4e62d9b Merge branch 'new-branch' of https://github.com/perroned/bigbluebutton into testing-version-15
Conflicts:
	labs/meteor-client/app/client/stylesheets/portrait/chat.less
2015-02-06 20:03:11 +00:00
Anton Georgiev
e846c5f330 Merge branch 'meteor-client-responsive-ui' of https://github.com/gthacoder/bigbluebutton into testing-version-15 2015-02-06 19:52:36 +00:00
Anton Georgiev
dc12fc0eb1 Merge branch 'chat-quotes' of github.com:antobinary/bigbluebutton into testing-version-15 2015-02-06 19:48:13 +00:00
Anton Georgiev
a6eb4865dc load the main template only on successful login (before it would load for a sec no matter what) 2015-02-06 19:41:18 +00:00
Anton Georgiev
c6da51d61b add a flag for HTML5 users. add a flag for html5 users that validated successfully. Use these flags for action authorization. From now onwards we only allow users that got validate_auth_token_reply with true to proceed and enter a meeting. No restriction for the flash client users. Dummy users are now added only for html5 users when requesting validation from BBB 2015-02-06 17:21:31 +00:00
Anton Georgiev
7ff2a05a73 clear session vars before redirecting 2015-02-06 16:55:46 +00:00
Maxim Khlobystov
438c61485d Made the landing page responsive. 2015-02-05 16:44:01 -08:00
Maxim Khlobystov
b16f4e2f1a Made the padding between the slide and whiteboard border consistent on loading the portrait view and scaling. 2015-02-05 14:43:57 -08:00
Anton Georgiev
08e0ada372 Merge branch 'whiteboard-modifications' of https://github.com/OZhurbenko/bigbluebutton into chat-quotes 2015-02-05 20:07:13 +00:00
Anton Georgiev
6e39140ab3 if unauthorized user attempts to subscribe, throw an error which will cause the user to be redirected to the login page 2015-02-05 19:58:39 +00:00
Oleksandr Zhurbenko
ef9d59dfb2 Added vertical centering, added Flexbox support for all browsers, cleared a console 2015-02-04 19:30:32 -08:00
Maxim Khlobystov
52c8a471bf Merge branch 'meteor-client-nightwatch' into meteor-client-responsive-ui 2015-02-04 14:22:52 -08:00
perroned
56c13bd4c5 cleaned up 2015-02-04 13:20:41 -08:00
perroned
5bf696d998 Fixed inability to send multilined messages 2015-02-04 11:11:47 -08:00
perroned
b4bf8b561b Add timestamps to selected font size 2015-02-04 11:10:45 -08:00
perroned
366bb23c78 Don't hard code sizes in html 2015-02-04 10:16:35 -08:00
perroned
ad7224cd7f Fixing chat message size on mobile 2015-02-04 10:01:14 -08:00
Oleksandr Zhurbenko
f1129d88fb Merge branch 'meteor-client-responsive-ui' of https://github.com/gthacoder/bigbluebutton into whiteboard-modifications 2015-02-03 13:37:58 -08:00
Anton Georgiev
24b26f450e Merge branch 'meteor-client-device-orientation' of https://github.com/gthacoder/bigbluebutton into meteor-client-device-orientation 2015-02-03 18:20:53 +00:00
Maxim Khlobystov
833dcd273b Handled the soft keyboard on mobile devices. 2015-02-03 10:19:16 -08:00
perroned
66fd06c662 Merge remote-tracking branch 'maxim/meteor-client-device-orientation' into new-branch
Conflicts:
	labs/meteor-client/app/client/stylesheets/portrait/chat.less
2015-02-03 07:45:16 -08:00
Anton Georgiev
2e1ff49048 Merge branch 'meteor-client-responsive-ui' of github.com:gthacoder/bigbluebutton into chat-quotes 2015-02-03 15:35:07 +00:00
perroned
2eb1f2f9ac Easier to close chat on mobile 2015-02-03 07:30:40 -08:00
Maxim Khlobystov
bf366e7341 Started using the device orientation instead of the device width to distinguish between a narrowed desktop window and a mobile device in portrait orientation. 2015-02-02 17:19:57 -08:00
Anton Georgiev
a6f0755f27 Merge branch 'meteor-client-responsive-ui' of https://github.com/gthacoder/bigbluebutton into testing-version-14 2015-02-02 20:06:08 +00:00
Maxim Khlobystov
b9f6dbd646 Added some padding space between the slide and the whiteboard bottom border. 2015-02-02 08:34:37 -08:00
perroned
0bdea5163d fixing some elements on small screens 2015-02-02 08:31:22 -08:00
perroned
827a64a7b9 Organized user list 2015-02-02 08:11:25 -08:00
Maxim Khlobystov
9a2c10b7a8 Revert "add slide spacing on startup"
This reverts commit 580d84c9fa.

Conflicts:
	labs/meteor-client/app/client/views/whiteboard/whiteboard.coffee
2015-02-02 08:10:40 -08:00
Maxim Khlobystov
b27186c7c2 Revert "add bottom border for whiteboard slide when resizing"
This reverts commit 06c4c71d18.

Conflicts:
	labs/meteor-client/app/client/views/whiteboard/whiteboard.coffee
2015-02-02 08:05:29 -08:00
Maxim Khlobystov
aeabd91f6b Added Jasmine package and one of its dependencies. 2015-01-30 16:22:12 -08:00
Anton Georgiev
bd2ea9c711 unnecessary code repetition 2015-01-30 22:41:28 +00:00
Anton Georgiev
3f867f205f Merge branch 'testing-version' of https://github.com/OZhurbenko/bigbluebutton into chat-quotes 2015-01-30 17:35:10 +00:00
perroned
84120647c4 When you select a conversation from the extra list, actually display it 2015-01-30 08:48:37 -08:00
perroned
fe6ae739c2 Prevent close tab button from being hidden 2015-01-30 07:06:24 -08:00
perroned
919321d793 Prevent row from dropping by a few pixels when hovering a private tab 2015-01-29 09:53:31 -08:00
Oleksandr Zhurbenko
78bf4818ba Added text wrapping to whiteboard 2015-01-29 09:52:04 -08:00
perroned
c969d75730 Move notification class to parent tab element 2015-01-29 09:24:59 -08:00
perroned
46efa8cfa0 Fixing chat tabs dropping to a new line. 2015-01-29 08:59:32 -08:00
Maxim Khlobystov
459b8f2d71 Merge branch 'meteor-client-responsive-ui' into meteor-client-nightwatch 2015-01-28 14:50:08 -08:00
Maxim Khlobystov
db9f9c7082 Fixed the whiteboard height on startup in portrait orientation. 2015-01-28 13:47:48 -08:00
Maxim Khlobystov
c30ed0e046 Fixed the leak in one of the tests that was creating abandoned users in a meeting. 2015-01-26 16:24:55 -08:00
Maxim Khlobystov
93a1cb90e0 Added the specs to test the top of the page behaviour while scaling the page horizontally on desktop. 2015-01-26 16:17:56 -08:00
Maxim Khlobystov
ee06ff10f6 Added the spec to verify the whiteboard presentation successfully loads. 2015-01-25 11:11:56 -08:00
Maxim Khlobystov
a3eff36394 Beginning work on the acceptance tests for the log in/out process. 2015-01-24 18:14:46 -08:00
Maxim Khlobystov
44e851a2c4 Added some acceptance tests to verify that public chat messages work correctly. 2015-01-24 18:13:29 -08:00
Maxim Khlobystov
669fd71b79 Merge branch 'testing-version-11' of https://github.com/antobinary/bigbluebutton into meteor-client-nightwatch 2015-01-24 17:46:02 -08:00
Maxim Khlobystov
543b002165 Added Selenium and Nightwatch.js support. 2015-01-24 17:44:29 -08:00
Oleksandr Zhurbenko
53f00f6028 Merge branch 'testing-version-11' of https://github.com/antobinary/bigbluebutton into testing-version 2015-01-23 13:40:42 -08:00
Anton Georgiev
e6301b2cef Merge branch 'testing-version' of https://github.com/OZhurbenko/bigbluebutton into testing-version-12 2015-01-23 18:42:07 +00:00
Oleksandr Zhurbenko
dd5a341f1a Fixed whiteboard text positioning 2015-01-23 09:41:28 -08:00
perroned
a0aefb845d Fix text overflow for chat button 2015-01-21 13:07:17 -08:00
perroned
580d84c9fa add slide spacing on startup 2015-01-21 12:30:57 -08:00
perroned
06c4c71d18 add bottom border for whiteboard slide when resizing 2015-01-21 12:02:50 -08:00
perroned
77ee0a14f7 removed resizing from chatbar file 2015-01-21 12:02:04 -08:00
perroned
189ef5f7a9 spacing for whiteboard slide 2015-01-21 12:01:24 -08:00
perroned
486a25fcf4 Moved resizing windows to globals 2015-01-21 12:00:43 -08:00
perroned
8c36a145f5 Solved sorting of users list 2015-01-21 10:28:45 -08:00
Maxim Khlobystov
c89f4d64c5 Merge branch 'new-branch' of https://github.com/perroned/bigbluebutton into meteor-client-jasmine 2015-01-20 11:55:01 -08:00
perroned
8e4c27c13b Clear session. Prevent left over data allowing re-entry 2015-01-20 08:01:17 -08:00
perroned
45458c3f0c Fixing title name 2015-01-20 06:55:03 -08:00
perroned
4788faba2d Added route handler for trying to bypass port 4000 2015-01-16 09:00:37 -08:00
perroned
61f906875e fixing chat ui 2015-01-16 07:59:50 -08:00
perroned
990fdad193 Resize users windows 2015-01-16 07:44:17 -08:00
Maxim Khlobystov
6ae7a73980 Merge branch 'meteor-client-responsive-ui' into meteor-client-jasmine 2015-01-15 18:04:04 -08:00
Maxim Khlobystov
5f9b579a19 Included the navbar to a disabled area on clicking Logout. 2015-01-15 18:02:13 -08:00
Maxim Khlobystov
be40164588 Beginning work on client-side unit tests. 2015-01-15 16:51:20 -08:00
Maxim Khlobystov
40431ade89 Merge branch 'meteor-client-responsive-ui' of https://github.com/antobinary/bigbluebutton into meteor-client-responsive-ui 2015-01-15 13:01:08 -08:00
perroned
e4fd27e34d chatbar resizing works on meeting join now 2015-01-15 10:05:11 -08:00
perroned
b4effb2e01 chatbar is better on startup, message input it slightly hidden 2015-01-15 09:51:07 -08:00
perroned
38e3cac8ee Merge remote-tracking branch 'maxim/meteor-client-responsive-ui' into new-branch 2015-01-15 08:28:24 -08:00
perroned
9b9ad01847 Run resize at startup. Only run in landscape mode 2015-01-15 08:10:44 -08:00
perroned
15a5441354 height sizing of chat window 2015-01-15 07:50:59 -08:00
Maxim Khlobystov
bc6f00328a Fixed the size of a logout dialog box in a narrow window on desktop. 2015-01-14 16:00:19 -08:00
Maxim Khlobystov
3c0afca34c Made the desktop navbar always be one row, even in a very small window. 2015-01-13 17:23:34 -08:00
Maxim Khlobystov
35aaf3e3a9 There's no need to mask test specs manually, we can disable testing modes with environment variables. 2015-01-13 16:47:17 -08:00
Maxim Khlobystov
c50e88f2b9 Made the navbar display long meeting names truncated. 2015-01-12 16:02:08 -08:00
Maxim Khlobystov
f09809205d Made all the navbar buttons always visible in portrait orientation on desktop. 2015-01-12 15:11:26 -08:00
Maxim Khlobystov
addb734d9d Prevented the collapsible navbar from jumping to another row after it is triggered and user resizes the window. 2015-01-12 13:47:10 -08:00
Anton Georgiev
f1114418cb Merge branch 'meteor-client-new-icons' into meteor-client-responsive-ui 2015-01-12 21:27:33 +00:00
Anton Georgiev
54ff0915c4 logoutURL is still needed 2015-01-12 21:04:50 +00:00
Anton Georgiev
3ccc3887d7 regulate the height of the components so no vertical scrolling is needed 2015-01-12 20:54:59 +00:00
Anton Georgiev
3662f7cc7b Merge branch 'meteor-client-responsive-ui' of github.com:gthacoder/bigbluebutton into meteor-client-responsive-ui 2015-01-12 20:52:51 +00:00
Maxim Khlobystov
0b2973b03d Prevented the sliding menu icons from appearing below the userlist/whiteboard/chat panels. 2015-01-12 12:42:58 -08:00
Anton Georgiev
4c62aeed3d Merge branch 'meteor-client-new-icons' of github.com:gthacoder/bigbluebutton into meteor-client-new-icons 2015-01-12 20:16:43 +00:00
Maxim Khlobystov
988f5f02dd Made sure the cursor is set to the chat input textbox every time a new private tab is created or user switches between existing tabs. 2015-01-11 18:47:27 -08:00
Maxim Khlobystov
cfb79d13de Replaced Raised Hand and Leave Audio Call icons with ionicons. 2015-01-11 12:13:40 -08:00
Maxim Khlobystov
7c8f51ea55 Added Ionicons package. 2015-01-11 11:12:45 -08:00
Maxim Khlobystov
703d42b14d Added the ability for a navbar to collapse in portrait orientation on desktop. 2015-01-10 18:49:08 -08:00
Anton Georgiev
c7e7bde00a not used anymore 2015-01-09 22:54:40 +00:00
Maxim Khlobystov
bbdf5106f3 Merge branch 'master' of https://github.com/antobinary/bigbluebutton into meteor-client-responsive-ui 2015-01-09 12:48:19 -08:00
Maxim Khlobystov
2d1319e402 Added a separate stylesheet for a portrait mode in a narrowed desktop window. 2015-01-08 15:43:34 -08:00
Anton Georgiev
d9c1356427 keep only the most recent version of the shape 2015-01-08 21:00:13 +00:00
Anton Georgiev
a811265b86 the textshape is displayed as the presenter is typing. Overwritten with the final version when it is available 2015-01-08 20:49:29 +00:00
Anton Georgiev
60980df6a7 joinedAt is no longer used 2015-01-08 19:20:03 +00:00
Anton Georgiev
2836b9c647 update meteor to 1.0.2.1 2015-01-08 15:32:49 +00:00
Anton Georgiev
05e0b4d59d fixes the issue of portrait oriented slide not visible on sign in/refresh 2015-01-07 22:53:37 +00:00
Maxim Khlobystov
28b5f562ff Merge branch 'testing-version-008' of https://github.com/antobinary/bigbluebutton into meteor-client-responsive-ui 2015-01-07 13:09:05 -08:00
Maxim Khlobystov
4e2a0c05dd Got rid of the thin white horizontal line at the bottom of the navbar. 2015-01-07 12:40:32 -08:00
Anton Georgiev
8d37efbb2c Merge branch 'meteor-client-responsive-ui' of github.com:gthacoder/bigbluebutton into testing-version-008 2015-01-07 19:16:53 +00:00
Maxim Khlobystov
b28a7ab5b8 Added the ability for a user to close the sliding menu by clicking the darkened area. 2015-01-06 16:32:44 -08:00
Maxim Khlobystov
c461af43de Corrected the tooltip for Expand/Collapse button. 2015-01-06 15:49:41 -08:00
Anton Georgiev
8e88828464 cleaning up 2015-01-06 23:31:09 +00:00
Anton Georgiev
4b390f08c5 worked on fixing discrepancies of whiteboard on resize of the window 2015-01-06 23:27:56 +00:00
Maxim Khlobystov
8c65f05d16 Cleaning up. 2015-01-06 15:24:49 -08:00
Anton Georgiev
ac569c9fdd hide the unused space right above the footer 2015-01-06 23:22:02 +00:00
Maxim Khlobystov
2949415117 Prevented scrolling while the sliding menu is opened. 2015-01-06 15:07:25 -08:00
Anton Georgiev
a94bdcd85b rearranged and added comments for scaleSlide 2015-01-06 21:53:07 +00:00
Maxim Khlobystov
8973c30646 Made sure the whiteboard is visible when user enters the meeting using browser in portrait orientation. 2015-01-06 13:50:54 -08:00
Maxim Khlobystov
977f7f4273 Made sure the screen is always darkened while the sliding menu is opened. 2015-01-06 12:00:04 -08:00
Anton Georgiev
ef2c615b0d Merge branch 'meteor-client-responsive-ui' of github.com:gthacoder/bigbluebutton into testing-version-008 2015-01-06 18:28:17 +00:00
Maxim Khlobystov
8a4b7b6195 Eliminated unnecessary async operations on drawing/redrawing the whiteboard. 2015-01-06 09:42:37 -08:00
Anton Georgiev
d4f37c1ec6 text shapes now can be colourful 2015-01-05 20:54:03 +00:00
Maxim Khlobystov
2c86220669 Made sure the whiteboard height is restored to its landscape value after switching from portrait to landscape mode. 2015-01-04 14:13:43 -08:00
Maxim Khlobystov
352ab6760a Merge branch 'testing-version-008' of https://github.com/antobinary/bigbluebutton into meteor-client-responsive-ui 2014-12-30 11:35:22 -08:00
Maxim Khlobystov
2e03dd1dc8 Added the sliding menu to the portrait version. 2014-12-29 18:08:16 -08:00