BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,185 Commits 13 Branches 260 Tags 1.1 GiB
05b8ba3499
Commit Graph

82 Commits

Author SHA1 Message Date
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
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
0571237619 Search for a username to display on the private chat tab 2015-05-24 20:19:57 -07:00
Oleksandr Zhurbenko
f30e4ce634 Comments 2015-05-21 07:41:58 -07:00
Oleksandr Zhurbenko
8dab326bd5 Added a helper which retreives a username for a private chat tab from the database 2015-05-20 17:49:13 -07:00
Maxim Khlobystov
7cddc861fa Made sure clicking to the translucent area closes push menus. 2015-05-14 13:58:34 -07:00
Maxim Khlobystov
156017ffa2 Made the right-hand side menu only visible in portrait orientation. 2015-05-14 12:17:07 -07:00
Maxim Khlobystov
36552d6d61 Got rid of the code that is left unused after the latest UI changes. 2015-05-13 12:23:44 -07:00
perroned
efca225a83 Merge remote-tracking branch 'maxim/meteor-client-new-ui' into foundation-notifications 
Conflicts:
	bigbluebutton-html5/app/client/globals.coffee
	bigbluebutton-html5/app/client/views/users/users_list.html
 2015-05-13 12:05:34 -07:00
perroned
0bd69867b0 Major clean up 2015-05-13 11:55:15 -07:00
Maxim Khlobystov
16da9e1d60 Removed the code that is not used anymore after restructuring of the sliding menu. 2015-05-13 11:40:02 -07:00
Maxim Khlobystov
592d22f31e Started using Handlebars helper instead of a separate template to position the main content of the page based on the sliding menu visibility. 2015-05-13 11:31:07 -07:00
Maxim Khlobystov
5dc0dfc21e Let the client decide if the landscape userlist is open or closed by default based on the initial screen orientation. 2015-05-13 10:13:40 -07:00
Maxim Khlobystov
7008d2eb14 Merge branch 'foundation-notifications' of https://github.com/perroned/bigbluebutton into meteor-client-new-ui 2015-05-13 09:22:49 -07:00
Maxim Khlobystov
738f1d5ea7 Removed the unnecessary code inside the function that toggles the userlist. 2015-05-12 12:59:42 -07:00
perroned
617e34cd62 Merge remote-tracking branch 'maxim/meteor-client-new-ui' into foundation-notifications 
Conflicts:
	bigbluebutton-html5/app/client/views/sharedTemplates.html
 2015-05-12 12:31:38 -07:00
perroned
6ff3106860 Joining audio notification 2015-05-12 10:56:20 -07:00
Maxim Khlobystov
ad923ab1ad Added the layout for the right-hand side sliding menu. 2015-05-12 09:51:06 -07:00
perroned
3833b600ee Exit audio notification. Fixed issue with icon not showing. 2015-05-12 09:15:01 -07:00
perroned
e8004b6073 Fixed audio notifications 2015-05-12 07:48:11 -07:00
Maxim Khlobystov
2883b6e72c Got rid of the animation effects associated with the sliding menu. 2015-05-11 14:42:18 -07:00
Maxim Khlobystov
4a464b0e3f Started using the landscape mode's userlist for the sliding menu. 2015-05-11 14:34:53 -07:00
perroned
0b910cfd00 Notification manager 2015-05-11 13:02:11 -07:00
perroned
64bdfe7aa9 Restructuring/moving 2015-05-10 21:43:31 -07:00
perroned
cad805f77a Fix conflict 2015-05-08 11:06:33 -07:00
Maxim Khlobystov
e1cad84bd5 Merge branch 'summit-desktop-settings' of https://github.com/perroned/bigbluebutton into meteor-client-new-ui 
Conflicts:
	bigbluebutton-html5/app/client/main.coffee
 2015-05-07 19:04:51 -04:00
Maxim Khlobystov
e2909d6304 Added the left-hand sliding menu in portrait mode. 2015-05-07 18:16:43 -04:00
perroned
c832240aa5 Fix webpage title 2015-05-06 23:26:13 -07:00
perroned
e199455b0f merge 2015-05-06 23:15:08 -07:00
Anton Georgiev
518df01d78 format footer - add client build 2015-05-07 20:15:38 +00:00
Richard Alam
6a9bf94c2c Merge pull request #635 from perroned/bridge-construction 
Moving functionality into BBB bridge
 2015-05-07 11:42:08 -04:00
Anton Georgiev
8f0cc326f5 presentation slide switch-front end 2015-05-06 19:58:37 +00:00
Maxim Khlobystov
b4ed87cbd7 Eliminated the gap above the portrait navbar by changing the way we set the page title. 2015-05-06 15:41:46 -04:00
perroned
a5c47b49df Moving functionality into BBB bridge 2015-05-05 13:15:33 -07:00
perroned
8e2ce8c82c resolve merge conflicts 2015-04-27 09:55:20 -07:00
perroned
c51d4a9633 modularize notification code. Notification helpers. Some redesigned CSS 2015-04-27 08:12:12 -07:00
perroned
554ce1d06b Merge remote-tracking branch 'bbb/master' into hangup-webrtc-call 
Conflicts:
	bigbluebutton-html5/app/client/main.html
	bigbluebutton-html5/app/client/stylesheets/style.less
	bigbluebutton-html5/app/client/views/chat/chat_bar.html
 2015-04-22 06:03:46 -07:00
Anton Georgiev
ebe8e8627f Merge branch 'icon-and-label-modifications' into apr2015-ui-changes 2015-04-20 18:53:34 +00:00
perroned
5808dba448 Restore functionality to properly detect mobile and choose correct icon 2015-04-16 09:55:56 -07:00
perroned
f4295ace2c Fix comment 2015-04-16 08:59:21 -07:00
perroned
f0f28f2f76 Update method we check call status 2015-04-16 08:56:56 -07:00
Anton Georgiev
de6a312cb5 remove the labels for Participants, Presentation, Chat 2015-04-15 21:21:44 +00:00
perroned
7e4fbc220e Comments for hangup retry 2015-04-15 05:48:16 -07:00
perroned
99f3b1d55d Beginning work on cancelling a call in progress 2015-04-15 05:02:39 -07:00
perroned
321ba43850 Ability to autojoin listen only on startup 2015-04-14 09:05:32 -07:00
perroned
6dd0e13632 Added UI for listen only, cleaned up code, added new API methods 2015-04-14 06:34:41 -07:00
perroned
19816f060e avoid conflict 2015-04-13 04:08:03 -07:00
Anton Georgiev
61d64ad9cc Merge branch 'listen-only-prototype' of github.com:perroned/bigbluebutton into listen-only-prototype 
Conflicts:
	bigbluebutton-html5/app/client/globals.coffee
 2015-04-10 19:21:40 +00:00
perroned
8467f40148 Documentation for listen only 2015-04-06 07:29:25 -07:00
Anton Georgiev
fdbc62ccd1 Cherry pick Anton's server side listen only. Fix conflicts 2015-04-06 05:10:56 -07:00