Commit Graph

864 Commits

Author SHA1 Message Date
gcampes
5d1b280f05 Remove debug code 2017-04-18 14:28:35 -03:00
gcampes
5c3754c614 Fix ids displaying instead of messages on locale change 2017-04-18 14:26:27 -03:00
gcampes
eda7648043 Merge remote-tracking branch 'upstream/master' into settings-localization-dropdown
* upstream/master: (51 commits)
  Fix lint issues
  Fix lint issues
  Fix a few lint problems
  fix missing import causing breakouts to not work
  Delete the initially converted swf to be sure that if fallback convertion does not work we get the blank swf loaded.
  Fix poll options remain visible on html5, closes #3806 HTML5
  - user internal userId instead of external userId in register user message
  remove unnecessarily added svgs
  updated icons to v11, adjusted few icons
  Fix merge algoritm problem
  set chat input color to gray (text-color)
  Fixed user leave problem on private chat, close #3799 HTML5
  align emojis horizontally
  Check userId when validating token
  Cleanup  - remove extra > on meeting name on getRecording API response
  Check for WebRTC availability instead of checking for the browser name to display the AudioSelectionWindow browser hint.
  fix event name causing issues with listenOnly status
  Display "Recommend using either Firefox or Chrome for better audio" when any of other browser is used.
  improved logic for updating message-list
  Change to fetch from chat system id, issue #3792 HTML5
  ...
