perroned
|
a5c47b49df
|
Moving functionality into BBB bridge
|
2015-05-05 13:15:33 -07:00 |
|
Anton Georgiev
|
888b8c6ecc
|
check if null to prevent error
|
2015-04-27 14:42:03 +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 |
|
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
|
4c3c4cb3c4
|
module headings margin change; footer background change
|
2015-04-20 19:41:51 +00:00 |
|
Anton Georgiev
|
285b8c0e44
|
removed Send tooltip + blue border on chat tab
|
2015-04-20 17:50:05 +00:00 |
|
perroned
|
30b39fcc26
|
sync formatting level
|
2015-04-16 06:48:46 -07:00 |
|
perroned
|
eb2c5fc456
|
Prevent controls from moving around while clicking
|
2015-04-16 06:41:53 -07:00 |
|
Anton Georgiev
|
1db332572c
|
cleaning up
|
2015-04-02 15:22:08 +00:00 |
|
Anton Georgiev
|
06d5087bfb
|
unlock if presenter; completely disable locked chat input
|
2015-03-31 18:42:42 +00:00 |
|
Anton Georgiev
|
d3b459feec
|
locking for private chat
|
2015-03-31 17:25:05 +00:00 |
|
Anton Georgiev
|
7b3d6497c2
|
locking for public chat
|
2015-03-30 22:48:25 +00:00 |
|
Anton Georgiev
|
144ffcef64
|
added a default option so that the dropdown event is triggered with even in a 2 people meeting
|
2015-03-19 14:59:15 +00:00 |
|
Anton Georgiev
|
7ccbb38303
|
styling Options in portrait
|
2015-03-17 20:17:50 +00:00 |
|
Anton Georgiev
|
a068f8e470
|
private chat user pick from dropdown
|
2015-03-17 19:34:34 +00:00 |
|
Anton Georgiev
|
cb0eea2899
|
display a sample of the font-size
|
2015-03-17 14:57:40 +00:00 |
|
Anton Georgiev
|
4e08129191
|
font size -/+ control
|
2015-03-17 13:45:49 +00:00 |
|
Oleksandr Zhurbenko
|
8ba30a585a
|
Misprint fixed
|
2015-03-16 19:14:18 +00:00 |
|
Oleksandr Zhurbenko
|
f0cb2013a8
|
Fixed a bug when a client didn't set a proper default font size, when a user entered from a mobile device in landscape view
|
2015-03-16 19:14:06 +00:00 |
|
perroned
|
493c7701fd
|
Fixed issue where you can chat with yourself
|
2015-03-10 07:07:23 -07:00 |
|
Oleksandr Zhurbenko
|
84351383f2
|
Merge branch 'master' into meteor-ui
|
2015-03-06 08:40:09 -08:00 |
|
Anton Georgiev
|
d830e3358d
|
move the HTML5 client code outside of labs
|
2015-03-05 17:55:23 +00:00 |
|