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

10269 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Richard Alam
09c4ffcbe1 Merge pull request #633 from antobinary/presenter-switch-slide 
html5client:Presenter switch slide
 2015-05-06 16:32:04 -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
Maxim Khlobystov
d03defeb33 (merging from Maxim) Implemented switching slides. 
Conflicts:
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-app-presentation.xml
	labs/meteor-client/client/views/whiteboard/whiteboard.coffee
	labs/meteor-client/client/views/whiteboard/whiteboard.html
	labs/meteor-client/server/redispubsub.coffee
 2015-05-06 19:55:29 +00:00
Anton Georgiev
6858351274 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2015-05-06 19:50:30 +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
maxdoumit
d9e88b7620 Added TLS option for the screenshare applet 2015-05-06 12:18:28 -07:00