2017-04-17 15:49:35 -03:00
Anton Georgiev
07d2cf9b14 Merge pull request #3810 from Klauswk/FixPrivateOfflineChatProblem
Fixed user leave problem on private chat, close #3799 HTML5
2017-04-12 16:32:01 -04:00
Klaus Klein
3ad7f9b5a0 Fix a few lint problems 2017-04-12 17:19:39 -03:00
Anton Georgiev
e3ccc6aa3a Merge pull request #3814 from antobinary/ui-changes
HTML5: Switch to icons v11, update some icons in the client, minor UI touches
2017-04-12 16:14:03 -04:00
Anton Georgiev
47f1ad0ed5 fix missing import causing breakouts to not work 2017-04-12 15:29:47 -04:00
Anton Georgiev
573db8dcc3 updated icons to v11, adjusted few icons 2017-04-12 12:12:47 -04:00
Klaus Klein
3ac33c79d6 Fix merge algoritm problem 2017-04-12 09:03:14 -03:00
Klauswk
9649f7523d Merge branch 'master' into FixPrivateOfflineChatProblem 2017-04-12 08:33:07 -03:00
Anton Georgiev
026274f47f set chat input color to gray (text-color) 2017-04-11 17:05:10 -04:00
Anton Georgiev
5d75b79372 Merge pull request #3791 from Klauswk/FixUserDropDown
Fix user drop down - HTML5 Issue #3764
2017-04-11 16:00:21 -04:00
Klaus Klein
419902cc8b Fixed user leave problem on private chat, close #3799 HTML5 2017-04-11 16:46:51 -03:00
Anton Georgiev
b66fbf4bc4 align emojis horizontally 2017-04-11 15:39:50 -04:00
Anton Georgiev
d8faea566f Merge pull request #3798 from antobinary/private-chat-3786
[HTML5] Fix client freeze on private chat partner leaving. Fix for #3786
2017-04-11 15:02:22 -04:00
Anton Georgiev
28165f2584 improved logic for updating message-list 2017-04-10 11:02:58 -04:00
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
Anton Georgiev
d9592aba04 fix issue with new chat session opened 2017-04-07 11:00:44 -04:00
Anton Georgiev
adf63397a3 Merge pull request #3780 from KDSBrowne/accessibility-update-03
[HTML5] - Accessibility update 03
2017-04-07 08:11:30 -04:00
Anton Georgiev
c257839e5b Merge pull request #3753 from KDSBrowne/actions-button-fix
[HTML5] - Actions Button Fix
2017-04-07 08:08:14 -04:00
Anton Georgiev
e3f66da499 update chat unless user just left 2017-04-06 17:08:20 -04:00
Klaus Klein
1c22f38add Fix user drop down 2017-04-06 17:41:08 -03:00
KDSBrowne
8469691256 fix slide control and actionbar btn overlap 2017-04-06 08:13:28 -07:00
Anton Georgiev
b87ba1f3ea adjust emoji statuses and icon names 2017-04-06 10:42:01 -04:00
KDSBrowne
3ff1096cf4 fix merge conflict 2017-04-06 07:11:57 -07:00
gcampes
9a641c09aa Remove unwanted changes 2017-04-06 10:09:34 -03:00
Anton Georgiev
b007c68aaa Merge branch 'emoji-time-fix' of github.com:riadvice/bigbluebutton into test-ghazi-pr 2017-04-06 08:44:30 -04:00
gcampes
ded1de0b40 Adds localization dropdown 2017-04-06 09:36:59 -03:00
Anton Georgiev
fe998aacd3 Merge pull request #3769 from Gcampes/settings-refactor
[HTML5] Adds settings service
2017-04-06 08:31:59 -04:00
Anton Georgiev
ed7d09b8a2 Merge pull request #3783 from Klauswk/AddSendButton
HTML5 close #3765, Added send button aside chat textbox
2017-04-06 08:20:02 -04:00
gcampes
3ea21df973 Fix closed captions settings issue 2017-04-06 08:46:15 -03:00
KDSBrowne
800c47f462 remove default messages 2017-04-05 17:02:07 -07:00
KDSBrowne
7e4bf60588 remove FormattedMessage import 2017-04-05 15:49:05 -07:00
KDSBrowne
757d374383 remove span element 2017-04-05 15:38:15 -07:00
KDSBrowne
e932f707a9 clean up code 2017-04-05 15:35:09 -07:00
KDSBrowne
a8067b7bd8 clean up render function 2017-04-05 12:43:50 -07:00
KDSBrowne
e01f34cf23 fix merge conflicts 2017-04-05 09:56:41 -07:00
gcampes
f0ac39f420 Merge remote-tracking branch 'upstream/master' into settings-refactor
* upstream/master: (63 commits)
  add styles for separator
  In whiteboard text tool, a single click while editing a text sends it without creating a new text zone.
  Fixed https://github.com/bigbluebutton/bigbluebutton/issues/3777
  - escape all user passed strings
  - display length of recording in minutes instead of milliseconds
  - fix window size  - run dos2unix to remove ^M but it formatted the whole file :(
  - add dimension of screen share
  add formatted message for close chat link
  add formatted message for userlist toggle btn label
  remove unused import
  fix DropdownListSeparator to work with NVDA
  remove local storage usage and add separator
  change role from section to region
  add menu item separation NVDA fiendly
  add formatted messages and remove generic divs
  remove direct DOM manipulation
  remove span element
  add aria-label for unread messages
  add missing import to fix JoinAudio Btn
  fix lint issues
  ...
2017-04-05 13:56:07 -03:00
KDSBrowne
47ec0ed4d5 remove unneeded css prop 2017-04-05 09:24:43 -07:00
KDSBrowne
ffab4a0898 change line endings 2017-04-05 09:20:32 -07:00
KDSBrowne
12ff717033 fix ability to click actions btn 2017-04-05 09:14:37 -07:00
gcampes
724780c240 change underscore import to lodash 2017-04-05 13:08:20 -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
Ghazi Triki
ae866c88a1 Updated HTML5 emoji status names to match with the Flex client. 2017-04-05 09:23:44 +01:00
KDSBrowne
c852e2d7ec remove () and ! characters 2017-04-04 14:12:00 -07:00
Anton Georgiev
54e34e8d5c Merge pull request #3755 from KDSBrowne/accessibility-update-01
[HTML5] - Accessibility update 01
2017-04-04 14:39:44 -04:00
gcampes
da25471e3c Adds missing lodash import 2017-04-04 14:51:05 -03:00
KDSBrowne
ee31b29c96 add styles for separator 2017-04-04 09:49:01 -07:00