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

280 Commits

Author SHA1 Message Date
perroned
bdccd98130 Listen only icon 2015-05-12 10:18:07 -07:00
Maxim Khlobystov
299984ac0e Put the right-hand side sliding menu into a template. 2015-05-12 10:05:22 -07:00
perroned
807d36c2e1 Navbar audio icon 2015-05-12 10:05:06 -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
472e32cca2 Closing dialog reverts changes 2015-05-12 08:48:43 -07:00
perroned
8049038213 Prevent background closing of settings dialog 2015-05-12 08:06:05 -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
76fbc0eb3e Fixed icons 2015-05-08 11:36:12 -07:00
perroned
9490e5971a 2 lines does not induce scrolling in chat input box 2015-05-08 11:12:41 -07:00
perroned
f75250ba59 Merge remote-tracking branch 'perroned/summit-desktop-settings' into foundation-notifications 2015-05-08 11:08:50 -07:00
perroned
cad805f77a Fix conflict 2015-05-08 11:06:33 -07:00
perroned
ade07c0d15 chat only scrolls when needed 2015-05-08 10:13:21 -07:00
Maxim Khlobystov
f4418f6109 Merge branch 'meteor-ui' of https://github.com/OZhurbenko/bigbluebutton into meteor-client-new-ui 
Conflicts:
	bigbluebutton-html5/app/client/stylesheets/style.less
 2015-05-08 12:07:07 -04:00
Oleksandr Zhurbenko
1e3bdb380d Corrected icons 2015-05-08 09:02:15 -07:00
Maxim Khlobystov
e46ef7afa3 Added the toggle button for the right-hand side menu and made sure the landscape/portrait navbar only shows the appropriate buttons. 2015-05-08 11:58:51 -04:00
Oleksandr Zhurbenko
6d2a4414a7 Fixed settings and userlist icons' positioning 2015-05-08 08:53:37 -07:00
Oleksandr Zhurbenko
43b5027838 Merge branch 'meteor-client-new-ui' of https://github.com/gthacoder/bigbluebutton into meteor-ui 2015-05-08 07:47:58 -07:00
Maxim Khlobystov
8103bb2903 Fixed the position of the navbar buttons. 2015-05-08 10:27:52 -04:00
Maxim Khlobystov
4940568456 Fixed the navbar icons. 2015-05-08 10:16:42 -04:00
Oleksandr Zhurbenko
40324d9306 Merge branch 'meteor-client-new-ui' of https://github.com/gthacoder/bigbluebutton into meteor-ui 2015-05-07 19:53:12 -07:00
Oleksandr Zhurbenko
d2b933a73c Added event for userlist 2015-05-07 19:52:36 -07:00
Maxim Khlobystov
0c478393f3 Recovered the styling of presenter's slides control. 2015-05-07 22:17:26 -04:00
Oleksandr Zhurbenko
7951a848fc Fixed whiteboard positioning 2015-05-07 16:14:36 -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
9b4b896245 Made the buttons template uniform to be able to use both Ionicons and Foundation icons. 2015-05-07 18:48:14 -04:00
Maxim Khlobystov
7829adfa3c Merge branch 'summit-desktop-settings' of https://github.com/perroned/bigbluebutton into meteor-client-new-ui 2015-05-07 18:29:52 -04:00
Maxim Khlobystov
e2909d6304 Added the left-hand sliding menu in portrait mode. 2015-05-07 18:16:43 -04:00
Maxim Khlobystov
8cf52eeb9a Got rid of the whiteboard and chat title bars. 2015-05-07 14:27:01 -04:00
perroned
e762dd49a4 Hide presenter functionality 2015-05-06 23:26:55 -07:00
perroned
f47c69c314 Update BBB settings information 2015-05-06 23:26:40 -07: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
a66548d709 we still need the bbb build num 2015-05-07 20:20:51 +00:00
Anton Georgiev
518df01d78 format footer - add client build 2015-05-07 20:15:38 +00:00
Anton Georgiev
871803f449 added 2/5 counter for slide (presenter) 2015-05-07 18:14:47 +00:00
Anton Georgiev
1d69f9a137 prevent redirect to <ip>/undefined 2015-05-07 16:35:13 +00:00
Anton Georgiev
f93eac1bb9 Merge branch 'presenter-switch-slide' of github.com:antobinary/bigbluebutton into presenter-switch-slide 2015-05-07 16:34:20 +00:00
Anton Georgiev
ff7166bf45 add tooltips for slides navigation 2015-05-07 12:17:52 -04: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
perroned
840c4965a5 Restyled chatbar 2015-05-06 22:33:13 -07:00
perroned
029b90f2b1 Using Ion icons for user list audio 2015-05-06 21:53:29 -07:00
perroned
cdc8408cb5 Removing spacing from modules 2015-05-06 21:27:17 -07:00
perroned
539fda349e Removed title for chat and whiteboard 2015-05-06 21:17:59 -07:00
perroned
a241c75093 Use foundation icons for users list 2015-05-06 21:14:17 -07:00
perroned
bbbcc3061c save/cancel changes from settings dialog, more UI 2015-05-06 19:41:58 -07:00
perroned
6a5bddef5e Modal menu's for Foundation 2015-05-06 16:11:59 -07:00
perroned
bae564901e make buttons appear 2015-05-06 16:05:56 -07:00
perroned
bf67593fa1 Conflicts 2015-05-06 16:05:34 -07:00
perroned
028951d51d Updating UI for Foundation framework 2015-05-06 15:08:49 -07:00
Oleksandr Zhurbenko
eae2f7dbf3 Merge branch 'meteor-client-new-ui' of https://github.com/gthacoder/bigbluebutton into meteor-ui 
Conflicts:
	bigbluebutton-html5/app/client/stylesheets/style.less
 2015-05-06 14:42:01 -07:00
