Commit Graph

2997 Commits

Author SHA1 Message Date
hristoterezov 71d767f0b4 fix(hangup): Show Feedback independently from room.leave 2016-10-12 16:30:44 -05:00
hristoterezov 5fe0c62842 style(RingOverlay): Fix naming and aligning after review 2016-10-12 13:10:58 -05:00
Paweł Domas 58b4e0d59a Merge pull request #1002 from jitsi/react-native
Merge jitsi-meet-react's mobile support
2016-10-12 12:38:06 -05:00
hristoterezov 94366190a0 Merge pull request #928 from maximax123/fix-command
hot fix api.executeCommand
2016-10-12 11:38:31 -05:00
yanas 491ce70e1a Merge pull request #999 from BeatC/theming
Add main file for switch theming
2016-10-12 11:34:01 -05:00
Lyubomir Marinov 7f3ff13c18 Merge jitsi-meet-react's mobile support
As a step toward merging jitsi-meet-react with jitsi-meet to share as
much source code as possible between mobile and Web, merge the part of
jitsi-meet-react's source tree which supports mobile inside the
jitsi-meet source tree and leave jitsi-meet-react's Web support in the
source code revision history but don't have it in master anymore because
it's different from jitsi-meet's Web support. In other words, the two
projects are mechanically merged at the file level and don't really
share source code between mobile and Web.
2016-10-12 10:31:52 -05:00
Lyubomir Marinov 1edebf83ae Remove .babelrc to simplify React Native support
React Native's module bundler (aka packager) has its default Babel
preset - react-native/babel-preset - which it uses in the absence of a
custom .babelrc. Unfortunately, the default may be tripped by the
presence of a .babelrc in dependencies. Additionally, if the default
does not get tripped, the npm install of lib-jitsi-meet as a dependency
may fall into a recursion in which Babel attempts to transpile
react-native/babel-preset. To reduce the risks of stumbling upon such
problems, move Babel's configuration inside the Webpack configuration
file.
2016-10-12 10:31:52 -05:00
Lyubomir Marinov d55e0f70d9 Import jitsi/jitsi-meet-react#2f23d98
As an intermediate step on the path to merging jitsi-meet and
jitsi-meet-react, import the whole source code of jitsi-meet-react as it
stands at
2f23d98424
i.e. the lastest master at the time of this import. No modifications are
applied to the imported source code in order to preserve a complete
snapshot of it in the repository of jitsi-meet and, thus, facilitate
comparison later on. Consequently, the source code of jitsi-meet and/or
jitsi-meet-react may not work. For example, jitsi-meet's jshint may be
unable to parse jitsi-meet-react's source code.
2016-10-12 10:31:52 -05:00
Ilya Daynatovich 429325ca6d Add main file for switch theming 2016-10-12 12:08:45 +03:00
yanas 1238ffbc40 Merge branch 'BeatC-jit/dialogs-redesign' 2016-10-11 19:10:43 -05:00
yanas e24d5da0ef Fix eslint errors 2016-10-11 19:09:16 -05:00
yanas 74f31db434 Dialogs re-design, invite and password modifications 2016-10-11 19:08:24 -05:00
damencho a2c71d05e6 Calculates quality based on the resolution and upload. 2016-10-11 14:54:22 -05:00
hristoterezov e5503deadd feat(RingOverlay): Add interfaceConfig option for disabling ringing 2016-10-11 10:17:41 -05:00
Дамян Минков d5541f612f Merge pull request #994 from jitsi/disable_dominant_speaker_indicator
feat(SmallVideo.js): New interface.config property for dominant speaker icon disable
2016-10-10 22:23:21 -05:00
hristoterezov 8fafd2b4ea feat(SmallVideo.js): New interface.config property for dominant speaker icon disable 2016-10-10 17:37:21 -05:00
ibauersachs f66555a88f Commit from translate.jitsi.org by user ibauersachs.: 265 of 265 strings translated (0 fuzzy). 2016-10-09 08:36:48 +00:00
ibauersachs ab895280f4 Commit from translate.jitsi.org by user ibauersachs.: 265 of 265 strings translated (0 fuzzy). 2016-10-09 08:36:39 +00:00
hristoterezov b9705b5eed Merge pull request #991 from jitsi/filmstripfix
Fixes desktop expansion on filmstirp shortcut hide.
2016-10-07 18:05:18 -05:00
Emil Ivov 224bbdf8a9 Fixes desktop expansion on filmstirp shortcut hide. 2016-10-07 17:27:32 -05:00
Lyubomir Marinov b8af817ea3 Merge branch 'restyle-toggle-state' 2016-10-07 15:59:16 -05:00
Lyubomir Marinov 231cd49916 Remove duplication 2016-10-07 15:31:00 -05:00
Lyubomir Marinov 35c1a77845 Merge branch 'master' into restyle-toggle-state 2016-10-07 14:09:12 -05:00
yanas 125e894624 Rename functions, fix jquery element ref and indentetation 2016-10-07 13:55:27 -05:00
hristoterezov 53cb40be4c fix(chat): Issue with position of chat messages 2016-10-07 11:23:33 -05:00
yanas 7e26625324 Merge pull request #983 from kkrisstoff/bug/make-HD-label-a-circle
border-radius for HD
2016-10-06 16:52:51 -05:00
yanas 0e9835dde2 Restyles the toolbar button toggle state 2016-10-06 16:25:15 -05:00
Lyubomir Marinov 1f66abac4d Merge branch 'analytics' 2016-10-06 15:46:55 -05:00
hristoterezov 6e4a710df6 feat(analytics): Add analytics permanent properties and use new paramenters format 2016-10-06 15:28:16 -05:00
Lyubomir Marinov 3f0aa500f7 Merge branch 'external_api' 2016-10-06 12:57:30 -05:00
Kostiantyn Pashura e868984116 border-radius for HD 2016-10-06 15:25:58 +03:00
hristoterezov 7f24d14832 refactor(conference.js) hangup functionality 2016-10-05 20:23:43 -05:00
hristoterezov 47d39ed5ca feat(iframe_api): Implement readyToClose event and hangup command 2016-10-05 16:33:09 -05:00
yanas 924bb3c7f7 Merge pull request #948 from m-voloshin/space-for-ptt
Spacebar is used to activate Push-To-Talk
2016-10-05 12:03:54 -05:00
yanas 3c8e704ace Merge pull request #973 from m-voloshin/remove-black-line
Removed black line from contact list and message list
2016-10-03 16:35:34 -05:00
yanas f2d6ff3426 Merge pull request #974 from m-voloshin/feedback-icon-padding
Fix padding for feedback button
2016-10-03 15:15:11 -05:00
hristoterezov 480f0c703a Merge pull request #976 from jitsi/eslint
ESLint
2016-10-03 12:53:57 -05:00
Lyubomir Marinov a2b076985a ESLint
Enable ESLint on jitsi-meet with the same configuration and the same
goals as in lib-jitsi-meet.
2016-10-03 11:12:27 -05:00
Maxim Voloshin 9babe4a44d Fix padding for feedback button 2016-10-03 15:47:45 +03:00
Maxim Voloshin d2c2936efa Removed black line from contact list and message list 2016-10-03 15:24:55 +03:00
yanas 98bc16801c Merge pull request #967 from jitsi/analytics_feedback
feat(analytics): Implement sendFeedback method
2016-10-01 12:25:19 -05:00
hristoterezov 71790b07b7 feat(analytics): Implement sendFeedback method 2016-09-30 17:28:32 -05:00
yanas 4ffe013165 Merge pull request #965 from jitsi/raise-hand-update
Updates raised hand to overwrite dominant speaker.
2016-09-30 12:14:58 -05:00
damencho 6320ef1caa Updates raised hand to overwrite dominant speaker. 2016-09-30 11:47:43 -05:00
hristoterezov d10158c9fb Merge pull request #964 from jitsi/webpack
Fix babel-preset-es2015's version
2016-09-30 11:20:26 -05:00
Lyubomir Marinov 92f1061db8 Fix babel-preset-es2015's version
The latest version of babel-preset-es2015 6.16.0 fails with 'Unsupported
preset format: undefined.' Use the previous one then.
2016-09-30 11:16:51 -05:00
Lyubomir Marinov c8f18040f6 Merge branch 'master' into webpack 2016-09-30 11:16:22 -05:00
hristoterezov 17b57ea852 Merge pull request #957 from jitsi/webpack
Switch from Browserify to Webpack
2016-09-30 10:32:36 -05:00
Lyubomir Marinov b2a70b263a Merge branch 'talk-muted' 2016-09-30 09:39:26 -05:00
Дамян Минков b3f0620f5b Merge pull request #963 from m-voloshin/destroy-tooltips
Completely remove attributes to destroy tooltip properly
2016-09-30 09:28:26 -05:00