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

17932 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Richard Alam
f6da20c174 Merge pull request #4284 from ritzalam/hide-rtt 
- hide rtt for now in client as we keep tract of this on the server …
 2017-08-21 16:04:26 -04:00
Richard Alam
5e1283bb22 - hide rtt for now in client as we keep tract of this on the server side 2017-08-21 13:01:52 -07:00
Pedro Beschorner Marin
2cc03d5d54 Avoiding bad resync in shared notes 2017-08-21 19:50:32 +00:00
Richard Alam
a339e5f534 Merge pull request #4283 from ritzalam/shared-notes-window 
- prevent shared notes window from closing as we don't have a way to…
 2017-08-21 15:39:08 -04:00
Richard Alam
b74ba45cfd - prevent shared notes window from closing as we don't have a way to re-open them. 2017-08-21 12:38:03 -07:00
Richard Alam
3219e978e0 Merge pull request #4282 from ritzalam/change-log-target 
- change target name in log element of config.xml so as not to confl…
 2017-08-21 15:10:55 -04:00
Richard Alam
c7a9fa6947 - change target name in log element of config.xml so as not to conflict with "target" on branding during 
post install
 2017-08-21 12:08:49 -07:00
Richard Alam
0dc6fd4af4 Merge pull request #4281 from ritzalam/public-chat-options 
- move public chat save, copy, and clean into chat options box for accessibility
 2017-08-21 14:47:53 -04:00
Calvin Walton
62465d4c47 RnP: Convert BBB 2.0 cursor positions to be relative to viewbox 
In BBB 2.0, the cursor positions are given relative to the page
size (like annotation positions). Since the recording cursors
aren't actually drawn in the page like annotations, it's more
convenient to have them relative to the visible area (viewbox),
so do that conversion.

While I'm in here - since we switched to new incompatible scripts
for BBB 2.0 anyways - remove an extra factor in the cursor positions
in cursor.xml, and just use a simple ratio of width/height instead.
 2017-08-21 14:44:41 -04:00
Richard Alam
f32ede3a5b - move public chat save, copy, and clean into chat options box for accessibility 2017-08-21 11:42:57 -07:00
Pedro Beschorner Marin
06d937958f Setting maximum size to shared notes and pastes 2017-08-21 18:23:33 +00:00
Fred Dixon
f128486be0 Merge pull request #4280 from ffdixon/redirect-bigbluebutton-org 
Added home.html to redirect to bigbluebutton.org when user clicks low…
 2017-08-21 13:59:59 -04:00
Fred Dixon
97148ac99b Added home.html to redirect to bigbluebutton.org when user clicks lower left text 2017-08-21 12:58:58 -05:00
Richard Alam
1a90735675 Merge pull request #4279 from ritzalam/multi-user-cursor 
- show name beside cursor only when multi-user wb is on
 2017-08-21 13:37:08 -04:00
Richard Alam
d6b4c7ac21 - show name beside cursor only when multi-user wb is on 2017-08-21 10:35:53 -07:00
Richard Alam
043d8f2867 Merge pull request #4278 from ritzalam/minor-ui-adjustments 
- reposition screen share publish window
 2017-08-21 12:29:19 -04:00