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 |
|
Oleksandr Zhurbenko
|
2a91c6aa0b
|
Fixed a bug initial cursor/shape coordinates on page zooming
|
2017-08-31 18:42:00 -07:00 |
|
Richard Alam
|
e066c1713f
|
- generate xml
|
2017-08-31 15:25:59 -07:00 |
|
KDSBrowne
|
b20859d1c9
|
fix chat being locked for moderators
|
2017-08-31 14:49:13 -07:00 |
|
KDSBrowne
|
7a9cb7d04f
|
fix the disabling of chat when locked
|
2017-08-31 14:29:18 -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 |
|
KDSBrowne
|
94e44d6a23
|
remove unused prop
|
2017-08-31 13:50:20 -07:00 |
|
KDSBrowne
|
a404cc14d1
|
remove space typo
|
2017-08-31 13:47:06 -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 |
|
KDSBrowne
|
2f9d4bcc0e
|
move isMeetingLocked condition check to userlist service
|
2017-08-31 11:12:53 -07: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 |
|
Anton Georgiev
|
3146de984b
|
remove hide-show toolbar code
|
2017-08-31 10:53:37 -04:00 |
|
Oswaldo Acauan
|
a2268494e6
|
Move old files to the 2.0 folder
|
2017-08-31 09:56:51 -03:00 |
|
Oswaldo Acauan
|
6070a4ea25
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into presentation-uploader-2x
|
2017-08-31 09:49:59 -03:00 |
|
Ghazi Triki
|
bf3c6096d5
|
Users list does not scroll to the selected item when the data provider is refreshed.
|
2017-08-31 13:11:22 +01:00 |
|
Oleksandr Zhurbenko
|
58d21dfef5
|
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
|
2017-08-30 16:13:42 -07:00 |
|
Oleksandr Zhurbenko
|
28f7f8ad11
|
Minor fixes and adjustments
|
2017-08-30 16:12:03 -07:00 |
|
Chad Pilkey
|
a8ff311f91
|
Merge pull request #4342 from pedrobmarin/shared-notes-message-limit
Shared notes message limit
|
2017-08-30 18:42:00 -04:00 |
|
Chad Pilkey
|
b9dc10ede4
|
Merge pull request #4343 from capilkey/clean-pencil-end-numbers
Clean dimension numbers from pencil end message
|
2017-08-30 17:41:04 -04:00 |
|
Anton Georgiev
|
ed3bfae6e9
|
switch from flash based fullscreen to html5 api based
|
2017-08-30 17:18:59 -04:00 |
|
Chad Pilkey
|
13a1b19f6c
|
Merge pull request #4337 from capilkey/fix-annotation-clipping
Attempt to fix annotation clipping
|
2017-08-30 17:15:10 -04:00 |
|
Chad Pilkey
|
52bff50f10
|
clean dimension numbers from pencil end message
|
2017-08-30 17:14:00 -04:00 |
|
Oleksandr Zhurbenko
|
e4c4f4584d
|
Prevented publishing messages on random clicks for common shapes, and enabled that for pencil
|
2017-08-30 13:45:47 -07:00 |
|
Pedro Beschorner Marin
|
20779c4602
|
Merge remote-tracking branch 'bigbluebutton/bbb-2x-mconf' into shared-notes-message-limit
|
2017-08-30 20:40:05 +00:00 |
|
Pedro Beschorner Marin
|
6ab641e7c3
|
Added shared notes clear button for moderators
|
2017-08-30 20:32:42 +00:00 |
|
Chad Pilkey
|
3affad6be4
|
the whiteboard annotations should now always clip
|
2017-08-30 16:20:44 -04:00 |
|