Commit Graph

17530 Commits

Author SHA1 Message Date
Calvin Walton
8a36ac5469 Fix typo in 'commands' variable name 2017-08-03 12:40:56 -04:00
Calvin Walton
05d6859170 Shape commands is spelt with an s 2017-08-03 12:24:35 -04:00
Calvin Walton
98fad425aa Add path 'command' handling for BBB 2.0 smooth drawing 2017-08-03 12:17:48 -04:00
Calvin Walton
8f142b9541 Shape thickness is a percentage, not fraction 2017-08-03 11:41:28 -04:00
Calvin Walton
c6f4ca9b56 BBB version is expected to be 3 numbers in recording events 2017-08-03 11:26:36 -04:00
Calvin Walton
f6c49847fb Use new shape thickness calculation on BBB 2.0
Thickness is now fraction of page width, rather than "pixels" on
an unspecified screen size.
2017-08-03 11:21:51 -04:00
Calvin Walton
056d7f2af6 Mark recordings as being from bbb 2.0
This will let the recording scripts adapt to some of the more difficult to
handle changes.
2017-08-03 11:02:28 -04:00
Calvin Walton
f176682abb Move the slide size storage back inside the loop 2017-08-03 10:50:14 -04:00
Calvin Walton
728eb19dc6 Fix name of 'GotoSlideEvent' 2017-08-03 10:47:30 -04:00
Calvin Walton
3f43294dc0 Fix syntax issue in presentation publish script 2017-08-03 10:40:17 -04:00
Klaus
e4e7f1da2c Move domain functions to service.js 2017-08-03 11:10:05 -03:00
Ghazi Triki
6a8d066b7a Updated FileDownloadWindow and UploadedPresentationRenderer. 2017-08-03 15:09:55 +01:00
Oswaldo Acauan
bc3679c0b4 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design 2017-08-03 09:53:44 -03:00
Anton Georgiev
1494c23858 Merge pull request #4189 from Klauswk/html5-hotfix-voiceuser
[HTML5 2.0] Fix VoiceUser microphone state
2017-08-03 08:53:01 -04:00
Oswaldo Acauan
b53636ec19 Fix avatar colors and text capitalization 2017-08-03 09:36:26 -03:00
Oswaldo Acauan
14f586faad Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design 2017-08-03 09:23:12 -03:00
Klaus
e02e5d75ce Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options 2017-08-03 09:17:50 -03:00
Oswaldo Acauan
00db9ee5bb Comment out compact user-list toggle 2017-08-03 09:06:59 -03:00
Oswaldo Acauan
92da0ace60 Fix error when a user have no subName and hide compact toggle 2017-08-03 09:05:17 -03:00
Anton Georgiev
9252371948 Merge pull request #4154 from Klauswk/slides-refactor-2x
[HTML5 2.0] Refactor Code to reflect AkkaApps collections
2017-08-02 18:06:49 -04:00
Chad Pilkey
34fa2f22b2 Merge pull request #4195 from capilkey/record-extra-share-presentation
Record extra SharePresentationEvent when conversion complete and current
2017-08-02 17:30:30 -04:00
Chad Pilkey
4d16c73bde record extra SharePresentationEvent when conversion complete and current 2017-08-02 17:26:02 -04:00
Richard Alam
e16a2711de Merge pull request #4194 from kepstin/bbb-20-rec-fixes
Have presentation recording script remember current slide
2017-08-02 17:24:11 -04:00
Calvin Walton
0913534108 Have presentation recording script remember current slide
This fixes recording generation on BBB 2.0, where there is no longer
an automatic GotoSlide sent after every SharePresentation
2017-08-02 17:14:29 -04:00
Richard Alam
d6f5e13074 Merge pull request #4193 from ritzalam/route-end-meeting-message
Route end meeting message
2017-08-02 16:26:42 -04:00
Klaus
7b8eb8027c Merge clear annotations and annotationsWhiteboard 2017-08-02 17:14:01 -03:00
Richard Alam
5ecf0c3651 - hook up end meeting from api 2017-08-02 13:06:16 -07:00
Richard Alam
f343719297 - set logging to debug not to clutter our client logs 2017-08-02 12:59:32 -07:00
Klaus
4495c2e897 Move from annotation/ to annotations/ 2017-08-02 16:52:13 -03:00
Klaus
c5646069fd Using the older insert method inside addShape 2017-08-02 16:46:29 -03:00
Richard Alam
876ff91372 Merge branch 'capilkey-fix-presenter-cursor-colour' into bbb-2x-mconf 2017-08-02 12:14:06 -07:00
Richard Alam
3089219981 Merge branch 'fix-presenter-cursor-colour' of https://github.com/capilkey/bigbluebutton into capilkey-fix-presenter-cursor-colour 2017-08-02 12:10:00 -07:00
Richard Alam
d14c93affa Merge branch 'pedrobmarin-recordings-size' into bbb-2x-mconf 2017-08-02 11:33:53 -07:00
Richard Alam
b072b6e354 - log start voice recording message 2017-08-02 11:32:43 -07:00
Richard Alam
f6419cce4c - ignore messages we don't want to record 2017-08-02 11:32:22 -07:00
Richard Alam
d169c417bc - start recording voice conf when first user joins 2017-08-02 11:31:30 -07:00
Richard Alam
69268f8628 - fix exception when recording pencil whiteboard shape 2017-08-02 11:31:01 -07:00
KDSBrowne
daa1439099 add script to pull translation from transifex 2017-08-02 11:11:33 -07:00
Klaus
e7b9eab5b6 Move makeCall to service file 2017-08-02 14:05:20 -03:00
Chad Pilkey
43e6359029 make presenter cursor colour switch correctly 2017-08-02 13:04:09 -04:00
Richard Alam
beb7155121 Merge branch 'recordings-size' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-recordings-size 2017-08-02 08:22:02 -07:00
Ghazi Triki
8d0a74e904 Minor imprvements to icon sizes. 2017-08-02 16:12:52 +01:00
Klaus
63fee3b615 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options 2017-08-02 11:36:16 -03:00
Klaus
e0c1e295ee Merge branch 'slides-refactor-2x' of https://github.com/klauswk/bigbluebutton into slides-refactor-2x 2017-08-02 11:32:16 -03:00
Klaus
d45ae64558 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x 2017-08-02 11:29:33 -03:00
Klaus
a0368e55cf Fix voiceUser mic states 2017-08-02 10:11:53 -03:00
Ghazi Triki
dd9b71717a Add icons to users settings menu and imporve BreakoutRoomSettings window layout. 2017-08-02 13:45:34 +01:00
Ghazi Triki
961b417e65 Improve users list icons and item renders layout. 2017-08-02 12:53:20 +01:00
Ghazi Triki
9f938d9cde Remove warning in SharedNotesEventMapDelegate.as 2017-08-02 12:51:45 +01:00
Richard Alam
ae788b9b1d Merge branch 'capilkey-restrict-remote-layout' into bbb-2x-mconf 2017-08-01 17:48:10 -07:00