Oleksandr Zhurbenko
9dff47ef02 Moved a whiteboard's document name from the whiteboard-navbar to the main navbar 2015-05-06 14:22:48 -07:00
Maxim Khlobystov
7897f01a82 Positioned the whiteboard and chat vertically in portrait mode. 2015-05-06 16:32:25 -04:00
Anton Georgiev
c66ffcd817 incorrectly displaying that users are sharing webcams 2015-05-06 20:12:48 +00:00
Oleksandr Zhurbenko
642c28dc1d Got rid of the second body tag, fixed a whitespace under userlist 2015-05-06 12:59:00 -07:00
Anton Georgiev
8f0cc326f5 presentation slide switch-front end 2015-05-06 19:58:37 +00:00
Anton Georgiev
7110866925 presentation slide switch-permissions 2015-05-06 19:58:25 +00:00
Anton Georgiev
e8351d274e presentation slide switch-basics 2015-05-06 19:58:12 +00:00
Oleksandr Zhurbenko
10851cf521 Merge 2015-05-06 12:50:16 -07: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
Oleksandr Zhurbenko
04724c2a24 Removed scrolling in landscape and fixed whiteboard's poitioning 2015-05-06 12:33:15 -07:00
Maxim Khlobystov
1fec37c2c8 Made sure the standard userlist doesn't show up in portrait orientation. 2015-05-06 15:28:30 -04:00
Oleksandr Zhurbenko
3851b95f15 Fixed the positioning of chat input textarea 2015-05-06 12:15:27 -07:00
Oleksandr Zhurbenko
698ccf5c4f Getting rid of a footer 2015-05-06 12:08:57 -07:00
perroned
7c6436def6 Added foundation icons package 2015-05-06 09:07:40 -07:00
perroned
c64c6112c2 Removed boostrap leftovers 2015-05-06 09:05:22 -07:00
Maxim Khlobystov
ea8afcaf2a Re-wrote the desktop UI (makes the userlist separate + other modifications). 2015-05-06 10:52:43 -04:00
perroned
a76ce00fd3 remove bootstrap package 2015-05-05 16:25:18 -07:00
perroned
a5c47b49df Moving functionality into BBB bridge 2015-05-05 13:15:33 -07:00
Maxim Khlobystov
cabaf10283 Moved the navbar from Bootstrap to Foundation. 2015-05-05 10:30:38 -04:00
Maxim Khlobystov
d1f1a89ce5 Added Foundation package. 2015-05-05 09:48:52 -04:00
Anton Georgiev
44f180033f update welcome message url 2015-04-30 19:18:54 +00:00
perroned
8e2ce8c82c resolve merge conflicts 2015-04-27 09:55:20 -07:00
perroned
c57730ca1e Fix typo 2015-04-27 08:19:53 -07:00
perroned
c51d4a9633 modularize notification code. Notification helpers. Some redesigned CSS 2015-04-27 08:12:12 -07:00
perroned
489f63d93f Class for managing notifications 2015-04-27 08:11:35 -07:00
Richard Alam
85d3bca1d1 Merge pull request #625 from antobinary/lock-settings 
html5client:Lock settings implementation
 2015-04-27 10:47:24 -04:00
Anton Georgiev
888b8c6ecc check if null to prevent error 2015-04-27 14:42:03 +00:00
Maxim Khlobystov
9c5242ff1a Fixed the bug with missing audio buttons on the sliding menu and made the menu work correctly with audio. 2015-04-24 11:51:13 -07:00
Anton Georgiev
1333856c9b pick lockOnJoin from a settings file 2015-04-23 21:09:28 +00:00
Anton Georgiev
81762d5395 disallow unmuteSelf on lock;single user lock->mute 2015-04-23 20:53:07 +00:00
Anton Georgiev
eea695b326 when enabling disableMic the voice sharing viewers are now muted 2015-04-23 19:55:38 +00:00
Anton Georgiev
4d5184c30a put a lock icon in place when relevant 2015-04-23 18:02:56 +00:00
Anton Georgiev
7a0a1dae60 revert server side permission change 2015-04-23 15:46:52 +00:00
Anton Georgiev
c38cc9f109 identify when the mic is locked & skip the dialog 2015-04-22 21:16:30 +00:00
Anton Georgiev
073977a92a reorganize the joinAudio button handle; add fields for the permissions for joinAudioWithMic 2015-04-22 19:53:05 +00:00
Anton Georgiev
ef2c58eaa9 missed while resolving conflicts 2015-04-22 15:58:37 +00:00
Anton Georgiev
5e99ec98c1 Merge branch 'master' into lock-settings 
Conflicts:
	bigbluebutton-html5/app/client/views/chat/chat_bar.html
	bigbluebutton-html5/app/server/user_permissions.coffee
 2015-04-22 14:50:30 +00:00
Anton Georgiev
ff934cf472 Merge branch 'master' into listen-only-prototype 2015-04-22 14:05:05 +00: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
7171c47656 cleaning up 2015-04-21 21:42:34 +00:00
Anton Georgiev
45f5c8b298 wrapping chat tabs; bigger easel icon on mobile 2015-04-21 15:19:52 +00:00
Anton Georgiev
f74115c9f2 fixed spacing in userslist; Users:X with same behav as in the Flash player 2015-04-21 15:14:49 +00:00
Anton Georgiev
5cb3a9bd9c Active button hover states; rm left and right border 2015-04-20 20:57:48 +00:00
Anton Georgiev
4c3c4cb3c4 module headings margin change; footer background change 2015-04-20 19:41:51 +00:00
Anton Georgiev
ebe8e8627f Merge branch 'icon-and-label-modifications' into apr2015-ui-changes 2015-04-20 18:53:34 +00:00