Commit Graph

91 Commits

Author SHA1 Message Date
Anton Georgiev
e0a5fa48f4 add default webcam_stream and adjust emoji 2017-06-28 11:33:03 -04:00
Anton Georgiev
724e21a0d6 we do not have 1.0 user messages coming from bbb so use 2.0 only 2017-06-27 18:14:53 -04:00
Anton Georgiev
91cfc02d13 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into handle-messages 2017-06-26 17:21:42 -04:00
Klaus
692de9f417 Handle a few new messages 2017-06-21 13:54:04 -03:00
Klaus
3998139e72 Split redis and api for version migration 2017-06-20 14:17:37 -03:00
Klaus Klein
d88d4fb0bc Add stuff from 2.x 2017-06-19 10:13:35 -03:00
Klaus Klein
c627deca36 Move api to api/1.1 2017-06-19 08:57:32 -03:00
Klaus Klein
68f52aa107 Remove error from http response 2017-06-08 14:29:35 -03:00
Oswaldo Acauan
e6412275a6 Linter auto fix 2017-06-02 19:25:02 +00:00
KDSBrowne
beddf61532 remove new operator 2017-05-19 07:25:24 -07:00
KDSBrowne
16e507fbb2 fix merge conflicts 2017-05-17 08:54:48 -07:00
Anton Georgiev
fc831440c3 Merge pull request #3932 from antobinary/address-error-500-and-stuck-users
HTML5: Auto allow benign actions (logoutSelf); Disallow meteor calls if credentials are null
2017-05-17 11:25:16 -04:00
KDSBrowne
df76d33cba set files permission to 644 2017-05-16 09:22:59 -07:00
KDSBrowne
6537a0e28c Fix client lint issues except those which are comment related 2017-05-16 08:37:17 -07:00
Klaus Klein
95b47fd54a Fix lang fallback error 2017-05-15 13:32:41 -03:00
Anton Georgiev
5191168492 auto allow benign actions 2017-05-11 15:15:12 -04: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
Klaus Klein
419902cc8b Fixed user leave problem on private chat, close #3799 HTML5 2017-04-11 16:46:51 -03:00
gcampes
4f9cf64a49 Fix issue with locale merging 2017-04-11 15:31:51 -03:00
gcampes
1c26137177 removes unnecessary log 2017-04-06 10:14:12 -03:00
gcampes
9a641c09aa Remove unwanted changes 2017-04-06 10:09:34 -03:00
gcampes
ded1de0b40 Adds localization dropdown 2017-04-06 09:36:59 -03:00
Oswaldo Acauan
f020964c50 Fix merge conflicts 2017-03-16 20:25:14 +00:00
Oleksandr Zhurbenko
d7b5ae3c36 Fixed permissions and some exceptions 2017-03-13 12:15:58 -07:00
Oswaldo Acauan
9c84105319 Add missing packages 2017-03-10 19:18:23 +00:00
Oswaldo Acauan
be7f36e00c Refactor the i18n server code 2017-03-09 19:50:21 +00:00
Oswaldo Acauan
74f123cdc9 Refactor of get_users_reply handler 2017-02-23 17:59:56 +00:00
Oswaldo Acauan
8bd65c1a43 Merge remote-tracking branch 'upstream/master' into refactor-api-users
* upstream/master: (47 commits)
  Updated with correct version
  Check for initial values in application.conf
  remove defaultMessage
  Remove wrong selector when upserting captions
  Localize other labels through the application
  localize labels for AudioSettings component
  localize label for AudioTest component
  hide option to reset status if there is no status (emojis)
  drop voice in main room when joining breakout room
  add defaultMessage for Public Chat
  localize Join/Leave Audio labels
  Remove console logs
  Fix ´get_all_meetings_request´ being published multiple times
  Clean captions when handling the history reply
  Fix presentation slide coordinates
  - when we get invalid coordinate for presentation slide, change coordinate so it falls within bounds
  use localized Public Chat label
  finish locals for the audio modal
  Returning number of users that participated in each meeting in getRecordings call
  add comment for condition
  ...
2017-02-23 17:46:30 +00:00
Oswaldo Acauan
1f9f47ce16 Fix assignPresenter method 2017-02-22 13:42:42 +00:00
Oswaldo Acauan
1975503966 Remove console logs 2017-02-14 16:12:03 +00:00
Oswaldo Acauan
ffdcb5258b Fix ´get_all_meetings_request´ being published multiple times 2017-02-14 16:09:42 +00:00
Oswaldo Acauan
30d67897ef WIP - Refactor users api 2017-02-10 12:24:14 +00:00
Anton Georgiev
f72ae316c7 rework userPermissions to allow mixture of role/status based actions 2017-02-02 11:41:48 -05:00
Anton Georgiev
fc27dc9a5c clean up 2017-02-01 14:27:25 -05:00
Anton Georgiev
48a4b180fb improve userPermissions by rearranging logic 2017-02-01 14:18:27 -05:00
Anton Georgiev
0dbb8d62ca allow for mute/unmute by moderator 2017-02-01 14:14:32 -05:00
KDSBrowne
24643f01dd using config file for logger level 2016-12-01 08:15:57 -08:00
KDSBrowne
043c3f71cd added logger config and set level 2016-11-30 08:29:13 -08:00
Oswaldo Acauan
71fb7abd70 Refactor stuns/turns handler 2016-11-03 13:33:14 +00:00
Matthew Marangoni
d21545c847 added html5 stun request and reply 2016-10-25 07:59:14 -07:00
Oswaldo Acauan
c590f3ffd9 Merge branch 'rewrite-queue-handler' into refactor-meetings-api
* rewrite-queue-handler:
  Remove left over debug
  Fix chat being always inserted when the server start
  Add debug message when handler is completed with errors
2016-10-21 16:57:01 +00:00
Oswaldo Acauan
3923cf4073 Add debug message when handler is completed with errors 2016-10-21 16:29:22 +00:00
Oswaldo Acauan
c7b62a209c Refactor Meeting API 2016-10-21 16:27:47 +00:00
Oswaldo Acauan
1d30281cf2 Refactor server Chat API 2016-10-19 12:18:47 +00:00
Oswaldo Acauan
79cdf636eb Rewrite Redis related classes 2016-10-18 12:03:51 +00:00
Anton Georgiev
11f0c2da03 Merge pull request #3401 from KDSBrowne/Localization-update
Localization update #1
2016-10-13 10:44:13 -04:00
KDSBrowne
993dc70525 Cleaned up code 2016-10-12 10:03:10 -07:00
KDSBrowne
720c16f3ac Moved over the previous solution to the server side and cleaned up the code 2016-10-07 09:36:27 -07:00
Lajellu
c68ad3240d HTML5 - adds Emoji showing up on user list 2016-09-26 13:29:44 -07:00