Chad Pilkey
|
9c8c59733a
|
fix exception thrown when webrtc echo test fails on initialize
|
2017-08-23 18:48:07 -04:00 |
|
Richard Alam
|
9da077a194
|
Merge branch 'capilkey-improve-client-annotation-edit' into bbb-2x-mconf
|
2017-08-23 15:21:16 -07:00 |
|
Richard Alam
|
09f3966e00
|
Merge branch 'improve-client-annotation-edit' of https://github.com/capilkey/bigbluebutton into capilkey-improve-client-annotation-edit
|
2017-08-23 15:07:44 -07:00 |
|
Chad Pilkey
|
181690f3ab
|
update WhiteboardToolbar children width to all match
|
2017-08-23 17:56:21 -04:00 |
|
Chad Pilkey
|
9afa3fd9ad
|
change cursor update timer to 50ms to match annotations
|
2017-08-23 17:55:53 -04:00 |
|
Chad Pilkey
|
97da17d13b
|
send annotation updates based on timer
|
2017-08-23 17:55:03 -04:00 |
|
Richard Alam
|
125ba28fbc
|
Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf
|
2017-08-23 13:02:12 -07:00 |
|
Richard Alam
|
cab3d97cdf
|
Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme
|
2017-08-23 12:58:19 -07:00 |
|
Richard Alam
|
2c789e1f97
|
Merge pull request #4302 from ritzalam/add-max-msg-length
- allow setting of max msg lenght from client
|
2017-08-23 15:25:16 -04:00 |
|
Richard Alam
|
c21e76e48e
|
- allow setting of max msg leghth from client
|
2017-08-23 12:24:04 -07:00 |
|
Pedro Beschorner Marin
|
b97375ec00
|
Shared notes deletion enabled at config.xml
|
2017-08-23 18:02:38 +00:00 |
|
Fred Dixon
|
ca4114c9f0
|
Merge pull request #4300 from capilkey/init-whiteboard-thickness
Initialize whiteboard thickness
|
2017-08-23 13:50:53 -04:00 |
|
Ghazi Triki
|
109820e9cd
|
Fix MuteMeButton muted icon reset and glow colour.
|
2017-08-23 18:19:57 +01:00 |
|
Fred Dixon
|
b6479efbfc
|
Merge pull request #4301 from kepstin/bbb-20-rec-fixes
RnP: Make 'presentation_props' a global var so it can be accessed in …
|
2017-08-23 12:38:23 -04:00 |
|
Calvin Walton
|
243afcd90c
|
RnP: Make 'presentation_props' a global var so it can be accessed in functions
|
2017-08-23 12:22:46 -04:00 |
|
Ghazi Triki
|
b0da784ca1
|
Fix icons for for RecordButton.
|
2017-08-23 12:10:29 +01:00 |
|
Chad Pilkey
|
c90c6491d9
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into improve-client-annotation-edit
|
2017-08-22 19:11:16 -04:00 |
|
Chad Pilkey
|
472230299b
|
initialize whiteboard thickness correctly
|
2017-08-22 18:51:23 -04:00 |
|
Fred Dixon
|
804840d833
|
Merge pull request #4299 from bigbluebutton/ffdixon-patch-5
Update bbbResources.properties
|
2017-08-22 18:32:36 -04:00 |
|
Fred Dixon
|
ecde0a5351
|
Update bbbResources.properties
Modified wording of enabling download of presentation
|
2017-08-22 18:32:22 -04:00 |
|
Richard Alam
|
dc51f97a2f
|
Merge pull request #4298 from ritzalam/move-record-alert-windows
- reposition record alert windows
|
2017-08-22 18:01:15 -04:00 |
|
Richard Alam
|
f7a0a4a20c
|
- reposition record alert windows
|
2017-08-22 15:00:09 -07:00 |
|
Fred Dixon
|
c7f2459331
|
Merge pull request #4297 from bigbluebutton/ffdixon-patch-4
Update bigbluebutton.properties
|
2017-08-22 17:58:43 -04:00 |
|
Fred Dixon
|
889161a783
|
Update bigbluebutton.properties
Change wording of headset icon to phone icon.
|
2017-08-22 17:57:47 -04:00 |
|
Richard Alam
|
07f9bcd25e
|
Merge pull request #4296 from ritzalam/minor-ui-tweaks
Minor ui tweaks
|
2017-08-22 16:59:57 -04:00 |
|
Richard Alam
|
17632bb9f7
|
- change slider background
|
2017-08-22 13:58:57 -07:00 |
|
Richard Alam
|
2d9badb058
|
- move upload presentation button
|
2017-08-22 13:58:42 -07:00 |
|
Richard Alam
|
478caab88f
|
- change copyright text
|
2017-08-22 13:58:22 -07:00 |
|
Richard Alam
|
349500b4ef
|
- randomly change position of new shared notes popup
|
2017-08-22 13:57:41 -07:00 |
|
Fred Dixon
|
d825aa44d5
|
Merge pull request #4295 from pedrobmarin/fullscreen-fix
Flash client's chrome fullscreen fix
|
2017-08-22 16:20:25 -04:00 |
|
Pedro Beschorner Marin
|
5a388961d7
|
Included allowfullscreeninteractive param when loading the swf file in chrome
|
2017-08-22 19:36:02 +00:00 |
|
Richard Alam
|
9f3719bba8
|
Merge pull request #4293 from ritzalam/shared-notes-default-title
- set default window name for new shared notes
|
2017-08-22 15:16:49 -04:00 |
|
Richard Alam
|
5f3672d62a
|
- pahabol: change public chat options font size
|
2017-08-22 11:42:19 -07:00 |
|
Richard Alam
|
61326d82c4
|
- set default window name for new shared notes
|
2017-08-22 11:11:57 -07:00 |
|
Richard Alam
|
8f3f549ed8
|
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into bbb-2x-mconf
|
2017-08-22 07:53:32 -07:00 |
|
Richard Alam
|
a1834f66ad
|
Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf
|
2017-08-22 07:52:53 -07:00 |
|
Richard Alam
|
08d70b15f0
|
Merge pull request #4292 from ritzalam/ss-publish-win-position
- reposition screenshare publish window
|
2017-08-22 10:22:08 -04:00 |
|
Richard Alam
|
0d25282d4f
|
- reposition screenshare publish window
|
2017-08-22 07:21:19 -07:00 |
|
Ghazi Triki
|
c38b19f2bf
|
Remove presentation zoom labels and show percentage in zoom slider data tip.
|
2017-08-22 14:44:11 +01:00 |
|
Ghazi Triki
|
83f60e4d64
|
Larger ShortcutHelpWindow size.
|
2017-08-22 12:14:42 +01:00 |
|
Ghazi Triki
|
d24dca219c
|
Smaller whiteboard toolbar buttons.
|
2017-08-22 12:14:16 +01:00 |
|
Ghazi Triki
|
1fd76bd616
|
Remove tooltip from meeting name in the title bar.
|
2017-08-22 12:13:42 +01:00 |
|
Ghazi Triki
|
571899bbc8
|
Updated layout.xml with larger central area.
|
2017-08-22 11:54:09 +01:00 |
|
Ghazi Triki
|
1573e6a716
|
Typo and default values fixes to configuration options.
|
2017-08-22 11:39:03 +01:00 |
|
Richard Alam
|
2dabc95f9c
|
Merge pull request #4288 from kepstin/bbb-20-rec-fixes
Bbb 20 rec fixes
|
2017-08-21 16:49:15 -04:00 |
|
Calvin Walton
|
ba1e0e09c2
|
RnP: Add image id to shape ids
This ensures that the same shape in two different images will
get different ids for each, so that the drawing code will handle it
correctly.
|
2017-08-21 16:40:53 -04:00 |
|
Richard Alam
|
806e90fbf9
|
Merge pull request #4287 from ritzalam/shared-notes-font
- increase default font for shared notes
|
2017-08-21 16:35:01 -04:00 |
|
Richard Alam
|
22ac6e8fc1
|
- increase default font for shared notes
|
2017-08-21 13:30:43 -07:00 |
|
Richard Alam
|
bd42ec4141
|
Merge branch 'pedrobmarin-2.0-shared-notes-fixes' into bbb-2x-mconf
|
2017-08-21 13:19:40 -07:00 |
|
Richard Alam
|
557a9ea1ca
|
Merge branch '2.0-shared-notes-fixes' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-2.0-shared-notes-fixes
|
2017-08-21 13:09:43 -07:00 |
|