Oswaldo Acauan
99cfdb2062
Refactor handlers inside /phone to the /user folder
2017-02-23 18:52:44 +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
37538b2817
Refactor user api handlers
2017-02-22 17:49:44 +00:00
KDSBrowne
47636857f4
discard notification if connection is successful
2017-02-07 07:16:04 -08:00
KDSBrowne
868c615d6a
add getUserMedia failure message
2017-01-31 08:06:12 -08:00
KDSBrowne
dbddb304cf
change render condition and move event to switch
2017-01-26 08:25:28 -08:00
KDSBrowne
61de5fe393
add user notification for audio failure
2017-01-25 11:52:17 -08:00
Matthew Marangoni
0abcc06bfc
linting fixes & updated based on feedback
2016-11-15 13:00:28 -08:00
Matthew Marangoni
807f434d72
fixed an error with exit audio
2016-11-11 14:11:00 -08:00
Matthew Marangoni
7fb492894e
Added exiting audio
2016-10-25 14:16:40 -07:00
Matthew Marangoni
d21545c847
added html5 stun request and reply
2016-10-25 07:59:14 -07:00
Matthew Marangoni
374698c338
beginning work on html5 audio
2016-10-24 09:01:50 -07:00
Laily Ajellu
f0cdbfaf2e
Fixed merge conflicts
2016-08-23 16:45:28 -07:00
Oleksandr Zhurbenko
f64ed1fd4a
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into closed-captioning
2016-08-20 16:37:11 -07:00
Lajellu
dedaa4e7aa
Merge remote-tracking branch 'upstream/master' into config-organization
2016-08-19 13:50:14 -07:00
Lajellu
8e7b1d6317
HTML5 - Changes config organization and all files dependant on config files
2016-08-17 08:48:03 -07:00
perroned
2a23778ea9
Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton
...
Conflicts:
bigbluebutton-client/resources/config.xml.template
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
bigbluebutton-html5/imports/api/verto/index.js
bigbluebutton-html5/imports/ui/components/deskshare/service.js
2016-07-22 19:20:00 +00:00
Anton Georgiev
6a984c2b68
adding captions support in html5 (part1)
2016-07-14 12:03:30 -07:00
Oswaldo Acauan
9b53090c81
Change Auth service to be a singleton class
2016-07-11 13:45:24 +00:00
perroned
86035fce39
Adds verto manager window functions
2016-06-17 17:47:24 +00:00
perroned
a95ed82293
Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton
...
Conflicts:
bigbluebutton-html5/imports/api/verto/index.js
bigbluebutton-html5/imports/ui/components/deskshare/service.js
2016-06-15 20:07:42 +00:00
perroned
c2702522ca
Upgrades html5 client for new verto code
2016-06-08 20:09:43 +00:00
Oswaldo Acauan
f39b7171af
Move session/auth logic to separated services
2016-06-02 10:46:35 -03:00
gcampes
ce32ae5b20
Merge branch 'html5-new-userlist' into html-userlist
2016-05-31 08:37:14 -03:00
perroned
c8fdf66099
Lints
2016-05-27 16:34:03 +00:00
perroned
393b49fdbe
Cleans up duplicate code
2016-05-27 16:17:16 +00:00
perroned
b8ae3a5304
Fixes some imports
2016-05-26 20:01:49 +00:00
Anton Georgiev
02f03205a4
minor edit to handle voice events
2016-05-25 16:32:23 -03:00
perroned
ef56169ebb
Access sip function through window
2016-05-19 20:18:20 +00:00
perroned
e8229b1851
Some linting
2016-05-19 19:27:49 +00:00
perroned
3934ae3dce
Adds some work for verto calling
2016-05-19 18:33:27 +00:00
perroned
428941f896
Hangs up from sip audio
2016-05-19 16:21:22 +00:00
perroned
97c94ecace
Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton
...
Conflicts:
bigbluebutton-html5/imports/api/cursor/server/modifiers/initializeCursor.js
bigbluebutton-html5/imports/api/phone/index.js
bigbluebutton-html5/imports/api/users/server/modifiers/userJoined.js
2016-05-19 15:47:47 +00:00
perroned
955c27efcc
Beginning to add exiting sip
2016-05-19 15:20:36 +00:00
perroned
4be18d2156
Updates client side data gathering for audio call
2016-05-18 19:29:28 +00:00
Anton Georgiev
eea6bc0829
adjust path of collections
2016-05-16 20:26:24 +00:00
Anton Georgiev
8d52dc1b40
Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging
...
Conflicts:
bigbluebutton-html5/imports/api/chat/server/methods/sendChatMessagetoServer.js
bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeetingToCollection.js
bigbluebutton-html5/imports/api/polls/server/methods/publishVoteMessage.js
bigbluebutton-html5/imports/api/slides/server/modifiers/clearSlidesCollection.js
bigbluebutton-html5/imports/api/users/server/methods/muteUser.js
bigbluebutton-html5/imports/api/users/server/methods/setUserPresenter.js
bigbluebutton-html5/imports/api/users/server/methods/unmuteUser.js
bigbluebutton-html5/imports/api/users/server/methods/userSetEmoji.js
bigbluebutton-html5/imports/api/users/server/methods/validateAuthToken.js
bigbluebutton-html5/imports/startup/server/eventHandlers.js
bigbluebutton-html5/imports/ui/components/app/AppService.js
2016-05-16 19:54:51 +00:00
Anton Georgiev
cbef1c4abd
split emitter.on; move to api
2016-05-16 19:12:49 +00:00
perroned
98aae7aade
Changes collection imports
2016-05-16 13:05:44 -05:00
perroned
3b8c9c2971
Changing structure to /api/list/index.js
2016-05-12 14:04:00 -05:00
perroned
dc3dd43f1a
Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton
...
Conflicts:
bigbluebutton-html5/imports/api/polls/polls.js
bigbluebutton-html5/imports/ui/components/app/AppService.js
2016-05-12 13:58:06 -05:00
Anton Georgiev
6a92c9400b
restructure modifiers and methods
2016-05-12 17:43:59 +00:00
perroned
f1f24acda8
Adds some services
2016-05-12 10:43:09 -05:00
perroned
84acf39fd3
Begins adding phone service
2016-05-10 10:54:55 -05:00
