Commit Graph

14195 Commits

Author SHA1 Message Date
Oswaldo Acauan
d07bca00c9 Refactor handlers inside /phone to the /user folder 2017-02-23 18:52:50 +00:00
Oswaldo Acauan
99cfdb2062 Refactor handlers inside /phone to the /user folder 2017-02-23 18:52:44 +00:00
Oswaldo Acauan
24aa98b623 Refactor of validate_auth_token and clearUsers 2017-02-23 18:15:13 +00:00
Oswaldo Acauan
fbe34b2ed3 Refactor of validate_auth_token and clearUsers 2017-02-23 18:15:08 +00:00
Oswaldo Acauan
0f0ebdcf4a Refactor user_joined handler 2017-02-23 18:05:18 +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
d1338139d0 WIP. Refactor of get_users_reply handler 2017-02-23 17:46:16 +00:00
Oswaldo Acauan
6b020d7e3a WIP. Refactor of get_users_reply handler 2017-02-23 17:46:03 +00:00
Oswaldo Acauan
a609c1feab WIP. Refactor of get 2017-02-23 17:45:51 +00:00
Oswaldo Acauan
5cfb18ea32 Refactor handler for emojiStatus 2017-02-22 20:22:12 +00:00
Oswaldo Acauan
8abdd10393 Refactor handler for emojiStatus 2017-02-22 18:59:47 +00:00
Oswaldo Acauan
b6bb8cc08d Refactor user api handlers 2017-02-22 17:55:39 +00:00
Oswaldo Acauan
37538b2817 Refactor user api handlers 2017-02-22 17:49:44 +00:00
Oswaldo Acauan
1f9f47ce16 Fix assignPresenter method 2017-02-22 13:42:42 +00:00
Oswaldo Acauan
f16926c94d Refactor emojiStatus method 2017-02-22 13:11:47 +00:00
Oswaldo Acauan
09481987ce Refactor assignPresenter method 2017-02-22 12:56:32 +00:00
Oswaldo Acauan
c8038b2068 Merge mute/unmute methods to a single toggle method 2017-02-22 12:20:30 +00:00
Oswaldo Acauan
8511e72f06 Refactor muteUser method 2017-02-22 12:10:27 +00:00
Fred Dixon
2c7ec923b1 Merge pull request #3675 from ffdixon/add-check-bbb-conf
Add check bbb conf
2017-02-20 14:12:24 -05:00
Fred Dixon
e5264d8556 Updated with correct version 2017-02-20 13:11:22 -06:00
Fred Dixon
4cd8959c79 Check for initial values in application.conf 2017-02-20 13:07:20 -06:00
Anton Georgiev
327ea70ce3 Merge pull request #3669 from antobinary/locals-2
HTML5: Localize more client side strings
2017-02-17 13:48:12 -05:00
Anton Georgiev
e7345ed7a2 remove defaultMessage 2017-02-17 13:44:17 -05:00
Anton Georgiev
1577fbd35a Merge pull request #3591 from oswaldoacauan/refactor-api-captions
[HTML5] Refactor API Closed Captions
2017-02-17 13:21:20 -05:00
Oswaldo Acauan
552dcd0300 Remove wrong selector when upserting captions 2017-02-17 16:05:35 +00:00
Anton Georgiev
f4ea3445d7 Localize other labels through the application 2017-02-16 17:14:10 -05:00
Anton Georgiev
216f494346 localize labels for AudioSettings component 2017-02-16 15:57:57 -05:00
Anton Georgiev
b1f0282c52 localize label for AudioTest component 2017-02-16 14:47:12 -05:00
Anton Georgiev
c6a15d6f7f Merge pull request #3664 from antobinary/drop-voice-in-main
HTML5: Drop voice in main room when joining breakout room
2017-02-16 14:04:28 -05:00
Anton Georgiev
87615420e7 Merge pull request #3667 from antobinary/modify-clear-status
HTML5: Hide option to reset status if there is no status (emojis)
2017-02-16 10:55:04 -05:00
Anton Georgiev
3581023b91 hide option to reset status if there is no status (emojis) 2017-02-16 10:53:54 -05:00
Anton Georgiev
a8df05f3e6 drop voice in main room when joining breakout room 2017-02-15 13:36:30 -05:00
Richard Alam
5e9c0ac10b Merge pull request #3650 from riadvice/transfer-moderator-audio-back
Move moderator back to main audio when a breakout room has been ended
2017-02-14 15:55:16 -05:00
Richard Alam
f3b67e5b82 Merge pull request #3654 from alexandrekreis/master
Returning number of users that participated in each meeting
2017-02-14 15:54:12 -05:00
Anton Georgiev
f5f1bf8bf1 Merge pull request #3659 from antobinary/localization
HTML5: Localization of labels in audio and chat areas
2017-02-14 15:53:49 -05:00
Anton Georgiev
9110468782 add defaultMessage for Public Chat 2017-02-14 13:12:01 -05:00
Anton Georgiev
6860890d73 Merge pull request #3658 from oswaldoacauan/fix-redis-psubscribe-handler
Fix ´get_all_meetings_request´ being published multiple times
2017-02-14 13:07:39 -05:00
Anton Georgiev
f4516180e2 localize Join/Leave Audio labels 2017-02-14 11:28:21 -05: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
Richard Alam
b4185a9d3d Merge pull request #3657 from ritzalam/check-presentation-coordinates
Fix presentation slide coordinates
2017-02-14 11:06:50 -05:00
Oswaldo Acauan
59eb04418d Clean captions when handling the history reply 2017-02-14 16:05:49 +00:00
Richard Alam
e6a121d3bc Fix presentation slide coordinates
Forgot to assign the values correctly.
2017-02-14 16:05:16 +00:00
Richard Alam
4d5782a2e1 Merge pull request #3656 from ritzalam/check-presentation-coordinates
Fix issue where presentation page is displayed incorrectly
2017-02-13 15:46:42 -05:00
Richard Alam
cb161ac118 - when we get invalid coordinate for presentation slide, change coordinate so it falls within bounds 2017-02-13 20:43:04 +00:00
Anton Georgiev
8bce68e137 use localized Public Chat label 2017-02-13 13:32:00 -05:00
Anton Georgiev
3362f76604 finish locals for the audio modal 2017-02-10 15:26:52 -05:00
Anton Georgiev
ac140be59a Merge pull request #3653 from KDSBrowne/Chat-Scroll
HTML5 - Chat scroll fix
2017-02-10 13:51:53 -05:00
alexandre
f39874ac9b Returning number of users that participated in each meeting in getRecordings call
Resolves #3623
2017-02-10 16:19:32 -02:00