Anton Georgiev
|
21b6dab852
|
Merge pull request #5267 from Tainan404/issue-5237
Add custom logo area
|
2018-04-05 15:08:05 -04:00 |
|
Tainan Felipe Pauli de Almeida
|
505a00daba
|
add custom logo area
|
2018-03-21 15:19:09 -03:00 |
|
Oswaldo Acauan
|
0e5fc698b0
|
Fix reconnecting users being redirected to /logout
|
2018-03-16 16:22:27 -03:00 |
|
Oswaldo Acauan
|
8219c28084
|
Remove debug code
|
2018-02-20 11:59:47 -03:00 |
|
Oswaldo Acauan
|
2f741df97b
|
Impl user-session based connections on server. Fix #5150
Implement a connectionId for each user, each time a user try to validate we change their connectionId
and end all other connections of that user.
|
2018-02-20 11:26:36 -03:00 |
|
Anton Georgiev
|
f789842ccb
|
Merge pull request #5009 from KDSBrowne/z.0.6-prevent-ghost-user
Prevent kicked user's ability to rejoin meeting via back btn
|
2018-01-30 15:10:46 -05:00 |
|
KDSBrowne
|
5b93033126
|
remove window.popstate and add onLeave to meeting-ended route
|
2018-01-30 08:39:43 -08:00 |
|
KDSBrowne
|
90bfea5d77
|
check if user was ejected
|
2018-01-29 10:17:52 -08:00 |
|
KDSBrowne
|
d0f6e4f3a2
|
add console logs to determin flow
|
2018-01-26 14:17:34 -08:00 |
|
Joao Siebel
|
18019776cb
|
Exit from audio when in meeting ended to prevent echo test, fix #4999
|
2018-01-25 09:07:32 -02:00 |
|
Tainan Felipe
|
8ae1fd1820
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-moderator-ends
|
2018-01-11 09:19:56 -02:00 |
|
Oleksandr Zhurbenko
|
962e659378
|
Switched the components from deprecated method to
|
2018-01-07 20:44:42 -08:00 |
|
Anton Georgiev
|
f0e15af607
|
Merge pull request #4814 from oswaldoacauan/issue-4812
Simplify authentication code/flow and Add subscriptions error handling
|
2018-01-03 14:45:38 -02:00 |
|
Tainan Felipe
|
c582f5bf08
|
add meetingEnded in Base component aand add intl translation
|
2017-12-14 17:03:34 -02:00 |
|
Tainan Felipe
|
bbbb64b4fd
|
fix error in logoutURL
|
2017-12-13 16:59:24 -02:00 |
|
Oswaldo Acauan
|
d19c127b1f
|
Add redirect to /logout if not loggedin or on subscription errors
|
2017-12-13 16:20:56 -02:00 |
|
Tainan Felipe
|
004290183d
|
add screen to when the meeting is closed
|
2017-12-12 11:08:43 -02:00 |
|
prlanzarin
|
f43b77c19f
|
Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu
Conflicts:
bigbluebutton-html5/imports/startup/client/base.jsx
bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
bigbluebutton-html5/imports/ui/components/app/container.jsx
bigbluebutton-html5/imports/ui/components/screenshare/service.js
bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
bigbluebutton-html5/imports/ui/components/video-dock/container.jsx
bigbluebutton-html5/private/locales/en.json bigbluebutton-html5/server/main.js
|
2017-11-11 03:41:37 +00:00 |
|
Maxim Khlobystov
|
bc1a4c473c
|
Merge pull request #4581 from Gcampes/locale-browser-default
Set initial locale to be the browser one
|
2017-11-06 11:16:36 -05:00 |
|
Anton Georgiev
|
63eb812f85
|
Merge pull request #4578 from OZhurbenko/meteor-react-16-update
React 16 and packages update
|
2017-11-02 10:41:45 -02:00 |
|
Oleksandr Zhurbenko
|
6ba09a3184
|
Fixed a logClient function call
|
2017-10-31 14:52:18 -07:00 |
|
Gabriel Carvalho de Campes
|
2e982114b5
|
Fix locale fetching issues
|
2017-10-31 15:13:44 -02:00 |
|
Gabriel Carvalho de Campes
|
75f82b923d
|
gets default language from config
|
2017-10-27 11:23:18 -02:00 |
|
Gabriel Carvalho de Campes
|
5a9a5fd1b0
|
code cleanup
|
2017-10-27 10:02:19 -02:00 |
|
Gabriel Carvalho de Campes
|
00bf09c4f9
|
Fix issue with locales
|
2017-10-27 09:36:27 -02:00 |
|
gcampes
|
d32330b208
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor
|
2017-10-24 11:19:58 -02:00 |
|
Oleksandr Zhurbenko
|
92fcc4bc74
|
Initial packages update
|
2017-10-23 17:09:40 -07:00 |
|
gcampes
|
b15322e7f2
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor
|
2017-10-18 17:42:49 -02:00 |
|
Tainan Felipe
|
873d227819
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter
|
2017-10-13 10:35:38 -03:00 |
|
Oleksandr Zhurbenko
|
430ddc0d3b
|
Removing unnecessary 2x from the collections, publishers, subscriptions and logs
|
2017-10-12 12:07:02 -07:00 |
|
Tainan Felipe
|
4bda76c5bb
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter
|
2017-10-12 15:36:52 -03:00 |
|
Tainan Felipe
|
e74c44dd9d
|
fix errors linter
|
2017-10-12 14:02:46 -03:00 |
|
gcampes
|
6b44504e5d
|
Adds timeout to transfer, fix css, remove logs
|
2017-10-12 11:49:50 -03:00 |
|
Oleksandr Zhurbenko
|
015ca3d719
|
Changed imports and removed 'initializeCursor.js' since it's not needed
|
2017-10-11 19:00:28 -07:00 |
|
Tainan Felipe
|
5393051d9d
|
fix errors linter
|
2017-10-10 10:06:34 -03:00 |
|
Anton Georgiev
|
5c071756a0
|
Merge pull request #4438 from KDSBrowne/xx-04-logoutURL-issue
[HTML5] - logoutRouteHandler Fix
|
2017-10-02 13:33:54 -04:00 |
|
KDSBrowne
|
b2d78b4f8a
|
remove unused callback function
|
2017-09-29 09:21:04 -07:00 |
|
KDSBrowne
|
3633b460d4
|
clean up code with suggestion
|
2017-09-27 08:03:31 -07:00 |
|
KDSBrowne
|
3e7aab2bdd
|
add http:// to logoutURL if its not there
|
2017-09-27 06:56:40 -07:00 |
|
Augusto Bennemann
|
1aa5cc5235
|
HTML5 ScreenShare Viewer
HTML5 ScreenShare Viewer
|
2017-09-11 13:40:56 -03:00 |
|
Oleksandr Zhurbenko
|
251bd22738
|
PR review fixes
|
2017-09-06 12:36:52 -07:00 |
|
Oleksandr Zhurbenko
|
643d55938c
|
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
|
2017-08-16 19:24:59 -07:00 |
|
Oleksandr Zhurbenko
|
fa1458c3eb
|
Handling and publishing multi-user mode switch
|
2017-08-02 18:24:38 -07:00 |
|
Klaus
|
4495c2e897
|
Move from annotation/ to annotations/
|
2017-08-02 16:52:13 -03:00 |
|
Klaus
|
d45ae64558
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x
|
2017-08-02 11:29:33 -03:00 |
|
Klaus
|
9d42ca9bd7
|
Move from users to voice-users
|
2017-08-01 10:10:12 -03:00 |
|
Klaus
|
1ff3df770a
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-voice-user
|
2017-07-31 17:01:04 -03:00 |
|
Anton Georgiev
|
7b40122c89
|
Merge pull request #4121 from mmarangoni/call-manager
[HTML5] Implemented AudioManager
|
2017-07-31 14:29:42 -04:00 |
|
Klaus
|
9bc9116e5c
|
handling a few messages
|
2017-07-31 08:10:52 -03:00 |
|
Klaus
|
c13155aa6a
|
Move shapes to annotations
|
2017-07-27 09:35:55 -03:00 |
|
Matthew Marangoni
|
7c0d802f27
|
fixed undefined extension
|
2017-07-26 10:58:39 -07:00 |
|
Klaus
|
9ab4430f68
|
Fix merge stuff
|
2017-07-26 11:31:35 -03:00 |
|
Anton Georgiev
|
75c39f9340
|
Merge branch 'html5-2x-screenshare' of github.com:antobinary/bigbluebutton into html5-2x-fix-audio
|
2017-07-24 16:06:52 -04:00 |
|
Anton Georgiev
|
b7d6427e63
|
rename deskshare to screenshare and adjust condition for viewing
|
2017-07-24 15:29:34 -04:00 |
|
Matthew Marangoni
|
2f48cca53e
|
Merge branch 'call-manager-2x' of https://github.com/Klauswk/bigbluebutton into Klauswk-call-manager-2x
|
2017-07-24 12:14:18 -07:00 |
|
Matthew Marangoni
|
8902742573
|
wrapped BBB instantiation into init function and added to startup
|
2017-07-24 11:36:56 -07:00 |
|
Klaus
|
d72df301c6
|
Move to 2.0
|
2017-07-24 11:15:46 -03:00 |
|
Klaus
|
5c2369b992
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into call-manager
|
2017-07-24 11:00:30 -03:00 |
|
Matthew Marangoni
|
4e66ecf0e2
|
moved BBB import to startup
|
2017-07-20 08:57:12 -07:00 |
|
Klaus
|
b70702dabe
|
Dynamic fetching the stun/turn servers
|
2017-07-19 09:44:47 -03:00 |
|
Klauswk
|
7173c0e20c
|
Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages
|
2017-07-17 16:54:37 -03:00 |
|
Klaus
|
5767583a86
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-captions-messages
|
2017-07-17 15:37:06 -03:00 |
|
Klaus
|
7fb9bae75e
|
Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages
|
2017-07-14 14:44:00 -03:00 |
|
Klaus
|
baf36d9d5f
|
Fix the html5 2.0 user logout
|
2017-07-14 13:59:02 -03:00 |
|
Klauswk
|
38087a1669
|
Merge branch 'bbb-2x-mconf' into html5-breakout-messages
|
2017-07-13 17:38:54 -03:00 |
|
Klaus
|
963248163d
|
Merge branch 'bbb-2x-mconf' into html5-breakout-messages
|
2017-07-13 17:14:02 -03:00 |
|
Klaus
|
55a9c0673e
|
Handling chat messages
|
2017-07-11 13:57:54 -03:00 |
|
Klaus
|
90ca216507
|
Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages
|
2017-07-07 08:19:39 -03:00 |
|
Klaus
|
4c1c7ad65a
|
Merge branch 'bbb-2x-mconf' into html5-2x-captions-messages
|
2017-07-06 17:36:56 -03:00 |
|
Anton Georgiev
|
83e14e8206
|
handle slides messages
|
2017-06-30 15:16:00 -04:00 |
|
Klaus
|
9b63e0c215
|
Add caption messages
|
2017-06-29 17:22:09 -03:00 |
|
Klaus
|
93927a3b53
|
Merge remote-tracking branch 'anton/handle-messages' into html5-2x-polls-messages
|
2017-06-29 09:22:34 -03:00 |
|
Klaus
|
2098c2dff7
|
Handle polls messages
|
2017-06-28 17:37:45 -03:00 |
|
Anton Georgiev
|
91cfc02d13
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into handle-messages
|
2017-06-26 17:21:42 -04:00 |
|
Klaus
|
c491d28b78
|
Handle most of the breakout messages
|
2017-06-26 15:00:28 -03:00 |
|
Klaus
|
a209f620e0
|
Add cursor support
|
2017-06-22 10:22:34 -03:00 |
|
Klaus
|
0c596c304d
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into SplitRedis
|
2017-06-20 14:16:16 -03:00 |
|
Anton Georgiev
|
367b905ec5
|
use enter api to get meetingId, authToken, etc
|
2017-06-19 14:03:12 -04:00 |
|
Anton Georgiev
|
8e16114c3f
|
html5client login now redirect=true to url+sessionToken
|
2017-06-19 14:01:24 -04:00 |
|
Klaus Klein
|
68f52aa107
|
Remove error from http response
|
2017-06-08 14:29:35 -03:00 |
|
Klaus Klein
|
e7e1243fef
|
Add const to defaultLang
|
2017-06-06 09:43:57 -03:00 |
|
Klaus Klein
|
0d9525164f
|
Add support to default system/browser language
|
2017-06-06 09:33:53 -03:00 |
|
Oswaldo Acauan
|
1c5c74db67
|
Fix merge conflicts
|
2017-06-05 13:52:46 +00:00 |
|
Oleksandr Zhurbenko
|
06493fda7f
|
Switched to prop-types package to remove new React 15 warnings
|
2017-06-03 19:40:14 -07:00 |
|
Oswaldo Acauan
|
e6412275a6
|
Linter auto fix
|
2017-06-02 19:25:02 +00:00 |
|
KDSBrowne
|
159a47694e
|
add suggested changes
|
2017-05-18 16:16:17 -07:00 |
|
KDSBrowne
|
d1543584ba
|
change file permission to 644
|
2017-05-17 09:07:41 -07:00 |
|
KDSBrowne
|
f4d6f173ea
|
fix new lint issues
|
2017-05-17 09:02:13 -07:00 |
|
KDSBrowne
|
16e507fbb2
|
fix merge conflicts
|
2017-05-17 08:54:48 -07: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
|
2b53dd19e5
|
Code refactored
|
2017-05-15 16:45:00 -03:00 |
|
Klaus Klein
|
95b47fd54a
|
Fix lang fallback error
|
2017-05-15 13:32:41 -03:00 |
|
Anton Georgiev
|
e8fb481722
|
add logic to trigger logout if user timed out on auth step
|
2017-05-09 16:04:30 -04:00 |
|
Anton Georgiev
|
038405f907
|
some changes to logClient api
|
2017-05-03 13:19:21 -04:00 |
|
Klaus Klein
|
5a4f05a41a
|
Fix requests on PR #3865
|
2017-04-28 14:12:08 -03:00 |
|
Klaus Klein
|
1c8e78d1c1
|
Merge with master
|
2017-04-28 10:53:30 -03:00 |
|
Klaus Klein
|
245ba3c4e3
|
Add client log, HTML5
|
2017-04-28 10:47:07 -03:00 |
|
Klaus Klein
|
3aacb71705
|
Remove unnecessary console.log
|
2017-04-27 10:43:21 -03:00 |
|
Klaus Klein
|
b99b73f334
|
Fix the double auth problem
|
2017-04-26 16:56:29 -03:00 |
|
Anton Georgiev
|
79fc24e817
|
Merge pull request #3823 from Gcampes/unauthorized-page-fix
[HTML5] Fix unauthorized for slow connections
|
2017-04-19 17:24:06 -04:00 |
|
gcampes
|
0fd59394e7
|
remove unwanted debug, adds back log for error
|
2017-04-17 14:20:09 -03:00 |
|
gcampes
|
832d916fd8
|
Fix unauthorized on slow connection
|
2017-04-17 14:14:31 -03:00 |
|
gcampes
|
ded1de0b40
|
Adds localization dropdown
|
2017-04-06 09:36:59 -03:00 |
|
Oswaldo Acauan
|
72dc94ab31
|
Remove old Kicked screen in favor of the new error screen
|
2017-03-17 14:38:18 +00:00 |
|
Oswaldo Acauan
|
2090883b03
|
Refactor Auth logout and credentials getter
|
2017-03-17 14:23:00 +00:00 |
|
Oswaldo Acauan
|
8d21c435b5
|
Refactor of the App component
|
2017-03-16 16:52:43 +00:00 |
|
Oswaldo Acauan
|
2129979112
|
Fix error screen
|
2017-03-10 20:47:23 +00:00 |
|
Oswaldo Acauan
|
9c84105319
|
Add missing packages
|
2017-03-10 19:18:23 +00:00 |
|
Oswaldo Acauan
|
d6780c3013
|
Refactor Authentication flow
|
2017-03-10 18:33:46 +00:00 |
|
Oswaldo Acauan
|
be7f36e00c
|
Refactor the i18n server code
|
2017-03-09 19:50:21 +00:00 |
|
Lajellu
|
8e7b1d6317
|
HTML5 - Changes config organization and all files dependant on config files
|
2016-08-17 08:48:03 -07:00 |
|
Oswaldo Acauan
|
b8e4a2692c
|
Add handlers for kick
|
2016-07-28 19:48:26 +00:00 |
|
Oleksandr Zhurbenko
|
bcfa3d41ec
|
Linting
|
2016-07-08 16:13:26 -07:00 |
|
Gabriel Carvalho de Campes
|
352011e92c
|
Remove unused imports
|
2016-07-08 12:22:49 +00:00 |
|
Gabriel Carvalho de Campes
|
e8f1a877c4
|
Remove logs, and add some removed code back
|
2016-07-07 14:46:18 +00:00 |
|
Gabriel Carvalho de Campes
|
ac3353d855
|
Changes Router in order for the livereloading to work again
|
2016-07-07 14:01:40 +00:00 |
|
Gabriel Carvalho de Campes
|
7f8f4417e4
|
try to fix the reload issue
|
2016-07-05 18:59:18 +00:00 |
|
Oswaldo Acauan
|
378c94ce7b
|
Resolve merge conflicts
|
2016-06-01 13:45:01 -03:00 |
|
gcampes
|
b6366ff451
|
removes .js and .jsx from startup/routes in html5
|
2016-06-01 10:04:23 -03:00 |
|
Oswaldo Acauan
|
877e91a43e
|
Rename to new structure
|
2016-05-23 10:09:47 -03:00 |
|
Oswaldo Acauan
|
99c2e94c80
|
Remove unnecessary extension on imports
|
2016-05-20 10:46:30 -03:00 |
|
gcampes
|
18e4f98f1d
|
Adds html5 new userlist, WIP
|
2016-05-19 15:22:56 -03:00 |
|
perroned
|
6adaff0c44
|
Cleans lint
|
2016-05-13 11:31:06 -05:00 |
|
perroned
|
544220f7c0
|
Updating import paths for new structure
|
2016-05-13 09:47:24 -05:00 |
|
perroned
|
d966aee2d7
|
Fixing paths for structure
|
2016-05-12 14:50:02 -05:00 |
|
Anton Georgiev
|
783f150442
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into router-merging
Conflicts:
bigbluebutton-html5/imports/startup/client/routes.js
|
2016-05-12 18:08:44 +00:00 |
|
Anton Georgiev
|
699fde7344
|
accommodate for poll and deskshare
|
2016-05-10 20:25:24 +00:00 |
|
Anton Georgiev
|
298927cf4f
|
Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging
Conflicts:
bigbluebutton-html5/collections/collections.js
bigbluebutton-html5/imports/api/meetings/server/meetings.js
bigbluebutton-html5/imports/startup/server/collectionManagers/poll.js
bigbluebutton-html5/imports/startup/server/eventHandlers.js
bigbluebutton-html5/imports/startup/server/helpers.js
bigbluebutton-html5/imports/startup/server/meteorMethods/publishVoteMessage.js
bigbluebutton-html5/imports/startup/server/publish.js
bigbluebutton-html5/imports/ui/components/app/AppService.js
bigbluebutton-html5/server/server.js
|
2016-05-10 19:39:01 +00:00 |
|
Anton Georgiev
|
bfd4afd07d
|
Users collection now available on client side
|
2016-05-09 21:19:45 +00:00 |
|
Anton Georgiev
|
dcce6d3122
|
set baseUrl to html5client/
|
2016-05-09 19:19:52 +00:00 |
|
Anton Georgiev
|
76d599eb32
|
join route handled via localStorage
|
2016-05-06 19:12:28 +00:00 |
|
Anton Georgiev
|
b95c380b56
|
working on join route
|
2016-05-06 15:34:00 +00:00 |
|
Maxim Khlobystov
|
67bb61c975
|
Code style cleanup.
|
2016-05-05 18:30:57 -04:00 |
|
Oswaldo Acauan
|
ddd38c57ac
|
Add i18n, modular layouts and basic styles
|
2016-05-03 17:40:46 -03:00 |
|
Oswaldo Acauan
|
01860a8804
|
Add basic styles for new design
|
2016-05-02 19:42:54 -03:00 |
|
Oswaldo Acauan
|
7d31eb43f9
|
Switch from ion-router to react-router
|
2016-04-28 15:57:14 -04:00 |
|