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
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
Richard Alam
0ee45518ef
Merge pull request #631 from fcecagno/fix-lineending
...
Fix line ending of VideoProxy.as
2015-05-06 14:16:32 -04:00
Felipe Cecagno
0d26ca639f
new attempt to fix the line endings
...
this particular file has windows line endings
2015-05-06 15:12:42 -03:00
Felipe Cecagno
c0813c11dd
fixing line ending (again) on VideoProxy
2015-05-06 14:54:33 -03:00
Fred Dixon
4fe6acbd81
Merge pull request #630 from fcecagno/promote-webhooks
...
Promote webhooks
2015-05-06 12:37:02 -04:00
Richard Alam
595cf0fd52
Merge pull request #627 from mconf/090-new-videodock
...
New video dock in Flash client
2015-05-06 12:36:40 -04: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
Felipe Cecagno
6ad7ce3318
updating post_catcher in order to listen on localhost
2015-05-06 11:25:42 -03:00
Felipe Cecagno
4051c97a9d
added some code to bbb-conf in order to check the webhooks app is well configured, and also to update the security key
2015-05-06 11:24:50 -03:00
Felipe Cecagno
6e516c6df8
promote bbb-webhooks to a well-supported module (removed from labs)
2015-05-06 00:11:02 -03:00
perroned
a76ce00fd3
remove bootstrap package
2015-05-05 16:25:18 -07:00
Lucas Zawacki
6b04a86e7e
Prevent slowdown on firefox when deleting lots of shape messages
...
By creating a new collection called WhiteboardCleanStatus which
is used to alert the clients that the server is cleaning shapes.
When shapes are being cleaned they are not drawn and so things don't slow down on firefox or chrome
2015-05-05 18:33:08 -04:00
perroned
a5c47b49df
Moving functionality into BBB bridge
2015-05-05 13:15:33 -07:00
Anton Georgiev
16741f7c48
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2015-05-05 15:48:09 +00: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
Fred Dixon
9261791fc9
Updated footer link with new docs
2015-04-29 20:41:53 -04:00
Mateus Dalepiane
bdf9d7f68a
Update video window talking status on creation
2015-04-29 15:43:24 -03:00
Mateus Dalepiane
0662a242aa
Merge branch 'bigbluebutton/master' into 090-new-videodock
...
Conflicts:
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/VideoHolder.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoWindowItf.as
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml
2015-04-29 12:10:41 -03:00
Mateus Dalepiane
1d2f980f85
Reset line endings to original
2015-04-29 11:12:50 -03: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
