Commit Graph

10291 Commits

Author SHA1 Message Date
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
Richard Alam
537786044c Merge pull request #637 from maxdoumit/Deskshare-TLS
Deskshare tls
2015-05-08 10:07:03 -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
Oleksandr Zhurbenko
5c2cbd791e Merge branch 'meteor-client-new-ui' of https://github.com/gthacoder/bigbluebutton into meteor-ui 2015-05-07 16:13:29 -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
Oleksandr Zhurbenko
e5d8248909 Merge branch 'meteor-client-new-ui' of https://github.com/gthacoder/bigbluebutton into meteor-ui 2015-05-07 15:19:57 -07:00
Maxim Khlobystov
e2909d6304 Added the left-hand sliding menu in portrait mode. 2015-05-07 18:16:43 -04:00
Richard Alam
cfe1f30350 Merge pull request #639 from antobinary/presenter-switch-slide
html5client: footer now uses bbb-html5's build num
2015-05-07 16:33:41 -04: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
Maxim Khlobystov
8cf52eeb9a Got rid of the whiteboard and chat title bars. 2015-05-07 14:27:01 -04:00
Richard Alam
8c58540113 Merge pull request #638 from antobinary/presenter-switch-slide
html5client:Presenter switch slide - count for slides
2015-05-07 14:24:52 -04:00
Anton Georgiev
871803f449 added 2/5 counter for slide (presenter) 2015-05-07 18:14:47 +00:00
maxdoumit
cd90de09f8 Changed names and removed unused function 2015-05-07 09:47:15 -07: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
maxdoumit
07aa31e936 Added missing config in the config.xml.template 2015-05-07 08:53:31 -07:00
Fred Dixon
9443dae0ce Merge pull request #636 from daronco/update-webhooks-readme
Update the web hooks README, moving info to docs.bigbluebutton.org
2015-05-07 11:52:40 -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
Leonardo Crauss Daronco
f9dad0afcd Update the web hooks README, moving info to docs.bigbluebutton.org
Most of the content is being moved to
http://docs.bigbluebutton.org/labs/webhooks.html
2015-05-07 11:41:04 -04:00
maxdoumit
640c3dd4a0 Fixed bug, and added PORT support on the applet side 2015-05-07 08:40:57 -07: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
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