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

17921 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Georgiev
5a59abde64 add enablePause="true" for Screenshare 2017-09-07 11:34:38 -04:00
Anton Georgiev
609f6fd462 do not promote or demote phone users 2017-09-06 18:01:42 -04:00
Anton Georgiev
f6edf5d6fb eject phone user from voice instead of kicking it 2017-09-06 17:55:44 -04:00
Anton Georgiev
94435bd782 fix to display voice_only user correctly 2017-09-06 17:04:28 -04:00
Richard Alam
139cdd9b0f Merge pull request #4363 from kepstin/bbb-20-rec-fixes 
RnP: Don't fail processing if an image can't be converted to png
 2017-09-05 14:18:31 -04:00
Chad Pilkey
523bfa0338 Merge pull request #4334 from ritzalam/rec-poll-result 
- fix recording of poll result. See issue #4237.
 2017-09-05 14:18:08 -04:00
Calvin Walton
399b1cb543 RnP: Don't fail processing if an image can't be converted to png 2017-09-05 11:21:16 -04:00
Richard Alam
70e11aae3e Merge pull request #4362 from ritzalam/fix-demo10 
Fix demo10
 2017-09-05 11:07:11 -04:00
Richard Alam
edc242f46b - fix format of playback 2017-09-05 07:58:44 -07:00
Richard Alam
b7529f63ce - revert changes 2017-09-05 07:58:26 -07:00
Richard Alam
a1e4dae612 - fix format of recording xml 2017-09-05 07:53:52 -07:00
Anton Georgiev
718828353e Merge pull request #4321 from Klauswk/fix-acl-inconsistency 
[HTML5] Fix inconsistency inside the ACL, #4310
 2017-09-05 09:54:40 -04:00
Anton Georgiev
a68222dfff Merge pull request #4181 from JaeeunCho/destroy_meeting_users 
[HTML5 2.0] End meeting by moderator
 2017-09-05 09:54:19 -04:00
Anton Georgiev
50c7974a30 Merge pull request #4323 from KDSBrowne/x2.0-replace-getElementById-instances 
[HTML5] - Replace Instances of getElementById
 2017-09-05 09:51:57 -04:00
Anton Georgiev
8634bf8c75 Merge pull request #4361 from antobinary/master 
Fix typo
 2017-09-05 09:21:19 -04:00
Anton Georgiev
20cc744889 fix typo 2017-09-05 09:19:22 -04:00
Richard Alam
aa5c2f2a74 Merge pull request #4359 from ritzalam/fix-metadata-xml 
Fix recordings api
 2017-09-03 20:43:39 -04:00
Richard Alam
9fb26b5694 Merge pull request #4357 from ritzalam/identify-phone-caller 
- indicate thru the userId that a user is calling through the phone.
 2017-09-03 20:43:19 -04:00
Richard Alam
ab232b54d7 - update recording metadata 
- publish/unpublish recording
 - delete recording
 2017-09-03 16:41:31 -07:00
Richard Alam
b14b04576d - publish/unpublish recording 
- get recordings
 2017-09-03 13:44:43 -07:00
Richard Alam
cdb39d469e - process get recordings api call 2017-09-03 10:52:18 -07:00
Fred Dixon
8a2b1497dd Merge pull request #4358 from pedrobmarin/shared-notes-changes 
Shared notes changes
 2017-09-03 08:09:17 -04:00
Richard Alam
bb740a6d72 - get metadata xml 2017-09-01 15:00:38 -07:00
JaeeunCho
7a01c61639 fixed isModerator() 2017-09-01 13:00:55 -07:00
JaeeunCho
99ea26c584 added isModerator at service.js 2017-09-01 12:37:14 -07:00
Pedro Beschorner Marin
4017d12fa1 Refactored shared notes cleaning to force sync 2017-09-01 19:36:15 +00:00
Richard Alam
33e1cb0b4f - indicate thru the userId that a user is calling through the phone. 2017-09-01 12:06:38 -07:00
JaeeunCho
ede90b8a40 removed unused line at css 2017-09-01 11:39:17 -07:00
JaeeunCho
43f6fd9c03 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users 2017-09-01 11:22:45 -07:00
Pedro Beschorner Marin
74de057a1d Fixed visibility of the create a new note option in all shared notes windows 2017-09-01 17:49:51 +00:00
Pedro Beschorner Marin
438bcdbf24 Removed colour picker from shared notes 2017-09-01 17:47:46 +00:00
Richard Alam
38a63427bd - start implement metadata xml reader 2017-09-01 10:34:01 -07:00
Richard Alam
0327c538e1 Merge pull request #4352 from pedrobmarin/shared-notes-ui-changes 
Shared notes ui changes
 2017-09-01 10:37:41 -04:00
Anton Georgiev
d60e06e28f Merge pull request #4221 from JaeeunCho/change_localeId_to_camelCase 
[HTML5] changed string id to camelCase
 2017-09-01 10:05:50 -04:00
Richard Alam
e066c1713f - generate xml 2017-08-31 15:25:59 -07:00
Chad Pilkey
f8481e9557 Merge pull request #4344 from antobinary/fullscreen 
Switch from flash based fullscreen to html5 api based
 2017-08-31 17:02:13 -04:00
Richard Alam
018c220986 - try using scala-xml library 2017-08-31 13:59:21 -07:00
Anton Georgiev
25fa5f5445 expose fullscreen state to flash to control button icon 2017-08-31 16:44:47 -04:00
Pedro Beschorner Marin
a6d6b83712 Consolidated add new note and clear into single gear menu 2017-08-31 19:36:45 +00:00
Fred Dixon
457bf87a7e Merge pull request #4350 from capilkey/2.0-fix-fittopage 
Fix for switching back to fit-to-page
 2017-08-31 14:56:32 -04:00
Chad Pilkey
01a52f46b6 reset values when switching to fit-to-page 2017-08-31 14:49:58 -04:00
Pedro Beschorner Marin
9def1a40c4 Removed justify from shared note text formatting. Still there is a problem in the icon. It's replaced with the center format 2017-08-31 17:31:18 +00:00
Pedro Beschorner Marin
bef2483783 Replaced shared note text font colors to five shades of grey 2017-08-31 17:30:08 +00:00
Pedro Beschorner Marin
d0a597059c Included shared note characters remaining tooltip 2017-08-31 17:28:54 +00:00
Pedro Beschorner Marin
0dc3cef38e Changed shared note message length warning 2017-08-31 17:28:11 +00:00
Pedro Beschorner Marin
4847812996 Removed horizontalBar from shared note window 2017-08-31 17:26:26 +00:00
Richard Alam
5d60a59650 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into bbb-2x-mconf 2017-08-31 08:49:41 -07:00
Richard Alam
58b659b4af Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf 2017-08-31 08:49:17 -07:00
Richard Alam
2dd6a5e005 Merge pull request #4348 from ritzalam/skip-bad-matadat-xml 
- do not include recordings with bad metadata.xml in the response fo…
 2017-08-31 11:19:03 -04:00
Richard Alam
e8127fdb61 - do not include recordings with bad metadata.xml in the response for recording api calls 2017-08-31 08:06:15 -07:00