Commit Graph

14541 Commits

Author SHA1 Message Date
Klaus Klein
94c5151e44 Adjust code for readability, issue #3764 2017-04-07 15:52:17 -03:00
Klaus Klein
c35e36f582 Change code to better readability 2017-04-07 14:12:29 -03:00
Klaus Klein
1c22f38add Fix user drop down 2017-04-06 17:41:08 -03:00
Klaus Klein
8095620fac Change to arrow function 2017-04-05 11:23:05 -03:00
Klaus Klein
a140f7567a HTML5 close #3765 ,Added send button aside chat textbox 2017-04-05 10:21:30 -03:00
Richard Alam
70a674bc79 Merge pull request #3773 from ritzalam/fix-get-recordings-api
- display length of recording in minutes instead of milliseconds
2017-03-31 15:57:02 -04:00
Richard Alam
c99de6c4db - display length of recording in minutes instead of milliseconds 2017-03-31 19:54:51 +00:00
Richard Alam
36d7358cfb Merge branch 'perroned-merge-webrtc-screenshare-2' 2017-03-29 17:04:01 +00:00
Richard Alam
87f8c3257a - fix window size
- run dos2unix to remove ^M but it formatted the whole file :(
2017-03-29 16:00:00 +00:00
Ubuntu
8445c49f92 - add dimension of screen share 2017-03-29 15:58:43 +00:00
Ubuntu
aed4596a05 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into perroned-merge-webrtc-screenshare-2 2017-03-29 15:06:59 +00:00
Richard Alam
bdb4d3d1e1 Merge pull request #3768 from ritzalam/fix-get-recordings-api
- convert "success" to upper case to match previous API. Maybe users…
2017-03-28 17:07:29 -04:00
Richard Alam
8122f984ea - convert "success" to upper case to match previous API. Maybe users are matching with uppercase. 2017-03-28 21:04:52 +00:00
Richard Alam
be653add63 Merge pull request #3767 from ritzalam/fix-get-recordings-api
- escape image alt attribute as it's breaking xml format in some met…
2017-03-28 16:20:35 -04:00
Richard Alam
fcca81783e - escape image alt attribute as it's breaking xml format in some metadata.xml 2017-03-28 20:16:26 +00:00
Richard Alam
5ff3d29ddb Merge pull request #3766 from ritzalam/fix-get-recordings-api
- try fix broken get recording api call
2017-03-28 15:36:21 -04:00
Richard Alam
7fdbc5b293 - try fix broken get recording api call 2017-03-28 19:32:01 +00:00
Fred Dixon
c02320246b Merge pull request #3762 from ffdixon/updates-bbb-record
Updates bbb record
2017-03-28 14:19:17 -05:00
Fred Dixon
cf1a6782ca Updated bbb-conf --restart to restart bbb-webhooks 2017-03-28 12:42:06 -05:00
Fred Dixon
a4457e6d7d Updated references to systemd units for recording 2017-03-28 12:30:07 -05:00
Chad Pilkey
b3ce82330d Merge pull request #3760 from riadvice/whiteboard-text-tool-update
Whiteboard text tool update
2017-03-28 11:51:31 -04:00
Ghazi Triki
79c3e78910 Make single click text box tool bigger. 2017-03-28 08:16:12 +01:00
Fred Dixon
453d7204ce Merge pull request #3758 from capilkey/fix-caption-transcript-null
Fix issue where client transcripts could get into a bad state
2017-03-27 23:00:44 -04:00
Richard Alam
86afdb558b Merge pull request #3759 from ritzalam/fix-get-recordings-api
Fix get recordings api
2017-03-27 17:26:06 -04:00
Richard Alam
158102774b - cleanup 2017-03-27 21:14:18 +00:00
Richard Alam
364f781104 - fix issue where GetRecordings API was failing because support of old metadata.xml broke. 2017-03-27 21:10:24 +00:00
Ghazi Triki
cf8285c36f Create text field in the whiteboard with a single click. 2017-03-27 11:01:17 +01:00
Chad Pilkey
de7dfe66da fix issue where client transcripts could get into a bad state 2017-03-24 18:42:29 -04:00
Richard Alam
2eb332b618 Merge pull request #3757 from ritzalam/update-locales-mar-24-2017
update locales
2017-03-24 16:02:20 -04:00
Richard Alam
cda3668f90 - update locales 2017-03-24 19:59:22 +00:00
Ubuntu
e6796bf3ea Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2 2017-03-24 19:25:47 +00:00
Fred Dixon
a53df17ec7 Merge pull request #3756 from kepstin/bbb-conf-rap-stop
bbb-conf: Stop all of the new recording units
2017-03-24 15:19:01 -04:00
Calvin Walton
1fe52cc24f bbb-conf: Stop all of the new recording units 2017-03-24 15:17:29 -04:00
Ubuntu
5e0a5f019c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into perroned-merge-webrtc-screenshare-2 2017-03-24 19:14:21 +00:00
Richard Alam
c13bd7255d Merge pull request #3747 from capilkey/1.1-accessibility-fixes-3
More accessibility fixes for 1.1
2017-03-24 14:51:14 -04:00
Calvin Walton
ca41cb606a Merge pull request #3752 from capilkey/fix-3694
Fix #3694
2017-03-24 14:25:31 -04:00
Anton Georgiev
ff8f78b2fa Merge pull request #3754 from KDSBrowne/joinAudio-button-fix
[HTML5] - JoinAudio btn fix
2017-03-24 11:04:56 -04:00
KDSBrowne
507393a09b add missing import to fix JoinAudio btn 2017-03-24 07:56:08 -07:00
Fred Dixon
f1ea606432 Merge pull request #3750 from riadvice/black-video-chat-layout
Black video chat layout update
2017-03-24 10:04:39 -04:00
Anton Georgiev
6b8e9146c7 Merge pull request #3751 from antobinary/audio-1
[HTML5] Modify the looks of the audio modal to match designs
2017-03-24 08:21:41 -04:00
Anton Georgiev
bd409e3919 Merge pull request #3749 from OZhurbenko/icons-update
Icons update and a missing import
2017-03-23 18:56:45 -04:00
Anton Georgiev
937f020ca1 center modal title 2017-03-23 18:50:30 -04:00
Chad Pilkey
1e4baeaffa fix the recording play button to work with devices that have touch and a mouse 2017-03-23 15:38:28 -04:00
Anton Georgiev
8e9cba0f24 Merge pull request #3703 from JaeeunCho/close
HTML5 - Session for close private chat
2017-03-23 15:16:21 -04:00
JaeeunCho
fd08d99b6f HTML5 - removed unused imports, fixed variable names 2017-03-23 12:02:40 -07:00
JaeeunCho
aa2615b52b Merge remote-tracking branch 'upstream/master' into close 2017-03-23 11:59:54 -07:00
Ghazi Triki
7de860d3da Remove video view border in dark mode. 2017-03-23 18:38:37 +01:00
Ghazi Triki
596f752ff1 Update MainApplicationShell and its footer style when video chat layout is selected. 2017-03-23 18:28:21 +01:00
Oleksandr Zhurbenko
0120e3cfe2 Added a missing import 2017-03-23 09:19:02 -07:00
Oleksandr Zhurbenko
a42c817a41 Updated icon sets to the latest
Contains a fixed icon for the audio modal
2017-03-23 09:15:33 -07:00