Compare commits

...

1989 Commits
701 ... 1663

Author SHA1 Message Date
yanas
53e784094a Merge pull request #1308 from jitsi/ss_resize_remote
Fix for the size of remote desktop sharing videos
2017-02-08 15:31:06 -06:00
hristoterezov
0e92e48376 fix(ss): resize for remote videos 2017-02-08 14:58:42 -06:00
Lyubomir Marinov
4c9943ac38 Fix an image path on the mobile landing page 2017-02-08 12:41:51 -06:00
Дамян Минков
4bd0fd145d Merge pull request #1293 from jitsi/prosody_plugin_muc_all_owners
prosody plugin to make all users owners/moderators
2017-02-08 13:17:42 +02:00
Lyubomir Marinov
01ae82eb28 No Temasys alert on mobile Web 2017-02-07 21:54:08 -06:00
Lyubomir Marinov
e21eae0933 Prepare for webpack 2 2017-02-07 15:44:37 -06:00
Lyubomir Marinov
2f047c50dc Revert "No Temasys alert on mobile Web"
This reverts commit b09e86352f.
2017-02-07 15:21:34 -06:00
yanas
e397e1a80c Merge pull request #1303 from jitsi/no-temasys-alert-on-mobile
No Temasys alert on mobile (Web)
2017-02-07 15:11:09 -06:00
Lyubomir Marinov
b09e86352f No Temasys alert on mobile Web 2017-02-07 15:08:38 -06:00
Lyubomir Marinov
8687b69167 Consistency
Be consistent about formatting within 1 and the same file.
2017-02-07 08:29:40 -06:00
Lyubomir Marinov
6c5468d904 Simplify the source code
If half the file is written in ES6, it is easier to read if the rest of
the file is in ES6 as well. If ES6 is used, then const is better than
let. If source code is shorter yet as readable as the long version, then
prefer the short version.
2017-02-07 08:29:40 -06:00
Lyubomir Marinov
d6b0f8d4c5 Use functions, do not re-implement them
We have the functions reload and redirect which modify window.location.
Use them and do not directly modify window.location so that we have
fewer places of direct window.location modifications and it is easier to
refactor them.
2017-02-07 08:29:40 -06:00
Lyubomir Marinov
a8cd4ff12c 1, not 2 names for 1 and the same abstraction
window.location calls it reload so util/helpers shouldn't call it
redirect because UI/util/UIUtil has it is own redirect which is the
assign of window.location.
2017-02-07 08:29:40 -06:00
Lyubomir Marinov
8509efc8af Make the Web app aware of its context root 2017-02-07 08:27:23 -06:00
Saúl Ibarra Corretgé
23a0053dad doc: add section about embedding to the README 2017-02-06 17:41:19 -06:00
Saúl Ibarra Corretgé
5849980092 external_api: fix jsdoc 2017-02-06 17:41:19 -06:00
Saúl Ibarra Corretgé
e81fc2b254 doc: fix external API documentation
- use proper punctuation
- fix markdown syntax
- always use syntax highlighting
- document missing commands
- miscellaneous grammar fixes
2017-02-06 17:41:19 -06:00
Lyubomir Marinov
2ad869a036 Comply w/ coding style
- Use 1 name for 1 abstraction. Instead of useFullScreen and enabled use
  fullScreen.
- Comments are correct English sentences so no double spaces between
  senteces, no capitalization of the work On midsentence.
- Write as little source code as possible if readability is preserved.
- Utilize Facebook's Flow.
- The name of a private function must start with _ and the jsdoc should
  state that the function is private.
2017-02-06 15:32:03 -06:00
Saúl Ibarra Corretgé
7a8c84e990 [RN] Implement full screen mode while in a conference
The implementation varies across platforms, with the same goal: allow the app to
use the entire screen real state while in a conference.

On Android we use immersive mode, which  will hide the status and navigation bars.

https://developer.android.com/training/system-ui/immersive.html

On iOS the status bar is hidden, with a slide effect.
2017-02-06 13:51:17 -06:00
Lyubomir Marinov
0de01e93dd react-native 0.41.2 2017-02-06 12:24:38 -06:00
Lyubomir Marinov
6fa93e5b44 file-loader 0.10.0 2017-02-06 12:24:38 -06:00
Lyubomir Marinov
2144ec1e3f eslint 3.15.0 2017-02-06 12:24:38 -06:00
bgrozev
68d2f60ace Merge pull request #1276 from jitsi/respect-disable-rtx
fix: Respect the disableRtx config option.
2017-02-06 11:52:03 -06:00
George Politis
3d671ae71f docs: Documents the disableRtx config option. 2017-02-06 11:19:33 -06:00
Lyubomir Marinov
8ed47f9d99 [flow] Lint with Flow (in addition to JSHint and ESLint) 2017-02-03 16:36:14 -06:00
Lyubomir Marinov
b50f858556 [flow] Expand the coverage of flow-monitored files 2017-02-03 16:36:14 -06:00
Lyubomir Marinov
5de1a74429 [flow] Take advantage of flow-typed 2017-02-03 16:36:14 -06:00
Lyubomir Marinov
2063ad467d flow-typed 2017-02-03 16:36:14 -06:00
Lyubomir Marinov
679acbae16 Use babel-eslint in the whole project 2017-02-03 16:36:14 -06:00
Aaron van Meerten
a5b706a99e Added a prosody plugin for making all users into muc owners in prosody
Included a patch to prosody-trunk which allows owners to kick each other
2017-02-03 11:41:08 -06:00
yanas
542e61357e Adds new combined camera and mic icon 2017-02-02 17:10:02 -06:00
Lyubomir Marinov
3743602c67 [RN] Fix the parsing of the domain out of a URL 2017-02-02 13:40:49 -06:00
Lyubomir Marinov
ee651840bf Fixes related to coding style 2017-02-02 10:54:24 -06:00
damencho
0765c60d77 Moves feedback button as a component.
When callstats is not configured hide the button.
2017-02-02 10:06:17 -06:00
Lyubomir Marinov
7fa17322a1 Consistency in naming and jsdocs 2017-02-02 09:46:09 -06:00
Lyubomir Marinov
cfa3047330 [flow] Type annotations 2017-02-02 09:45:34 -06:00
Lyubomir Marinov
9e033deb7b Remove unnecessary source code 2017-02-02 09:42:14 -06:00
Lyubomir Marinov
f6c914f6f0 [flow] A minimal demonstration of flow in action 2017-02-01 13:38:37 -06:00
Lyubomir Marinov
06ff02c2a5 [flow] Ignore packages in node_modules that cause errors and we do not want to fix 2017-02-01 13:38:37 -06:00
Lyubomir Marinov
63fd263890 flow 0.36.0
The first step towards enabling Facbook's flow in the project. The flow
configuration is pristine as generated by react-native upgrade.
2017-02-01 13:38:37 -06:00
Lyubomir Marinov
94f3d4b279 [RN] Expand domains supported by Universal Links 2017-01-31 22:47:47 -06:00
Lyubomir Marinov
fdc96044ad [RN] App-specific URL scheme 2017-01-31 22:47:47 -06:00
Lyubomir Marinov
91487ffc94 Fix a case of endless recursion 2017-01-31 22:47:47 -06:00
Saúl Ibarra Corretgé
7a57dcc08a doc: add documentation on how to build the mobile apps 2017-01-31 22:32:15 -06:00
Дамян Минков
913a54713d Adds testing repo to readme. 2017-01-31 21:42:45 -06:00
damencho
39a8681e8e Improves safe checks for missing stats. 2017-01-30 17:01:25 -06:00
George Politis
a7015b0d1a fix: Respect the disableRtx config option. 2017-01-30 16:20:23 +00:00
Lyubomir Marinov
5305f23332 Consistent naming of functions
Until we make a decision on access modifier hints and adopt a respective
coding style, consistency is king.
2017-01-28 20:15:10 -06:00
Lyubomir Marinov
acbf3adab7 Simplify: Remove react/features/base/react-native 2017-01-28 20:13:54 -06:00
Lyubomir Marinov
366b2f1374 Simplify: Remove react/features/base/navigator 2017-01-28 19:56:35 -06:00
Lyubomir Marinov
2189ab7ee6 Consistent naming of react-redux's mapStateToProps
Until we make a decision on access modifier hints and adopt a respective
coding style, consistency is king.
2017-01-28 17:34:57 -06:00
Lyubomir Marinov
349c04d8d1 Consistent naming of functions
Until we make a decision on access modifier hints and adopt a respective
coding style, consistency is king.
2017-01-28 17:28:13 -06:00
Lyubomir Marinov
c7c6249ad7 [RN] Fix room name case sensitivity
It turns out that it is not enough to give lib-jitsi-meet the room name
in lower case. BOSH also needs the room name in lower case.
2017-01-28 17:26:09 -06:00
Lyubomir Marinov
5319227a8f Fix jsdocs 2017-01-28 12:11:24 -06:00
Lyubomir Marinov
3aff812ee2 Consistent naming of Component props mapped from the Redux state
Until we make a decision on access modifier hints and adopt a respective
coding style, consistency is king.
2017-01-27 21:36:20 -06:00
Lyubomir Marinov
88eabf23f4 Remove obsolete UnsupportedMobileBrowser functionality
The desired behavior of the button 'Start a conference' / 'Join the
conversation' is to launch the mobile app if installed; otherwise, do
nothing i.e. continue to display UnsupportedMobileBrowser.

Anyway, we may change our minds about allowing the user to continue in a
supported mobile browser so preserve the source code that enables that
but give it more appropriate naming.
2017-01-27 21:29:09 -06:00
Любомир Маринов
a70beaf7b6 Merge pull request #1265 from jitsi/api
api/api.html -> examples/api.html && rm doc/api
2017-01-27 20:11:23 -06:00
Lyubomir Marinov
c91bffa73c Merge branch 'saghul-android-audiomode' 2017-01-26 23:48:42 -06:00
Lyubomir Marinov
ea163dbbba Merge branch 'deduplicate-index-js' 2017-01-26 23:48:09 -06:00
Lyubomir Marinov
18bc99d6b5 Split long methods into multiple shorter ones 2017-01-26 23:35:56 -06:00
Lyubomir Marinov
bab94a207d Remove unnecessary source code 2017-01-26 21:08:50 -06:00
Lyubomir Marinov
ef39baab47 Comply w/ coding style
- Maximum of 80 characters per line.
- Group first and then sort in alphabetical order.
- Fields should begin with a lowercase letter.
2017-01-26 21:07:35 -06:00
Saúl Ibarra Corretgé
2edaaac7bf [RN] Implement AudioMode module on Android
This module chooses the most appropriate audio default based on the specified
mode.
2017-01-26 19:18:10 -06:00
Saúl Ibarra Corretgé
113e50c074 [RN] Bump Andoroid minimum and target SDK versions
Use a minimum SDK version of 19, that is Anroid 4.4 (KitKat) and a target SDK of
23, that is, Android 6.0 (Marshmallow).
2017-01-26 19:18:10 -06:00
Дамян Минков
900a675864 Merge pull request #1269 from jitsi/border-radius-fix
Fixes border radius.
2017-01-26 17:55:01 -06:00
Lyubomir Marinov
49b3b49f3e Remove duplication
The files react/index.native.js and react/index.web.js ended up having
very similar source code related to initializing the Redux store. Remove
the duplication.

Additionally, I always wanted the App React Component to be consumed
without the need to provide a Redux store to it.
2017-01-26 17:24:11 -06:00
yanas
23935d3d39 Fixes border radius. 2017-01-26 17:04:29 -06:00
Дамян Минков
3fd33d0f50 Merge pull request #1262 from jitsi/ui-fixes
Ui fixes
2017-01-26 10:15:39 -06:00
hristoterezov
8c3317b8e9 doc(iframe_api): api/api.html -> examples/api.html && rm doc/api 2017-01-26 10:02:34 -06:00
Lyubomir Marinov
99a9fc054f eslint 3.14.1 2017-01-26 09:39:47 -06:00
Lyubomir Marinov
967dcfc3d2 react-native-keep-awake 2.0.2 2017-01-26 09:39:20 -06:00
Lyubomir Marinov
0051b3b79c Clean up obsolete file references 2017-01-26 07:58:56 -06:00
Lyubomir Marinov
cbcee201f0 Comply w/ coding style 2017-01-26 07:58:46 -06:00
Ilya Daynatovich
1fa4a53a48 Remove rule 2017-01-26 07:27:31 -06:00
Ilya Daynatovich
6a0b92638c Introduce interceptComponent function 2017-01-26 07:27:31 -06:00
Ilya Daynatovich
2e81b8493e Introduce unsupported browser page 2017-01-26 07:27:31 -06:00
Ilya Daynatovich
57ba702dda Clean up routing logic 2017-01-26 07:27:31 -06:00
Lyubomir Marinov
62bafcaf63 Introduce Platform in React
React Native provides a Platform abstraction which React does not
provide.
2017-01-26 07:27:31 -06:00
Lyubomir Marinov
7de5c9c1d2 Comply w/ coding style 2017-01-26 07:27:31 -06:00
Ilya Daynatovich
8248b14555 Integrate Mobile landing in the Redux app 2017-01-26 07:27:31 -06:00
Ilya Daynatovich
23ef0c8d9d justify text on landing page 2017-01-26 07:27:31 -06:00
Ilya Daynatovich
58a4f59fd8 Implement Landing component 2017-01-26 07:27:31 -06:00
Ilya Daynatovich
0c851934fb layout for mobile landing 2017-01-26 07:27:31 -06:00
Emil Ivov
8d58dbee38 Restores api.md to original location 2017-01-25 19:14:30 -06:00
yanas
cd5e84e4ef Fixes network problem message position 2017-01-25 16:54:51 -06:00
yanas
09ba14eb04 Fixes video thumbnail border and large video background color 2017-01-25 16:53:58 -06:00
Boris Grozev
b22f1965aa doc: Remove obsolete reference to browserify. 2017-01-25 15:48:32 -06:00
Samuel Liard
df6f920b44 Force jquery-ui version to fix pb with beta version we can get with npm
Use Maven in place of ant
Add --host parameter for jicofo
Add build for jitsi Meet

Revert "Force jquery-ui version to fix pb with beta version we can get with npm"

This reverts commit 35a8641e62.
2017-01-25 15:47:23 -06:00
Дамян Минков
f13b2462c8 Merge pull request #1257 from saghul/ds-options-cleanup
cleanup: Remove default Chrome extension ID
2017-01-23 17:04:59 -06:00
Paweł Domas
c0e80c14f8 Merge pull request #1192 from jitsi/remotecontrol
Implement remote control support
2017-01-23 17:00:11 -06:00
hristoterezov
2b1176df53 style(remotecontrol): getRequestedParticipant method comments 2017-01-23 16:06:51 -06:00
hristoterezov
05bfbf5620 fix(remotecontrol): Execute Reciever.enable only when the value is changed 2017-01-23 15:29:25 -06:00
hristoterezov
4af706bd83 style(keycode): Comment 2017-01-23 15:29:25 -06:00
hristoterezov
b62e4d5ee9 fix(remotecontrol): Log level 2017-01-23 15:29:25 -06:00
hristoterezov
bd98d661d3 ref(remotecontrol): Moves hangup logic to remote control module 2017-01-23 15:29:25 -06:00
hristoterezov
1f7c5529e9 fix(remotecontrol): Pin the controlled participant only on remote control permissions granted 2017-01-23 15:29:25 -06:00
hristoterezov
0453346cf4 ref(remotecontrol): Pass the largeVideoWrapper as parameter to remote control module 2017-01-23 15:29:25 -06:00
hristoterezov
15090243d0 fix(API): JS errors caused by remote control merge 2017-01-23 15:29:25 -06:00
hristoterezov
b22e3ee253 style(remotecontrol): Fix JSDoc for RemoteControlEvent 2017-01-23 15:29:25 -06:00
hristoterezov
e693554961 fix(remotecontrol): Logging 2017-01-23 15:29:25 -06:00
hristoterezov
0efca9a9a8 fix(remotecontrol): Fixing issues after peer review. 2017-01-23 15:29:25 -06:00
hristoterezov
5d22061c0a fix(remotecontrol): Handle on-stage participant changes 2017-01-23 15:29:25 -06:00
hristoterezov
84be7fd739 fix(remotecontrol): import of remote control 2017-01-23 15:29:25 -06:00
hristoterezov
5d269ad0aa fix(remotecontrol): Disable the keyboard shortcuts during remote control 2017-01-23 15:29:25 -06:00
hristoterezov
a4d5c41b3a feat(remotecontrol): UI for requesting permissions 2017-01-23 15:29:25 -06:00
hristoterezov
846fb9abb0 feat(remotecontrol): Implement requesting remote control permissions 2017-01-23 15:29:25 -06:00
hristoterezov
0f33e59e4d feat(remotecontrol): announce remotecontrol support 2017-01-23 15:29:25 -06:00
hristoterezov
896650d005 feat(remotecontrol): Implement basic remote control support 2017-01-23 15:29:25 -06:00
Saúl Ibarra Corretgé
6d6b5a7917 cleanup: Remove default Chrome extension ID
It makes for a bad first-time experience for users, since the desktop sharing
button will be visible, but it will never work.

Also get rid of the now deprecated `desktopSharingChromeMethod` option.
2017-01-23 15:21:28 -06:00
Любомир Маринов
db5010be9d Merge pull request #1261 from jitsi/clean-css-module-update
Stick to clean-css version 3.x.
2017-01-23 15:18:18 -06:00
damencho
be8860080c Fixes build.
Starting version 4.x clean-css is split into two packages and we should depend on clean-css-cli for versions 4 and above. Tested it and we have currently some problem with it like fonts and images got referenced under css folder. So sticking version to 3.x for now.
2017-01-23 14:35:26 -06:00
Lyubomir Marinov
42f124b0f6 Fix typo 2017-01-23 13:01:12 -06:00
Lyubomir Marinov
7249ababb7 Provide microphone and camera usage descriptions
iTunes Connect/TestFlight requires these now and is not satisfied with
empty values anymore.
2017-01-23 12:11:48 -06:00
Lyubomir Marinov
079be92468 Revert "[RN][iOS] Make universal builds"
This reverts commit b96ca538e4. While iPad
support is nice to have, we are not ready for a publish in App Store.
During the upload to iTunes Connect, a verification of the .ipa fails
because:

- app icons for iPad are missing:
  - 76x76 pixels in .png format for iOS versions >= 7.0,
  - 167x167 pixels in .png format for iOS versions supporting iPad Pro,
  - 152x152 pixels in .png format for iOS versions >= 7.0,
- orientations required for iPad Mutitasking are missing:
  - UIInterfaceOrientationPortraitUpsideDown.
2017-01-23 11:26:15 -06:00
Lyubomir Marinov
dda2a2feba Automatic Xcode project file fixes 2017-01-22 16:02:57 -06:00
Lyubomir Marinov
ae726cfdc0 react-native 0.40.0 2017-01-22 12:32:08 -06:00
Saúl Ibarra Corretgé
1a04e5a9af [RN] Use a translucent status bar on Android 2017-01-21 15:42:13 -06:00
Lyubomir Marinov
cac68dbaba [RN] Increment short app version from 1.1 to 1.2
Now that Apple have approved build 1.1.185 for release in the App Store,
the short app version needs to be incremented; otherwise, no new builds
can be uploaded to TestFlight and, respectively, for release in the App
Store.
2017-01-20 15:01:01 -06:00
Lyubomir Marinov
3c04634609 Simplify
Simplify the source code (with the idea that source code which does not
exist does not have to be maintained).

Additionally, apply modifications to have the source code comply with the coding
style.

Overall, prepare saghul:audio-mode for merge into jitsi:master.
2017-01-20 14:06:15 -06:00
Saúl Ibarra Corretgé
6c12681b9c [RN][iOS] Default to speaker for video conferences 2017-01-20 14:06:15 -06:00
Saúl Ibarra Corretgé
b1b5f3e6f0 Add CONFERENCE_WILL_JOIN action
It's fired before creating the conference with lib-jitsi-meet.
2017-01-20 14:06:15 -06:00
bbaldino
5baa167a08 Sdp overhaul (#1234)
* M1: device change now uses new flow.  fundamentally "works" but may be corner cases/side effects to other flows. haven't touched ffox yet

* M2: change toggle screenshare flows to use the new video replacement chain

* remove the old 'useVideoStream' and replace it with the new one

* use the new (and renamed back from the shim) 'dispose' method

* tweaks to work with the sdp overhaul changes in lib-jitsi-meet

* change the order in which we call dispose (to handle dispose being reverted back to how it is currently on master)

* move useAudioStream over to new flow

* restore useVideoStream doc

* handle rename JitsiConference::replaceStream -> JitsiConference::replaceTrack

* fix useAudioStream and useVideoStream to return a promise again
2017-01-19 12:46:10 -06:00
ibauersachs
343d17d19a Commit from translate.jitsi.org by user ibauersachs.: 99 of 298 strings translated (18 fuzzy). 2017-01-18 23:58:43 +00:00
ibauersachs
0370cc47fc Commit from translate.jitsi.org by user ibauersachs.: 140 of 298 strings translated (15 fuzzy). 2017-01-18 23:58:36 +00:00
ibauersachs
083fc955dc Commit from translate.jitsi.org by user ibauersachs.: 237 of 298 strings translated (17 fuzzy). 2017-01-18 23:58:30 +00:00
ibauersachs
a6e268f784 Commit from translate.jitsi.org by user ibauersachs.: 128 of 298 strings translated (14 fuzzy). 2017-01-18 23:58:23 +00:00
ibauersachs
7e0a9bc37c Commit from translate.jitsi.org by user ibauersachs.: 138 of 298 strings translated (14 fuzzy). 2017-01-18 23:58:16 +00:00
ibauersachs
f25bc818d7 Commit from translate.jitsi.org by user ibauersachs.: 298 of 298 strings translated (0 fuzzy). 2017-01-18 23:58:05 +00:00
ibauersachs
9beae22803 Commit from translate.jitsi.org by user ibauersachs.: 237 of 298 strings translated (17 fuzzy). 2017-01-18 23:57:58 +00:00
ibauersachs
920b0af269 Commit from translate.jitsi.org by user ibauersachs.: 298 of 298 strings translated (0 fuzzy). 2017-01-18 23:57:51 +00:00
ibauersachs
6c674bef2a Commit from translate.jitsi.org by user ibauersachs.: 129 of 298 strings translated (14 fuzzy). 2017-01-18 23:57:44 +00:00
ibauersachs
e74fbbb38b Commit from translate.jitsi.org by user ibauersachs.: 298 of 298 strings translated (0 fuzzy). 2017-01-18 23:57:29 +00:00
ibauersachs
fb3f916802 Commit from translate.jitsi.org by user ibauersachs.: 237 of 298 strings translated (17 fuzzy). 2017-01-18 23:57:21 +00:00
ibauersachs
c80d47d3dd Commit from translate.jitsi.org by user ibauersachs.: 192 of 298 strings translated (21 fuzzy). 2017-01-18 23:57:14 +00:00
ibauersachs
693ee1dcf8 Commit from translate.jitsi.org by user ibauersachs.: 237 of 298 strings translated (17 fuzzy). 2017-01-18 23:57:06 +00:00
Дамян Минков
640c0faff1 Merge pull request #1253 from jitsi/api_participant_count
Iframe API - participant count
2017-01-18 14:52:59 -06:00
hristoterezov
207ac47aa7 fix(iframe_api): s/getNumberOfParticipant/getNumberOfParticipants 2017-01-18 14:24:41 -06:00
hristoterezov
8844f83a59 feat(iframe_api): Add api.html to doc for example and testing purpose 2017-01-18 14:24:40 -06:00
hristoterezov
4a5a1cd5f4 fix(iframe_api): Remove enable/disable events 2017-01-18 14:24:21 -06:00
hristoterezov
09d63d38ab fix(iframe_api): prevents multiple execution of listeners per event 2017-01-18 13:24:30 -06:00
hristoterezov
6bf0f9b2ec feat(iframe_api): get number of participants 2017-01-18 13:20:32 -06:00
Lyubomir Marinov
f6fdd3ce70 Don't show watermarks in film strip-only mode even for guests 2017-01-17 21:54:17 -06:00
Lyubomir Marinov
d1f6679f2d [RN] Remove Crashlytics 2017-01-17 21:54:17 -06:00
Lyubomir Marinov
b8a6eb4768 Fix the checkbox to disable the Welcome page
Recently, we reimplemented the Welcome page in React. Unfortunately, we
broke the checkbox that enables/disables the Welcome page and it would
allow checking but wouldn't allow unchecking.
2017-01-17 16:20:43 -06:00
Lyubomir Marinov
6efad1348a Fix the display of watermarks in film strip-only mode
Recently, we reimplemented the watermarks in React. Unfortunately, we
didn't take into account film strip-only mode.

Additionally, we duplicated watermark-related source code on the Welcome
and Conference pages.
2017-01-17 16:20:13 -06:00
Lyubomir Marinov
eaed9db1e7 Name folders consistently 2017-01-17 08:53:23 -06:00
Lyubomir Marinov
4f8b7a934c Comply w/ coding style 2017-01-17 08:32:20 -06:00
Lyubomir Marinov
71c04936af Merge branch 'actions-rename' of https://github.com/saghul/jitsi-meet into saghul-actions-rename 2017-01-17 08:18:52 -06:00
Любомир Маринов
41da758946 Merge pull request #1242 from saghul/ipad
Enable universal builds
2017-01-16 19:56:29 -06:00
Saúl Ibarra Corretgé
acbfe5cb09 [RN] Keep device screen on while in a conference 2017-01-16 19:12:43 -06:00
Lyubomir Marinov
ba3d65c01f Fix d17cc9fa
A bug was discovered in d17cc9fa which would raise a failure to push
into the browser's history if a base href was defined. Fix the failure
by removing react-router. Anyway, the usage of react-router was
incorrect because the app must hit the server infrastructure when it
enters a room because the server will choose the very app version then.
2017-01-15 18:28:02 -06:00
Lyubomir Marinov
856732abab Preserve URLs 2017-01-15 17:46:34 -06:00
Lyubomir Marinov
5f21e4c5b6 Introduce Platform in React
React Native provides Platform.
2017-01-15 12:09:52 -06:00
Lyubomir Marinov
28b44cf67c Consistency 2017-01-15 12:09:02 -06:00
Дамян Минков
674b0e706c Merge pull request #1241 from jitsi/iframe_api_avatars
feat(iframeAPI): implement avatar change commands
2017-01-12 17:08:13 -06:00
Saúl Ibarra Corretgé
b96ca538e4 [RN][iOS] Make universal builds 2017-01-12 16:24:01 -06:00
Saúl Ibarra Corretgé
3266ace916 [RN][iOS] Set deployment target to 9.0
According to Apple iOS devices with versions < 9.0 are 6%.
https://developer.apple.com/support/app-store/
2017-01-12 16:20:03 -06:00
hristoterezov
f7ce8d028d feat(iframeAPI): implement avatar change commands 2017-01-12 15:53:17 -06:00
Дамян Минков
85e5b0fc31 Merge pull request #1240 from jitsi/ilmstriponly_ui
fix(filmstrip_only): Remove unrelated UI elements
2017-01-12 15:24:32 -06:00
hristoterezov
61f4b52a15 fix(filmstrip_only): Remove unrelated UI elements 2017-01-12 14:51:53 -06:00
Lyubomir Marinov
d17cc9fa86 Merge branch 'BeatC-BeatC-moving-conference-init-to-react-1' 2017-01-12 12:24:25 -06:00
Lyubomir Marinov
1f995cffe9 eslint 3.13.1, react 15.4.1, react-redux 5.0.2 2017-01-12 11:01:12 -06:00
Lyubomir Marinov
0936d54114 Merge branch 'master' into BeatC-BeatC-moving-conference-init-to-react-1 2017-01-12 10:37:36 -06:00
Lyubomir Marinov
0912dbf130 Remove duplication, simplify, comply with coding style 2017-01-12 10:37:01 -06:00
Дамян Минков
7dd566a591 Merge pull request #1238 from jitsi/filmstriponly_jserrors
fix(filmstrip_only): JS errors
2017-01-11 19:18:51 -06:00
hristoterezov
0f9bc766db fix(filmstrip_only): JS errors 2017-01-11 17:16:43 -06:00
Saúl Ibarra Corretgé
e71e6c5b79 Name Redux actions consistently
Redux actions which represent "commands" should be imperative, and those
representing events should use the past tense.
2017-01-11 13:11:11 -06:00
Lyubomir Marinov
4d5f82633b Merge branch 'master' into BeatC-BeatC-moving-conference-init-to-react-1 2017-01-10 13:07:19 -06:00
Lyubomir Marinov
2f01746c55 Remove duplication, simplify, comply with coding style 2017-01-10 13:06:18 -06:00
yanas
7ec5b34548 Merge pull request #1232 from jitsi/fix-adjust-layout
Fixes and adjustments of UI layout
2017-01-10 11:20:34 -06:00
yanas
1604fa6584 Fixes and adjustments of UI layout 2017-01-09 15:32:25 -06:00
Lyubomir Marinov
b67994235e Merge branch 'BeatC-moving-conference-init-to-react-1' of https://github.com/BeatC/jitsi-meet into BeatC-BeatC-moving-conference-init-to-react-1 2017-01-09 07:44:02 -06:00
Lyubomir Marinov
ee1358fae3 Merge branch 'saghul-no-welcome-autofocus' 2017-01-06 13:19:33 -06:00
Lyubomir Marinov
9fae5aa02f Merge branch 'no-welcome-autofocus' of https://github.com/saghul/jitsi-meet into saghul-no-welcome-autofocus 2017-01-06 13:19:12 -06:00
Lyubomir Marinov
a887beed3a [RN] Increment short app version from 1.0 to 1.1
Now that Apple have approved build 1.0.178 for release in the App Store,
the short app version needs to be incremented; otherwise, no new builds
can be uploaded to TestFlight and, respectively, for release in the App
Store.
2017-01-06 10:34:46 -06:00
Saúl Ibarra Corretgé
8a30d44042 [RN] Disable autofocus on the welcome screen
This prevents the keyboard from showing up right when the app opens.
2017-01-06 16:08:01 +01:00
Lyubomir Marinov
4fef8a3b79 [RN] Prevent unhandled JS errors from killing the process in Release 2017-01-05 15:06:41 -06:00
Ilya Daynatovich
ad9bdf4dd2 Fix url params stripping 2017-01-04 19:01:25 +02:00
hristoterezov
29001c3ab0 Merge pull request #1228 from jitsi/fix-menu-icon
Fix(RemoteVideo): Fixes remote video menu icon
2017-01-04 10:18:41 -06:00
yanas
a5387b054a Fix(RemoteVideo): Fixes remote video menu icon 2017-01-04 10:14:53 -06:00
Ilya Daynatovich
c2757469a5 Merge branch 'master' into BeatC-moving-conference-init-to-react-1 2017-01-04 17:53:13 +02:00
Ilya Daynatovich
ed1aa700d0 remove asterisk symbol from jsdoc 2017-01-04 17:47:27 +02:00
Ilya Daynatovich
58b5e1748f editions after rebase 2017-01-04 17:47:27 +02:00
Ilya Daynatovich
a99bbe67ab Clean up Conference component 2017-01-04 17:47:27 +02:00
Ilya Daynatovich
f53fb3d814 Introduced new actions and functions for app initialization 2017-01-04 17:46:47 +02:00
Ilya Daynatovich
e716c1738c Fix lint errs 2017-01-04 17:46:47 +02:00
Ilya Daynatovich
3190bfa058 Move redundant code from app.js 2017-01-04 17:45:52 +02:00
Ilya Daynatovich
c570b80d7b moved app initialization to react app 2017-01-04 17:45:52 +02:00
yanas
2f9887245a Merge pull request #1226 from jitsi/guests-watermark
Adds an option to show watermark only for guests.
2017-01-04 09:43:25 -06:00
damencho
6006333ccf Adds an option to show watermark only for guests. 2017-01-03 17:30:57 -06:00
Lyubomir Marinov
fd6c91715f Merge branch 'fix-mobile-toolbar-initial-timeout' 2017-01-03 15:27:22 -06:00
Lyubomir Marinov
a40b6a9df8 Merge branch 'master' into fix-mobile-toolbar-initial-timeout 2017-01-03 15:12:53 -06:00
yanas
d67b7c7f49 Fix(React/conference): Fix jsdocs 2017-01-03 15:09:52 -06:00
yanas
616ab0f635 Fix(mobile/conference): Move the initial call to the componentDidMount method 2017-01-03 15:06:47 -06:00
yanas
930e65da66 Fix(React/conference): Sets an initial toolbar view timeout 2017-01-03 14:53:52 -06:00
yanas
414a978b10 Merge pull request #1224 from jitsi/fix-close-page-redirect
Removes guest parameter when navigating to close page.
2017-01-03 14:37:54 -06:00
damencho
4ebefb17e9 Removes guest parameter when navigating to close page.
Using sessionStorage to save whether user is guest or not.
2017-01-03 14:15:32 -06:00
Дамян Минков
c46772015b Merge pull request #1217 from BeatC/fix-watermarks
Fixes issue with watermarks and interface configs.
2016-12-30 16:34:39 -06:00
Дамян Минков
677eef12dd Updates use of showJitsiWatermark. 2016-12-30 12:07:54 -06:00
hristoterezov
cd03b29ece Merge pull request #1219 from jitsi/guest-hint
Adds an option for guest only hint
2016-12-30 11:41:23 -06:00
damencho
63aa60f2d6 Adds an option for a hint message shown only to guests. 2016-12-30 10:59:21 -06:00
damencho
282defc54c Pass parameter to close page about current participant is it guest. 2016-12-30 10:58:21 -06:00
damencho
593de63d49 Adds utils to the close page and an id to the hint question div. 2016-12-30 10:19:58 -06:00
Ilya Daynatovich
5bb53ba036 Fix issue with watermarks 2016-12-30 13:34:03 +02:00
damencho
3c369a4c67 Fixes missing ssi for logging_config.js when meet served from jetty. 2016-12-29 11:18:39 -06:00
damencho
83aeb99b95 Commit from translate.jitsi.org by user damencho.: 202 of 298 strings translated (21 fuzzy). 2016-12-27 19:49:38 +00:00
ibauersachs
188d53ef94 Commit from translate.jitsi.org by user ibauersachs.: 298 of 298 strings translated (0 fuzzy). 2016-12-24 10:48:32 +00:00
ibauersachs
961cf7edbb Commit from translate.jitsi.org by user ibauersachs.: 298 of 298 strings translated (0 fuzzy). 2016-12-23 13:16:05 +00:00
damencho
2c5a5816c4 Adds some accessibilityLabels that can be used for testing. 2016-12-22 17:28:57 -06:00
yanas
96a6f2dfd6 Merge pull request #1212 from jitsi/react-native-ui-modifications-more
React native ui modifications
2016-12-22 14:41:43 -06:00
Дамян Минков
35be17cfc9 Merge pull request #1208 from jitsi/caps
Remove strophe-caps dependancy
2016-12-22 11:13:08 -05:00
yanas
8d90a7d091 Fix(react): Fixes black border on text input in welcome page 2016-12-21 18:09:30 -06:00
yanas
4a71c2655a Fix(react): Make in call buttons appear by default 2016-12-21 18:07:32 -06:00
yanas
043fd6e259 Fix(React): Modifies thumbnail icon positions and layout 2016-12-21 16:32:56 -06:00
yanas
7722e14117 Adjusts the size of secondary toolbar button 2016-12-21 15:00:24 -06:00
yanas
5e377d3694 Fix underlining on welcom text input on android 2016-12-21 15:00:24 -06:00
yanas
f512583973 fix(react-toolbars): Adjusts some styles and icons in mobile toolbars 2016-12-21 15:00:24 -06:00
yanas
5fce7f6ba2 Updates the react native font. 2016-12-21 15:00:24 -06:00
yanas
dfe1666530 feat(fonts): Adds a new icon to the font 2016-12-21 15:00:24 -06:00
hristoterezov
41f0069a22 fix(caps): remove strophe-caps dependancy 2016-12-19 14:58:18 -06:00
Lyubomir Marinov
9f332ffcec [iOS] Synthesize IPv6 addresses 2016-12-17 04:03:10 -06:00
Lyubomir Marinov
891bd7f346 react-redux 5.0.1, babel-loader 6.2.10, eslint 3.12.2, eslint-plugin-react-native 2.2.1 2016-12-15 21:01:44 -06:00
Lyubomir Marinov
4810249301 Simplify. Comply w/ coding style. 2016-12-15 21:00:06 -06:00
Ilya Daynatovich
984a6519fc Move welcome page logic from jquery to react 2016-12-15 07:55:43 -06:00
Ilya Daynatovich
986f13ef1a Made editions in PR 2016-12-15 07:54:17 -06:00
Ilya Daynatovich
83dd56d34c Move roomname generator to React 2016-12-14 23:59:02 -06:00
Paweł Domas
b646e8d213 Merge pull request #1197 from jitsi/reload_on_error
Reload when resource fails to load
2016-12-13 19:32:55 -06:00
yanas
2785e76e23 fix(index.html): minor variable optimisation 2016-12-13 18:43:45 -06:00
yanas
c5cacd7955 fix(index.html): UI adjustments 2016-12-13 18:19:49 -06:00
paweldomas
62532b5879 feat(index.html): add safeguards to the reload delay value
If the page reload value is not within specific range it will be
adjusted to a default of 10 seconds.
2016-12-13 13:57:11 -06:00
paweldomas
7e22f9c57b feat(index.html): hide the missing filename by default 2016-12-13 13:53:28 -06:00
paweldomas
d9017b2665 feat(index.html): update "failed to load the page" msg
Also adds a link to reload manually.
2016-12-13 07:33:27 -06:00
Lyubomir Marinov
4571a4c048 Simplify Redux reducer source code 2016-12-13 03:15:32 -06:00
Lyubomir Marinov
80685395ed [RN] Room lock 2016-12-13 03:15:32 -06:00
Lyubomir Marinov
38b9819b68 Fix/remove Redux state mutation 2016-12-13 03:15:32 -06:00
paweldomas
a4dcf5f8df feat(index.html): reload when resource fails to load
The page will be reloaded if any of the mandatory scripts/resources
fails to load. The reload will be delayed with exponential backoff
starting from 2 seconds. The retry attempt counter is passed as
'rCounter' query attribute.
2016-12-12 15:53:07 -06:00
Lyubomir Marinov
9a49a01713 [RN] Room lock button 2016-12-12 13:49:45 -06:00
hristoterezov
8c3fb54d3d Merge pull request #1194 from bgrozev/disable-suspend-video
config: Disable suspend video by default.
2016-12-12 13:07:00 -06:00
Boris Grozev
7707e384c5 config: Disable suspend video by default. 2016-12-12 10:37:36 -06:00
Lyubomir Marinov
a09b8ce56e React Native 0.39.2 2016-12-11 22:21:51 -06:00
Lyubomir Marinov
7ecafb1e69 [RN] Join password-protected rooms 2016-12-11 22:21:51 -06:00
Lyubomir Marinov
9f93ce86be [RN] Simplify the source code 2016-12-11 22:21:51 -06:00
Lyubomir Marinov
a5773f1d0b [RN] Links to Send feedback and Privacy (policy) 2016-12-11 22:21:51 -06:00
Lyubomir Marinov
d72813340e Fix the (visual) style of toggle camera facing mode 2016-12-11 22:21:51 -06:00
Lyubomir Marinov
daf56455a5 Use Symbol for Redux action types to prevent conflicts 2016-12-11 22:21:51 -06:00
Дамян Минков
f58d7fc3cc Adds download links to readme. 2016-12-09 17:45:02 -06:00
Illia Daynatovich
4584d89c43 Rewrite with ES6 2016-12-08 19:21:29 -06:00
Illia Daynatovich
1cc2b388a2 webpack-dev-server 2016-12-08 19:21:29 -06:00
Lyubomir Marinov
51a1a7ed22 [RN] Clarify, simplify the source code 2016-12-07 16:08:35 -06:00
Lyubomir Marinov
99c2b60a1d [RN] Catch Promise rejection 2016-12-07 16:06:16 -06:00
Lyubomir Marinov
de5cd53f85 [RN] Allow uppsercase letters in room names 2016-12-07 16:04:52 -06:00
Lyubomir Marinov
f027a8f74f [RN] Use fetch instead of XHR 2016-12-07 16:00:54 -06:00
damencho
7d81ec4d86 Simplifies dependencies, removes possible circular dependency. 2016-12-07 11:14:20 -06:00
hristoterezov
a6fed4da65 Merge pull request #1184 from jitsi/separate-disconnect-overlay
Separate disconnect overlay
2016-12-07 10:44:56 -06:00
yanas
ce42d3ab5d Fixes unnecessary parameter 2016-12-07 10:24:37 -06:00
Lyubomir Marinov
d939ae5fb2 Rename the package of the Android app 2016-12-06 17:23:39 -06:00
yanas
642fa8d6f8 Fixes some issues pointed out from hristoterezov 2016-12-06 17:05:32 -06:00
Lyubomir Marinov
8f02b9249e Clarify error message with details 2016-12-06 16:49:38 -06:00
Lyubomir Marinov
7487684301 React Native 0.39.0 2016-12-06 15:52:53 -06:00
Lyubomir Marinov
02e3f6b3a2 Reduce the complexity of the source code 2016-12-06 15:42:06 -06:00
Lyubomir Marinov
727df551e6 Merge branch 'android-version' 2016-12-06 14:26:50 -06:00
damencho
e5dc7058c1 Adds android version variable.
The variables in gradle.properties can be overridden on command line like: -Pversion=1.
2016-12-06 13:57:38 -06:00
yanas
c9488d5ee9 Separate disconnect overlay. 2016-12-05 23:38:30 -06:00
yanas
4720088039 Merge pull request #1182 from jitsi/reduce-app.bundle.min.js
Reduce the impact of aui, aui-experimental, and jQuery-Impromptu on t…
2016-12-05 18:00:17 -06:00
Lyubomir Marinov
96a18ab2d5 [RN] Change 'Privacy Policty' and 'Terms of Service' to 'Terms and Conditions' 2016-12-05 11:33:37 -06:00
Lyubomir Marinov
137aace970 Merge branch 'fix_ring_overlay' 2016-12-04 13:29:31 -06:00
Lyubomir Marinov
4a8eca2020 Reduce the impact of aui, aui-experimental, and jQuery-Impromptu on the size of the minimized app bundle 2016-12-03 19:26:19 -06:00
hristoterezov
23efa7827c fix(filmstrip): JS error when the ringoverlay is shown 2016-12-02 16:23:12 -06:00
hristoterezov
fd24595baf Merge pull request #1180 from gerfigna/patch-2
Update api.md
2016-12-02 11:56:39 -06:00
Germán Figna
2331982e33 Update api.md
Fix videoConferenceJoined and videoConferenceLeft event names
2016-12-02 17:55:19 +01:00
Lyubomir Marinov
683fc84a28 Webpack's loaders are devDependencies 2016-12-02 10:11:47 -06:00
Illia Daynatovich
a0f5e5c8f8 Consistent spacing, closing in index.html 2016-12-02 09:11:06 -06:00
bgrozev
c9af2b956c Updates the manual installation docs
Adds the --host argument to the jicofo command, as suggested by exs on irc.
2016-12-01 18:11:41 -06:00
yanas
75b3bc6190 Merge pull request #1176 from jitsi/net_or_infra
Add 'isNetworkFailure' argument to PageReloadOverlay
2016-12-01 16:57:39 -06:00
paweldomas
6c716bcbb1 fix(conference.js): handle CONNECTION_DROPPED_ERROR 2016-12-01 15:55:00 -06:00
paweldomas
44beed6216 feat: distinguish between network and infra... failure 2016-12-01 11:38:44 -06:00
paweldomas
2352811c20 chore(package.json): use fixed version of Strophe
There was functionality added to lib-jitsi-meet that depends on
particular version of Strophe. It could be possibly broken without
testing the update.
2016-12-01 11:38:44 -06:00
Lyubomir Marinov
c1df375af4 Extend ./react/.eslintrc.js from ./.eslintrc.js 2016-12-01 08:30:35 -06:00
Дамян Минков
e8c631de01 Merge pull request #1174 from jitsi/fix-disabled-welcome-page
Fix disabled Welcome page broken with the introduction of React
2016-11-30 21:49:25 -06:00
Lyubomir Marinov
bdc67201e2 Fix disabled Welcome page broken with the introduction of React
The React-based rewrite looks whether there's a room name (in the
window's location) in order to choose between WelcomePage and
Conference. But app.js expects Conference to be rendered before it
builds a room name if WelcomePage is disabled and there's no room name.
A quick and dirty workaround is to render Conference within WelcomePage
so that the rendered result closely resembles index.html before the
React-based rewrite.
2016-11-30 19:54:09 -06:00
Lyubomir Marinov
0db33bb45c React propTypes as static class properties 2016-11-30 19:53:40 -06:00
Дамян Минков
9f26270a98 Merge pull request #1169 from jitsi/page_reload_reason
Log more details on page reload
2016-11-30 15:25:09 -06:00
paweldomas
df721cbd2e feat(analytics): add reason as label to page reload event 2016-11-30 14:30:44 -06:00
hristoterezov
8745efb81f Merge pull request #1158 from jitsi/log_collector
Log collector
2016-11-30 13:07:18 -06:00
yanas
e56f1a9ded Merge pull request #1167 from jitsi/fix_anonymous_domain
Fix the UI when anonymous domain auth is in use
2016-11-30 10:51:24 -06:00
Lyubomir Marinov
52fbb8f02c [RN] Fix React.PropTypes warning 2016-11-30 10:06:29 -06:00
Lyubomir Marinov
a1639b67a5 [RN] Don't display background colors underneath text on WelcomePage 2016-11-30 10:00:59 -06:00
paweldomas
3475ad4674 ref(LogCollector): adapts to caching in LogCollector 2016-11-30 07:38:39 -06:00
damencho
685d117a91 Fixes custom cert and key files for apache config. 2016-11-29 23:54:19 -06:00
damencho
e51f791ab0 Configures to use apache when this is the available web server. 2016-11-29 23:11:15 -06:00
yanas
0f2ba1cefe refactor(UIUtils): merges show and hide functions and cleans visibility setting 2016-11-29 15:07:18 -06:00
Lyubomir Marinov
1f457dfca5 Hyperlinks to legalese such as Privacy Policy and Terms of Service 2016-11-29 14:30:58 -06:00
Paweł Domas
841050953f Merge pull request #1172 from bgrozev/enable-tab-sharing
feat: Enables by default tab sharing for chrome.
2016-11-29 14:08:38 -06:00
Дамян Минков
c6296821c0 Merge pull request #1164 from gerfigna/patch-1
Update api.md. There is still work to be done, cause handling parameters in executeCommand is not currently correct and needs fixing. But for now displayname is the only command that requires a parameter.
2016-11-29 13:18:55 -06:00
paweldomas
7c8ca45d9a ref(LogCollector): extract JitsiMeetLogStorage 2016-11-29 11:30:37 -06:00
Boris Grozev
142f6e4518 feat: Enables by default tab sharing for chrome. 2016-11-29 11:30:02 -06:00
Lyubomir Marinov
f72e7ffbc2 Fix ESLint errors 2016-11-28 20:07:10 -06:00
Lyubomir Marinov
111b6e1c27 React Native 0.38.0, React 15.4.1 2016-11-28 20:07:10 -06:00
Дамян Минков
4add2d0590 Merge pull request #1168 from jitsi/exclude_build_dir
Add 'build' dir to jshintignore
2016-11-28 16:16:38 -06:00
Дамян Минков
cb0f7417b6 Merge pull request #1166 from jitsi/fix-reload-overlay-layout
fix(PageReloadOverlay):Basic layout fix
2016-11-28 16:00:35 -06:00
paweldomas
06eb7c6109 fix(jshintignore): exclude 'build' dir 2016-11-28 15:48:07 -06:00
damencho
4d0701cfda Fixes build. Wrong changelog file. 2016-11-28 14:18:23 -06:00
Дамян Минков
86bce1e5f6 Merge pull request #1152 from jitsi/deb-update
Updates debian packaging.
2016-11-28 13:45:51 -06:00
damencho
8da0d3a1f1 Removes dependencies to other components.
Now the web app can be installed separately from jicofo and jitsi-videobridge, or can be installed on machine running nginx or apache. Currently only nginx will be configured and apache config is left to user. Later we can add and the apache config. Renames jitsi-meet to jitsi-meet-web (just the web content) and jitsi-meet-web-config (configuring jetty, nginx or apache). A new jitsi-meet package will be introduced, a meta package depending on jicofo, jvb and the current packages.
2016-11-28 13:13:08 -06:00
hristoterezov
f32438b219 Merge pull request #1161 from jitsi/pinning-local-not-signal-unpin
Sending unpin after clicking local video and unpinning remote.
2016-11-28 12:06:56 -06:00
paweldomas
0238a10a4b fix(MessageHandler): hide the close button when 'persistent' 2016-11-28 11:05:18 -06:00
paweldomas
6669a96fd8 fix(Toolbar.js): hide recording and SIP buttons from the start 2016-11-28 11:05:18 -06:00
paweldomas
09406bfbfc fix(Toolbar): move login buttons to Profile
Authentication buttons no longer belong to the Toolbar.
2016-11-28 11:05:18 -06:00
paweldomas
51da40e90c ref(UIUtil): add showOrHideElement 2016-11-28 11:05:18 -06:00
paweldomas
52847bd28d fix(conference): crash with anonymous domain config 2016-11-28 11:05:18 -06:00
yanas
835d3c6a25 fix(PageReloadOverlay):Basic layout fix 2016-11-28 10:08:47 -06:00
Germán Figna
00e6e98a61 Update api.md 2016-11-24 11:34:24 +01:00
Lyubomir Marinov
6d90adcdf6 Fix make failure caused by npm link 2016-11-24 02:21:21 -06:00
Ilya Daynatovich
06d2fb0aca Optimize React in production 2016-11-24 02:21:21 -06:00
Ilya Daynatovich
c3428e8213 Split React components out of index.html 2016-11-24 02:21:02 -06:00
hristoterezov
57b0736ebb Merge pull request #1160 from jitsi/fix-unpinning-local-dominant-speaker
Fixes unpinning local user which is dominant speaker.
2016-11-23 17:40:47 -06:00
damencho
6211566c0c Sending unpin after clicking local video and unpinning remote.
If we:
 - pin a remote and click it, unpin is signalled.
 - pin a remote and the click another remote, the new one is pinned and signalled.
 - pin a remote and then click local. UI pins local, but unpinning remote is not signaled, fix addressed with this commit.
 - pin/unpin local, nothing is signalled.
2016-11-23 17:02:24 -06:00
Ilya Daynatovich
48bb427f71 The Makefile file format requires tab characters 2016-11-23 15:54:03 -06:00
hristoterezov
56f15356c7 Merge pull request #1159 from jitsi/non-focusable-close-toastr
Makes close button non-focusable.
2016-11-23 15:41:11 -06:00
damencho
8e6fd0ca95 Fixes unpinning local user which is dominant speaker.
It was not switching and staying on local video on unpinning, after change the last shown video will be used to switch to it.
2016-11-23 15:35:03 -06:00
damencho
b5dfc2a520 Makes close button non-focusable.
Prevents the close button to take focus while user clicks tab in the page, which will privent the toast to be closed.
2016-11-23 14:48:15 -06:00
Дамян Минков
4900fe020d Merge pull request #1156 from BeatC/fix-popover
Fix popover
2016-11-23 12:52:50 -06:00
paweldomas
94bd6bc330 feat(logging_config): add "disableLogCollector" option 2016-11-23 11:32:58 -06:00
paweldomas
36bcc6831b feat: use LogCollector to capture JS console logs 2016-11-23 11:32:58 -06:00
paweldomas
76c89845a8 feat: add logging config 2016-11-23 11:32:58 -06:00
paweldomas
b58f1cdd16 use logger instead of console 2016-11-23 11:32:55 -06:00
Ilya Daynatovich
141c64cd00 Add new variable 2016-11-23 12:32:59 +02:00
Ilya Daynatovich
51b802da84 fix problem with popover 2016-11-23 12:27:34 +02:00
yanas
71c27f308c Merge pull request #1155 from jitsi/removes-click-listeners
Removes click handlers when popup is hidden.
2016-11-22 17:33:30 -06:00
damencho
75b9adf01b Updates comments. 2016-11-22 17:31:01 -06:00
damencho
a079914603 Removes click handlers when popup is hidden. 2016-11-22 17:06:19 -06:00
yanas
4d3ca4a85a Merge pull request #1148 from jitsi/analytics
feat(Analytics): Multiple analytics handlers support
2016-11-22 13:53:02 -06:00
Lyubomir Marinov
afa1d5423c Merge branch 'prepare-for-react-1' 2016-11-21 21:00:13 -06:00
Ilya Daynatovich
766eb94c7d Prepare for React: Use Haste resolver for Web
In preparation for and as another early step in rewriting the Web
version of jitsi-meet using React, use Haste resolver which is able to
distinguish among platform-independent files, Web-specific and
mobile-specific ones.

Additionally, (1) make sure that Babel is capable of understanding React
files and (2) introduce React as a dependency.

The purpose is to repeatedly take small steps towards our goal and merge
them before they get in conflict with the separate ongoing advancement
of the Web version of jitsi-meet.
2016-11-21 20:26:50 -06:00
Дамян Минков
ad6e793615 Merge pull request #1146 from jitsi/adorable-io-avatars
fix: replace robohash avatars with adorable io
2016-11-21 10:00:57 -06:00
Paweł Domas
d900d3c3fd Merge pull request #1149 from jitsi/ss_resize
Fixes issue with not resizing properly if SS is on and the filmstrip is hidden
2016-11-18 12:42:11 -06:00
hristoterezov
7f315ef105 fix(VideoLayout): Issue with not resizing properly if SS is on and the filmstrip is hidden 2016-11-18 11:26:33 -06:00
hristoterezov
dc0a7e7628 feat(Analytics): Multiple analytics handlers support 2016-11-16 16:36:32 -06:00
yanas
6d1f42bf30 Merge pull request #1115 from jitsi/remove_css_classes
Removes unused css classes
2016-11-16 13:00:26 -06:00
yanas
c26b144f0d Merge pull request #1144 from kkrisstoff/chat-animation-fix
Chat animation fix
2016-11-16 12:45:40 -06:00
yanas
752f4dd5de Merge pull request #1141 from kkrisstoff/404-link-color
link class added
2016-11-16 11:24:48 -06:00
yanas
693ebbea9d Merge pull request #1143 from BeatC/visual-problems
Fix some ui bugs
2016-11-16 11:23:29 -06:00
yanas
b24a54aab2 fix: replace robohash avatars with adorable io 2016-11-16 11:06:25 -06:00
Konstantyn Pahsura
00aee89709 doc added 2016-11-16 14:09:22 +02:00
Дамян Минков
a5f243e18d Merge pull request #1142 from jitsi/fix-ff-desktop-sharing-message
fix: Firefox desktop sharing extension required dialog
2016-11-15 13:48:17 -06:00
yanas
d05ff9b4ee fix: Firefox desktop sharing extension required dialog 2016-11-15 12:41:24 -06:00
Konstantyn Pahsura
a67087b6de focus for chat changes 2016-11-15 20:18:40 +02:00
Ilya Daynatovich
e2ea16ea3f Fix some ui bugs 2016-11-15 16:37:09 +02:00
yanas
5098b64666 Merge pull request #1137 from BeatC/thumbnail-avatars
Thumbnail avatars
2016-11-14 17:47:59 -06:00
hristoterezov
66fbc28385 Merge branch 'kkrisstoff-add/tip-randomiser' 2016-11-14 15:02:58 -06:00
hristoterezov
4bcd75f15c refactor(close_pages): Refactor the close pages. 2016-11-14 15:02:27 -06:00
Konstantyn Pahsura
da6af88910 fixes and changes 2016-11-14 15:02:27 -06:00
Konstantyn Pahsura
1a91f4953b tip randomiser added 2016-11-14 15:02:27 -06:00
yanas
9a0d28720d Merge pull request #1139 from BeatC/FIX-adjust-branding1
Fix visual bugs in sidebar
2016-11-14 14:26:21 -06:00
hristoterezov
5b6956e25b Merge pull request #1101 from jitsi/stop_media_when_xmpp_drops
Stop the media when XMPP connection is dropped
2016-11-14 13:06:53 -06:00
Lyubomir Marinov
fd51108ae3 [iOS] Remove unnecessary CODE_SIGN_IDENTITY 2016-11-14 08:44:29 -06:00
Lyubomir Marinov
73a2eca51c [iOS] Strip unwanted architectures from embedded frameworks 2016-11-14 08:32:47 -06:00
Ilya Daynatovich
9bc24e1caa Fix aligning of indicator icon; Update logic for dynamically change of thumb indicators via font-size 2016-11-14 12:45:28 +02:00
Konstantyn Pahsura
3fc02bf6c2 link class added 2016-11-14 12:42:01 +02:00
Ilya Daynatovich
3bd4f1d5d8 Updated layout 2016-11-14 11:09:07 +02:00
Ilya Daynatovich
f3dbeea091 Make filmstrip indicators to resize dynamically 2016-11-14 11:09:07 +02:00
Ilya Daynatovich
d2ef94a7eb Fix problem with hint 2016-11-14 11:02:11 +02:00
Ilya Daynatovich
1d1d8defda Updated calculation of offset 2016-11-14 11:01:50 +02:00
Ilya Daynatovich
d0127b879d fixed dropdown colors 2016-11-14 11:01:50 +02:00
Ilya Daynatovich
cbc6943305 work on colors 2016-11-14 11:01:50 +02:00
Maxim Voloshin
9124aa2c87 Adjusted CSS for side toolbar elements 2016-11-14 11:01:50 +02:00
Lyubomir Marinov
8817f0c53d [iOS] Prepare for App Store release 2016-11-13 18:45:40 -06:00
Lyubomir Marinov
e4f9c17f8a [iOS] Prepare for App Store release 2016-11-13 18:27:23 -06:00
yanas
686ee1111a Merge pull request #1129 from BeatC/make-identical-text-input
Make identical text input
2016-11-11 15:45:46 -06:00
bgrozev
4b11767ac5 Merge pull request #1140 from jitsi/fix-desktop-sharing-screen-size
fix: desktop streming screen size
2016-11-11 13:53:39 -06:00
yanas
5545c0d905 fix: desktop streming screen size 2016-11-11 13:26:07 -06:00
bgrozev
611edf7e34 Merge pull request #1134 from jitsi/cosmetic-changes
Comment and empty lines removed
2016-11-11 13:18:41 -06:00
Lyubomir Marinov
7a37d70fb6 React Native 0.37.0 2016-11-11 11:57:25 -06:00
yanas
b2577090bd Merge pull request #1135 from BeatC/fix-js-from-styles-editions
Editions to "clean css from js"
2016-11-11 10:18:49 -06:00
Ilya Daynatovich
5b0777d4db Made inputs identical 2016-11-11 17:22:47 +02:00
Ilya Daynatovich
12c1574f07 renamed files 2016-11-11 17:13:18 +02:00
Ilya Daynatovich
5623a06996 renamed input-control block to form-control 2016-11-11 17:13:18 +02:00
Ilya Daynatovich
148960c6d2 made editions 2016-11-11 12:27:29 +02:00
yanas
ff8c6690ef Comment and empty lines removed 2016-11-10 17:27:19 -06:00
yanas
c926e95822 Merge pull request #1133 from jitsi/fix-tip-text-close-page
Modifies tip text in close page
2016-11-10 17:24:43 -06:00
yanas
0a28dd0cd3 Modifies tip text in close page 2016-11-10 17:02:34 -06:00
yanas
8caae4bfde Merge pull request #1111 from BeatC/FIX-clean-js-from-styles-1
Fix clean js from styles 1
2016-11-10 15:40:07 -06:00
yanas
a67c5a8dc7 Merge pull request #1108 from bgrozev/restrict-eslint-versions
chore: Only uses jslint 3+
2016-11-10 14:45:29 -06:00
yanas
cf38fde207 Updates to >= to match versions of 3+ 2016-11-10 14:20:30 -06:00
hristoterezov
4549b766f5 Merge pull request #1131 from jitsi/suspended-detection
Suspended detection
2016-11-10 13:45:14 -06:00
yanas
45126d4f3d Merge pull request #1132 from jitsi/calculate-correct-size-for-thumbnails
Calculate correct size for thumbnails
2016-11-10 13:17:32 -06:00
damencho
82926ef8c6 Detects suspended event, stops local video and shows overlay.
Also removes device change listener, cause when PC wakeups devices will be reconnected and we can try open the local video again.
2016-11-10 13:17:23 -06:00
yanas
42604971dc Merge pull request #1125 from BeatC/small-avatar-images
Fixed problem with resizing thumb avatars
2016-11-10 13:12:03 -06:00
yanas
95fcf5bae5 Change method name to fit better its purpose 2016-11-10 11:14:31 -06:00
Ilya Daynatovich
34acadc3b5 Rename method 2016-11-10 11:14:31 -06:00
Ilya Daynatovich
d3df082e3d Fix thumbnail overflow 2016-11-10 11:13:31 -06:00
Yana Stamcheva
fe7e9f333f [iOS] Fix launch screen text 2016-11-10 10:48:30 -06:00
Дамян Минков
92901e09e1 Merge pull request #1128 from BeatC/fix-toggle-filmstrip-shortcut
Moved keyboard initialization to filmstrip toolbar
2016-11-10 10:30:59 -06:00
Ilya Daynatovich
128b301a39 Fix the tests 2016-11-10 14:45:42 +02:00
Ilya Daynatovich
1b1b9475a4 Clean up js from styles 2016-11-10 13:32:12 +02:00
Ilya Daynatovich
5aff96e3b7 Updated in videolayout 2016-11-10 13:32:12 +02:00
Ilya Daynatovich
fb4e9b3c6d Work on fixing the tests 2016-11-10 13:32:12 +02:00
Ilya Daynatovich
a8a6b38c28 Updated method for showing/hiding elements 2016-11-10 13:32:12 +02:00
Maxim Voloshin
68ab87cc0d Hide DOM elements using css class 2016-11-10 13:32:12 +02:00
Ilya Daynatovich
986c29ca5d updated filmstrip handler 2016-11-10 12:18:33 +02:00
Yana Stamcheva
d7fc20b607 [iOS] Center launch screen text 2016-11-09 19:58:48 -06:00
damencho
96b280668d Adds suspend overlay. 2016-11-09 16:32:09 -06:00
Lyubomir Marinov
66b7404961 [iOS] Try to fix the launch screen 2016-11-09 15:06:07 -06:00
hristoterezov
7f3323f7c0 Merge pull request #1130 from jitsi/fix-stopping-sharedvideo
Stops player update before sending stopping of shared video.
2016-11-09 14:20:38 -06:00
damencho
e34d86b485 Stops player update before sending stopping of shared video.
We used to stop player updates on self presence received, so between stop and self presence we can send a playing update which will provoke adding the video again to other participants.
2016-11-09 12:42:47 -06:00
Lyubomir Marinov
34ea330aa3 [iOS] Try to fix the launch screen
The launch screen appears not centered and/or clipped on certain
devices. Unfortunately, I cannot reproduce it when I deploy the app to
devices and Simulator from Xcode 8.1. It may (or may very well not) be
that the Xcode version matters and the enterprise build server does
appear to use an older Xcode version.
2016-11-09 12:41:20 -06:00
Дамян Минков
70c3c1a21c Merge pull request #1102 from jitsi/limit_display_name
Limit long display names
2016-11-09 10:51:46 -06:00
hristoterezov
98d3755859 Merge pull request #1121 from jitsi/fix-two-panels-shown
Hides all side panels before showing new one.
2016-11-09 10:42:49 -06:00
hristoterezov
a4a1579c84 style(conference): Rename MAX_DISPLAYNAME_LENGTH 2016-11-09 10:22:43 -06:00
Ilya Daynatovich
20c6dba599 Moved keyboard initialization to filmstrip toolbar; Replaced toggle filmstrip button from extended toolbar 2016-11-09 12:41:23 +02:00
Lyubomir Marinov
056fc64f7a Try to fix the enterprise build of the iOS app
LaunchScreen.xib compiles locally with Xcode 8.1 but the enterprise
build fails. A possibility is that the enterprise build machine is
running an older Xcode version.
2016-11-08 18:14:43 -06:00
Yana Stamcheva
cb0ec3f702 [iOS] App icon(s) 2016-11-08 17:47:23 -06:00
yanas
084929f875 Merge pull request #1122 from jitsi/thumbnail-calculations
Thumbnail calculations
2016-11-08 17:40:46 -06:00
Yana Stamcheva
10f3f01da8 [iOS] Launch screen 2016-11-08 16:12:20 -06:00
Дамян Минков
1f75683581 Merge pull request #1055 from BeatC/incorrect-password-hint
Incorrect password hint
2016-11-08 14:29:06 -06:00
bgrozev
29b86a7fe3 Merge pull request #1126 from jitsi/fix-thumbnail-menu-css-class
fix: Use a separate css class for thumbnail menu
2016-11-08 12:20:55 -06:00
yanas
bb80bf4144 fix: Use a separate css class for thumbnail menu 2016-11-08 11:47:22 -06:00
yanas
92df64f706 fix: Adds a separate css class for thumbnail menu 2016-11-08 11:45:28 -06:00
Yana Stamcheva
fc3e0147e0 [Android] Launcher icons 2016-11-08 10:38:13 -06:00
Дамян Минков
b2d2209236 Merge pull request #1123 from bgrozev/log-pinned
Logs pinned/unpinned events
2016-11-08 10:16:01 -06:00
Ilya Daynatovich
f4e6dceaa4 Return Impormptu api when create dialog 2016-11-08 17:16:00 +02:00
Ilya Daynatovich
f09a9be523 Fixed problem with resizing thumb avatars 2016-11-08 13:36:43 +02:00
Ilya Daynatovich
2b08950294 Fix the tests 2016-11-08 13:18:10 +02:00
Ilya Daynatovich
62713bf87c Editions in PR 2016-11-08 13:18:10 +02:00
Ilya Daynatovich
7a2eca3706 fix reopening require pass dialog 2016-11-08 13:18:10 +02:00
Ilya Daynatovich
22b7142159 Add select input after incorrect input 2016-11-08 13:18:10 +02:00
Ilya Daynatovich
cba5528478 Move error color to theme 2016-11-08 13:18:10 +02:00
Ilya Daynatovich
5e8c5b3ce4 Add JSDoc 2016-11-08 13:18:10 +02:00
Ilya Daynatovich
d4df6f2dda Got rid of direct usage of room locker 2016-11-08 13:18:10 +02:00
Ilya Daynatovich
257bb49c52 Add Require password dialog 2016-11-08 13:18:09 +02:00
Boris Grozev
6740b9edf6 feat: Logs pin/unpin events via analytics. 2016-11-07 22:13:21 -06:00
Boris Grozev
cf241effbf style: Fixes indentation, spelling. 2016-11-07 21:23:33 -06:00
Boris Grozev
c0c198098b style: Renames variables, adds a FIXME. 2016-11-07 20:47:43 -06:00
Boris Grozev
ac0ee771ed docs: Adds a FIXME. 2016-11-07 20:45:52 -06:00
Boris Grozev
0ca9389e4b cleanup: Simplify code. 2016-11-07 20:39:28 -06:00
Boris Grozev
9910caf29f docs: Fix some documentation. 2016-11-07 20:38:14 -06:00
yanas
78dbaa9b21 Revert wrongly removed comment 2016-11-07 17:00:50 -06:00
yanas
5c956de99e Merges changes with latest master. 2016-11-07 16:50:08 -06:00
damencho
91340a5268 Hides all side panels before showing new one. 2016-11-07 14:30:02 -06:00
bgrozev
38e44440d0 Merge pull request #1114 from jitsi/fix_page_reload_log
Log the page reload from one place
2016-11-06 11:09:56 -06:00
yanas
02495e3b31 Merge pull request #1116 from jitsi/edit-displayname-overlap
Adds a property to hide display name and disable update view.
2016-11-05 10:19:31 -05:00
bgrozev
3360c62392 Merge pull request #1117 from jitsi/directory-name-casing-fix
Fixes casing of the tokendata directory.
2016-11-04 18:32:46 -05:00
Emil Ivov
05e9dfca92 Fixes casing of the tokendata command. 2016-11-04 17:41:16 -05:00
damencho
510c650b7b Adds a property to hide display name and disable update view.
Adds a property to hide display name and disable update view in SmallVideo. Localvideo hides displayName and disabled update view while users is editing its name and resumes normal behaviour when editing finishes.
2016-11-04 17:02:30 -05:00
hristoterezov
c41c219206 fix(Thumbnails): removes unused css classes 2016-11-04 15:24:05 -05:00
Lyubomir Marinov
4d335e086b Reduce the number of unnecessary Redux state changes 2016-11-04 13:28:47 -05:00
Lyubomir Marinov
3fa62c3757 Fix thumbnail reordering
Don't use Array.prototype.sort() because (1) it operates in place and,
thus, mutes the Redux state and (2) it is not necessarily stable and,
thus, unnecessarily shuffles the thumbnails.
2016-11-04 13:13:26 -05:00
paweldomas
d256bc317a fix(log): log the page reload from one place 2016-11-03 16:18:05 -05:00
yanas
101c413a3c Merge pull request #1110 from jitsi/filmstrip-button-editions
Filmstrip button editions
2016-11-03 15:46:00 -05:00
yanas
c3e0d7ff56 Fix conflicts. 2016-11-03 14:42:23 -05:00
Дамян Минков
826a7fd220 Merge pull request #1109 from jitsi/fix_toolbar_popups2
fix(toolbar): popups
2016-11-03 14:36:33 -05:00
Дамян Минков
e5607d0371 Merge pull request #1096 from kkrisstoff/task/video-thumbnail-menu-should-appear-on-hover
show/hide video thumbnail menu on hover
2016-11-03 13:52:08 -05:00
hristoterezov
b3b50fe346 fix(toolbar): popups 2016-11-03 13:47:15 -05:00
Boris Grozev
16a2b0377a chore: Only uses jslint 3+
because older versions don't work with our .jslintrc file
2016-11-03 13:18:56 -05:00
Ilya Daynatovich
8ba7a354e5 Remove duplicate event handler 2016-11-03 20:02:44 +02:00
Ilya Daynatovich
bbbd01b26c Adjustments in filmstrip section 2016-11-03 17:54:23 +02:00
Konstantyn Pahsura
e7d089c815 Merge branch 'jit/master' into task/video-thumbnail-menu-should-appear-on-hover 2016-11-03 17:30:19 +02:00
Ilya Daynatovich
24169743e7 Clean up filmstrip styles 2016-11-03 17:07:48 +02:00
Ilya Daynatovich
02ae3b3053 Add wrapper 2016-11-03 16:26:56 +02:00
Ilya Daynatovich
69e4f49e74 Add bunch of JSDocs 2016-11-03 16:21:14 +02:00
Ilya Daynatovich
1328870a2b fix bug with F shortcut 2016-11-03 16:21:14 +02:00
Ilya Daynatovich
51d48e18c6 Refactor filmstrip module 2016-11-03 16:21:14 +02:00
hristoterezov
4b1dfb9a33 Merge pull request #1095 from BeatC/shortcuts-reversed
Shortcuts reversed
2016-11-03 09:14:05 -05:00
Konstantyn Pahsura
9633919e32 css class for remote video specified 2016-11-03 15:40:43 +02:00
Konstantyn Pahsura
76e55f1132 show/hide menu if elem hovered 2016-11-03 15:40:43 +02:00
Ilya Daynatovich
30e717bd20 Rename classname; Refactor click on video method 2016-11-03 12:13:03 +02:00
Ilya Daynatovich
d703271c96 Fix bug with resizing when using shortcut for switching btw videos 2016-11-03 11:48:48 +02:00
Ilya Daynatovich
c6c701330a Change order of remote videos when clicking on shortcut 2016-11-03 11:48:48 +02:00
yanas
f02f050e56 Merge pull request #1106 from jitsi/disabled-sidepanels-load
Disables loading side panels when they are disabled.
2016-11-02 18:16:13 -05:00
damencho
f6609524ea Disables loading side panels when they are disabled.
Adds some safety checks for disabled contactlist.
2016-11-02 16:14:36 -05:00
Lyubomir Marinov
6eb767ba11 [React Native] Disable audio levels
The audio levels are gathered by lib-jitsi-meet via polling of
RTCPeerConnection.getStats() which is very slow on Android. Since the
mobile app makes no use of audio levels, it is easiest to disable them
for now in order to not penalize the app.
2016-11-02 14:44:42 -05:00
yanas
c4d0340956 Merge pull request #1034 from m-voloshin/FEATURE-hide-filmstrip
Filmstrip is extended with "Hide" button
2016-11-02 14:24:45 -05:00
hristoterezov
10f04575ed Merge pull request #1060 from kkrisstoff/task/toolbar-side-panel
make side panels init from js
2016-11-02 13:22:55 -05:00
Дамян Минков
a9c984e7db Merge pull request #1091 from BeatC/customer-agreement
Customer agreement
2016-11-02 13:18:33 -05:00
yanas
03fd87476a Merge pull request #1104 from BeatC/adjust-notification-width
Adjusted notification width
2016-11-02 12:40:05 -05:00
Дамян Минков
317f0e736c Merge pull request #1105 from jitsi/fix_frozen_msg
fix(LargeVideoManager): frozen displayname in a msg
2016-11-02 11:58:58 -05:00
Konstantyn Pahsura
9f280e320d _.template removed 2016-11-02 18:42:39 +02:00
Konstantyn Pahsura
a1e098680d make side panels init from js 2016-11-02 18:42:39 +02:00
paweldomas
ede4808ec4 fix(LargeVideoManager): frozen displayname in a msg
The "data-i18n-options" attribute value is stored in jQuery cache and
at the time when i18-next tries to access it to do the translation
it gets the old value from the cache and the message is not updated
correctly. Passing the "msgOptions" explicitly to "translateElement"
fixes the problem by avoiding jQuery cache.
2016-11-02 11:32:40 -05:00
yanas
e86294191a Merge pull request #1098 from BeatC/toolbar-splitter-restyle
Restyled toolbar splitter
2016-11-02 09:27:08 -05:00
yanas
0bf372b8ab Merge pull request #1103 from jitsi/esc-shortcuts-dialog
Esc closes shortcuts dialog
2016-11-02 09:22:34 -05:00
Ilya Daynatovich
ae7ad8b456 Adjusted notification width 2016-11-02 13:09:18 +02:00
Ilya Daynatovich
16c70fddba Restyled toolbar splitter 2016-11-02 12:13:30 +02:00
Дамян Минков
e679509c56 Merge pull request #1094 from bgrozev/conn-quality
Conn quality
2016-11-01 17:46:13 -05:00
hristoterezov
f08e9afc19 Merge pull request #1069 from jitsi/update-i18next
Updates i18next and bundles default translations.
2016-11-01 17:02:17 -05:00
damencho
215d8b1355 Updates show/hide of shortcuts dialog.
Fixes not able to close it with esc button.
2016-11-01 16:48:29 -05:00
hristoterezov
b1f129a53a fix(Chat): Display long nicknames with ... 2016-11-01 16:41:58 -05:00
hristoterezov
a6a7e81a0f feat(DisplayName): Limit local and remote display name to 50 chars 2016-11-01 16:40:52 -05:00
damencho
aaca510f8a Updates jsdoc. 2016-11-01 15:34:21 -05:00
yanas
3ad1573130 Merge pull request #1100 from jitsi/close-page-update
Close page update
2016-11-01 15:31:43 -05:00
paweldomas
d60146c6a8 fix(conference): leave the room when XMPP connection is dropped
It looks weird when the page reload overlay appears and the conference
continues in the background (the connection to the JVB remains active).
The library will not recover and the conference can not continue without
the signalling, so the room should be left and media stopped.
2016-11-01 15:08:59 -05:00
Дамян Минков
31d6a41759 Merge pull request #1099 from jitsi/fix_toolbar_popups
fix(toolbar): popups
2016-11-01 15:07:15 -05:00
hristoterezov
e731f6c3f3 feat(translation): ES6 support 2016-11-01 15:05:43 -05:00
damencho
1f200b63a7 Updates i18next and bundles default translations. 2016-11-01 15:05:23 -05:00
damencho
ae01275729 Renames variables. 2016-11-01 14:46:47 -05:00
Lyubomir Marinov
fab93a170e [iOS] Mark the app as VoIP 2016-11-01 13:59:53 -05:00
damencho
f28311a2ce Changes line color for static pages. 2016-11-01 13:28:04 -05:00
damencho
7da8db74b0 Adds default title to static pages. 2016-11-01 13:25:05 -05:00
damencho
5feeef0122 Handles data from feedback callback and use it for correct close page. 2016-11-01 13:14:21 -05:00
damencho
87f7be2182 Updates close page and adds a second one.
Close pages text are different depending whether feedback was provided or not.
2016-11-01 13:13:07 -05:00
damencho
e81a10de4a Reports to close callback whether feedback is submitted. 2016-11-01 13:10:58 -05:00
hristoterezov
8d9863a635 fix(toolbar): popups 2016-11-01 11:07:27 -05:00
Lyubomir Marinov
456b3030e3 [iOS] Fix the Xcode project file for CocoaPods 2016-11-01 07:58:26 -05:00
Ilya Daynatovich
d72695ae0f Added app substitution 2016-11-01 11:30:01 +02:00
yanas
e6748cf153 Merge pull request #1093 from jitsi/text-updates
Text updates.
2016-10-31 17:40:18 -05:00
yanas
a5e7c86125 Merge pull request #1092 from jitsi/update-lock-state
Updates lock state
2016-10-31 17:29:11 -05:00
hristoterezov
a7a7f269c3 Merge pull request #1054 from kkrisstoff/task/make-extended-toolbar-dynamically-created-buttons
make extended buttons dynamic
2016-10-31 16:50:14 -05:00
Boris Grozev
c815b1f25b feat: Updates the GSM bars' thresholds.
Adapts to changes in lib-jitsi-meet. Uses an Array which guarantees the
order of its elements, and avoids setting a css property multiple times.
2016-10-31 16:08:24 -05:00
Boris Grozev
c98ffdc817 refactor: Don't calculate remote connection quality. 2016-10-31 16:07:25 -05:00
Boris Grozev
09016c2182 refactor: Moves more code to lib-jitsi-meet. 2016-10-31 16:07:25 -05:00
Boris Grozev
22b2f17234 refactor: Moves more code to lib-jitsi-meet. 2016-10-31 16:07:25 -05:00
Boris Grozev
0c1bef927b Don't use no double non-positives. 2016-10-31 16:07:25 -05:00
Boris Grozev
4aa47a7901 feat: moves isConnectionInterrupted to lib-jitsi-meet. 2016-10-31 16:07:25 -05:00
Boris Grozev
051db50b3f feat: Moves connectionquality to lib-jitsi-meet. 2016-10-31 16:07:25 -05:00
yanas
c726a1a879 Text updates. 2016-10-31 16:00:11 -05:00
damencho
2edb279d22 Fixes password set remotely text. 2016-10-31 14:40:46 -05:00
Lyubomir Marinov
20e7c6d873 [iOS] Crashlytics 2016-10-31 14:08:25 -05:00
damencho
96479e0474 Fixes password and isModerator check in invite dialog. 2016-10-31 14:01:22 -05:00
Дамян Минков
1036768b2a Merge pull request #1080 from jitsi/dont_show_again
Implement dont show again util
2016-10-31 13:36:50 -05:00
Konstantyn Pahsura
77e28a6a45 toolbar buttons fixes 2016-10-31 20:25:27 +02:00
hristoterezov
a8b69d5cd8 feat(MessageHandler): Implement dont show again utility 2016-10-31 13:02:41 -05:00
Дамян Минков
9054e72b7f Merge pull request #1090 from jitsi/file_loading_err
Prevent from displaying broken page
2016-10-31 13:00:06 -05:00
Maxim Voloshin
dc93940bbd Filmstrip is extended with "Hide" button 2016-10-31 19:59:45 +02:00
Lyubomir Marinov
b6a6c99c9d [React Native] Enable scrolling of the thumbnails 2016-10-31 12:33:53 -05:00
Ilya Daynatovich
544792b9cc Editions in colors 2016-10-31 19:21:15 +02:00
hristoterezov
7e2fe30472 feat(JitsiLocalStorage): Implement localStorage wrapper 2016-10-31 12:11:03 -05:00
Ilya Daynatovich
5e7e5b317b Fix texts 2016-10-31 19:02:32 +02:00
Ilya Daynatovich
a63bb5d906 Add policy section 2016-10-31 18:23:28 +02:00
paweldomas
0354dd2c24 feat(index.html): prevent from displaying broken page
The commit adds an error listener which will replace the document body
with an error message if any of the files required for the app to
be displayed correctly fails to load.
2016-10-31 10:50:01 -05:00
Ilya Daynatovich
647f577332 Rearrange overlay layout 2016-10-31 17:35:22 +02:00
Kostiantyn Pashura
be1ba21166 make extended buttons dynamic 2016-10-31 13:30:16 +02:00
Lyubomir Marinov
8b2491c7a2 [tvOS] Automatic Xcode project file fixes
Xcode insists on automatically fixing the project file with tvOS
support. In order to not have to constantly ignore these automatic
changes when committing, commit them.
2016-10-30 20:43:29 -05:00
Lyubomir Marinov
f987a53313 [iOS] Clean up the Xcode project file 2016-10-30 20:26:39 -05:00
Lyubomir Marinov
d875b35b32 [Android] Crashlytics 2016-10-30 18:12:33 -05:00
yanas
df76d6990e Merge pull request #1062 from m-voloshin/FEATURE-tooltip-for-contact-list
New tooltip for contact list
2016-10-28 16:11:01 -05:00
yanas
86ffccb95a Merge pull request #1076 from kkrisstoff/UI/bugs-and-adjustments
audio_level oppacity and addParticipant button name
2016-10-28 16:10:47 -05:00
yanas
50494eb745 Updates to master 2016-10-28 13:20:38 -05:00
Konstantyn Pahsura
28f719b58a dropdown styles fixes 2016-10-28 13:09:47 -05:00
yanas
d384cd77c6 Merge pull request #1085 from jitsi/video-thumbnail-hover
Update _variables.scss
2016-10-28 12:54:25 -05:00
yanas
bb3384dc7c Update _variables.scss 2016-10-28 12:53:50 -05:00
yanas
ae9819a45c Merge pull request #1075 from BeatC/menu-restyling-editions
Adjust alignment of remote video menu
2016-10-28 12:43:12 -05:00
yanas
40473a16c7 Merge pull request #1084 from jitsi/toolbar_animation
fix(Toolbar): Both toolbars are displayed in the same time
2016-10-28 12:40:37 -05:00
hristoterezov
baad364b04 fix(Toolbar): Both toolbars are displayed in the same time 2016-10-28 12:39:25 -05:00
Дамян Минков
d2f52b534a Merge pull request #1083 from jitsi/fix_hover_thumbnail
fix(Thubmnail_PopupMenu): the thumbnail should be considered hovered when the popup menu is hovered
2016-10-28 11:59:36 -05:00
Lyubomir Marinov
532010c916 Update project files as recommended by Xcode 2016-10-28 11:30:04 -05:00
paweldomas
e349cc59ad style(translation): adds comment about lang auto detection 2016-10-28 11:17:09 -05:00
hristoterezov
634a18e847 fix(Thubmnail_PopupMenu): the thumbnail should be considered hovered when the popup menu is hovered 2016-10-28 11:16:40 -05:00
paweldomas
01581196f0 Merge pull request #1082 from 'BeatC/config-option-to-freeze-translation'
Add detect translation freeze in interface config
2016-10-28 11:14:22 -05:00
Konstantyn Pahsura
d7ed0bac69 audio_level oppacity and addParticipant button name 2016-10-28 18:39:40 +03:00
Ilya Daynatovich
209272f940 Add detect translation freeze in interface config 2016-10-28 16:18:08 +03:00
Ilya Daynatovich
138ed6a487 Fixed interface 2016-10-28 13:52:08 +03:00
Ilya Daynatovich
d84d0b65ca Adjust alignment of remote video menu 2016-10-28 13:52:08 +03:00
Paweł Domas
2fe69d409b Merge pull request #1071 from jitsi/ongoing-work-video-thumbnails
Ongoing work video thumbnails
2016-10-27 17:13:27 -05:00
damencho
9764fe52de Removed not needed setting of the quality to 0.
We now just hide the icon with values and show the interrupted one. Calling this one was causing troubles like flickering and stats popover not able to hide, once shown. On hover we are calling updateView which ends to this call which destroy and create the popover, which maybe is leading to this problems.
2016-10-27 16:56:32 -05:00
damencho
131d5cc256 Change the colour of the connection indicator badge. 2016-10-27 15:27:28 -05:00
Дамян Минков
7fead897ed Merge pull request #1079 from jitsi/fix_avatar_z_index
Do not display avatar on top of the connection problem messages
2016-10-27 15:26:22 -05:00
paweldomas
e3d5bd3dfb fix(css): do not display avatar on top of the messages
Previously the z-index was introduced in order to have the avatar
visible on top of the black video element, but now we're always hiding
the video element when the avatar is displayed, so it's no longer
required.
2016-10-27 14:52:32 -05:00
damencho
e3edef2999 Renames videocontainer overlay to hoverOverlay. 2016-10-27 14:32:22 -05:00
damencho
328ff54423 Fixes undefined error and shared video. 2016-10-27 14:08:06 -05:00
damencho
2807346bdf Makes decision what to show in avatar consistent (in updateView). 2016-10-27 13:17:17 -05:00
damencho
fec8f4e005 Fixes an issue with mixing visibility functions for elements.
In small video we use UIUtil.setVisibility, so we should not use jquery show/hide for the same element.
2016-10-26 17:36:07 -05:00
damencho
3ae299cf2b Fixes comments. 2016-10-26 17:18:36 -05:00
Дамян Минков
bbf68a97bb Merge pull request #1072 from jitsi/fix_stop_rec_dialog
Make the stop recording dialog work again
2016-10-26 16:14:28 -05:00
paweldomas
739e2bd35a fix(Recording): broken stop recording dialog 2016-10-26 16:10:45 -05:00
damencho
7acda03024 Adds an overlay to dim videos when showing displayname. 2016-10-26 15:51:09 -05:00
damencho
5cead57723 Reverts hover over small video to show display name. 2016-10-26 15:51:09 -05:00
Ilya Daynatovich
1e24be6dd4 Fix editing the name 2016-10-26 15:51:09 -05:00
Ilya Daynatovich
8d80e13e31 Fix connection indicator bars 2016-10-26 15:51:09 -05:00
Ilya Daynatovich
69b79b7687 Fix icon styles 2016-10-26 15:51:09 -05:00
Ilya Daynatovich
698b3caeb8 fix styles in connection indicators 2016-10-26 15:51:09 -05:00
Ilya Daynatovich
323684c5fe fix conflicts after rebase 2016-10-26 15:51:09 -05:00
Ilya Daynatovich
09e3fb9917 Fixed hack with displayname margin 2016-10-26 15:51:09 -05:00
yanas
a17a98991c Ongoing work on video thumbnail layout 2016-10-26 15:51:09 -05:00
yanas
3fe43abdea Move the display name to the center 2016-10-26 15:51:09 -05:00
Lyubomir Marinov
64112e00e6 react-native-webrtc 0.53.1 2016-10-26 15:20:06 -05:00
Дамян Минков
61651f7060 Merge pull request #1070 from jitsi/mute_participant_dialog
feat(Mute_Participant): Implement warning dialog for muting remote participant
2016-10-26 15:05:29 -05:00
hristoterezov
09c8e14465 feat(Mute_Participant): Implement warning dialog for muting remote participant 2016-10-26 14:57:09 -05:00
hristoterezov
0bb772d242 Merge pull request #1059 from BeatC/toolbar-animation
Change main toolbar animation; optimize mousemove handler
2016-10-26 11:52:01 -05:00
George Politis
68b587b110 Merge pull request #1064 from jitsi/5xx_reloads
Page reloads on BOSH HTTP errors
2016-10-26 11:39:44 -05:00
Дамян Минков
dd4a5f2705 Adds 404 error page in default configs. 2016-10-26 09:21:15 -05:00
yanas
79c52e1a77 Merge pull request #1061 from BeatC/button-shifted
Button shifted
2016-10-25 22:29:52 -05:00
hristoterezov
221f6d1d68 Merge pull request #1056 from jitsi/translations-update
Translations update
2016-10-25 18:11:15 -05:00
hristoterezov
ea0f0da8a4 feat(JitsiPopover): Add onBeforePosition option 2016-10-25 17:57:29 -05:00
hristoterezov
d2ccd20c78 Merge branch 'm-voloshin-FIX-frozen-tooltips' 2016-10-25 16:52:29 -05:00
hristoterezov
8762aae111 fix(SmallVideo): Add translateElement call removed by previous commit 2016-10-25 16:52:11 -05:00
hristoterezov
05fcaa2554 Merge branch 'FIX-frozen-tooltips' of git://github.com/m-voloshin/jitsi-meet into m-voloshin-FIX-frozen-tooltips 2016-10-25 16:51:03 -05:00
paweldomas
3c6d464b32 feat(PageReload): make the reload interval random, between 10-30 sec 2016-10-25 15:58:09 -05:00
paweldomas
c95c46edac feat(conference): reload the page when XMPP connection is dropped 2016-10-25 15:57:53 -05:00
damencho
b2a1c9881e Fixes comments from review.
Adds a safe check, i18n is expecting undefined not null. Fix a method name and translation to be at placeholder.
2016-10-25 15:18:56 -05:00
Lyubomir Marinov
9f10a059ef React Native 0.36.0, React 15.3.2 2016-10-25 14:57:18 -05:00
Maxim Voloshin
86f1d287d7 Fix comments 2016-10-25 20:40:43 +03:00
Maxim Voloshin
6820ec8d23 Show and hide indicators using pure js 2016-10-25 20:40:00 +03:00
Lyubomir Marinov
4997ae79e3 Fix toolbar's mute buttons when starting muted
The toolbar's mute buttons depict respective features/base/media states.
However, (un)muting is practically carried out by features/base/tracks.
When the mobile app enters a conference configured to invite the joining
participant to mute themselves, the tracks would be muted but the
toolbar's mute buttons would not reflect that.
2016-10-25 11:43:15 -05:00
Maxim Voloshin
c76fa50aa5 New tooltip for contact list 2016-10-25 19:27:27 +03:00
Maxim Voloshin
1c218191b0 Apply tooltip for indicator once 2016-10-25 17:50:28 +03:00
Ilya Daynatovich
84d71d558e fix invite dialog design 2016-10-25 17:33:51 +03:00
Ilya Daynatovich
659c84d696 fix margin 2016-10-25 17:24:11 +03:00
Ilya Daynatovich
99d50ade11 Change main toolbar animation; optimize mousemove handler 2016-10-25 14:55:43 +03:00
Дамян Минков
f271eb4610 Merge pull request #980 from kkrisstoff/task/add-error-page
error layout added
2016-10-24 16:31:16 -05:00
damencho
076f7a82de Updates translation readme. 2016-10-24 14:42:23 -05:00
damencho
547f96c0c1 Merge branch 'master' into translations-update 2016-10-24 14:40:50 -05:00
damencho
8a789aa608 Fixes some translations. 2016-10-24 14:17:22 -05:00
yanas
8fd23771f4 Merge pull request #1058 from kkrisstoff/select2-background-changes
dropdown color changes
2016-10-24 13:02:54 -05:00
Konstantyn Pahsura
15bc3b9ad4 dropdown color changes 2016-10-24 20:40:23 +03:00
yanas
3196ffd941 Merge pull request #1042 from m-voloshin/FEATURE-hd-label-relocation
Relocate "HD" label
2016-10-24 12:21:26 -05:00
Kostiantyn Pashura
84d2b79b4f 404 error page added 2016-10-24 19:33:08 +03:00
bgrozev
a4e1f939cd Merge pull request #1057 from jitsi/fix_connection_problem_z_idx
Reduce the z index of the connection problems message
2016-10-24 11:09:48 -05:00
damencho
563ea1244c Updates openMessageDialog to get only key and options. 2016-10-21 22:10:33 -05:00
hristoterezov
3dca6f2354 Merge pull request #1008 from jitsi/page_reload_overlay
Page reload overlay
2016-10-21 14:36:06 -05:00
paweldomas
bf5a1d1f8e fix(videolayout css): reduce conn problem msg z-index
For small window sizes and many video thumbnails the message may go on
top of the thumbnails.
2016-10-21 14:03:34 -05:00
paweldomas
a615649933 fix(PageReloadOverlay): changes text and adjusts style 2016-10-21 13:50:23 -05:00
paweldomas
3c0c823a37 ref(Overlay): introduce base class 2016-10-21 13:50:08 -05:00
damencho
efed4bf13c Merge branch 'master' into translations-update 2016-10-21 13:19:23 -05:00
damencho
5217bf0bb8 Removes translateString and use translateElement.
Removing translateString forces using data-i18n attributes, to make sure we do not forget to set them. Missing data-i18n attributes is a problem with late loading where we can end up without translation, without text. Missing data-i18n attributes is also problem that strings will not be translated when changing language.
Fixes a bug in invite dialog, where remove password button was shown for non moderators.
2016-10-21 12:11:22 -05:00
paweldomas
98de4c90b5 fix(RingOverlay): puts the "ring overlay" back below the toolbars 2016-10-21 10:47:21 -05:00
paweldomas
8c426e8bb7 fix(ToolbarToggle): restore call overlay to the timeout check 2016-10-21 10:27:10 -05:00
paweldomas
5bc727804f fix(PageReloadOverlay): do not log message every second 2016-10-21 10:18:03 -05:00
yanas
32bfebc924 Merge pull request #1033 from BeatC/add-jsdoc
Add JSDoc and rename method
2016-10-21 10:12:31 -05:00
paweldomas
8f8b1385fa ref(ConferenceUrl): converts to class and binds instance to global APP
Converts ConferenceUrl to a class and binds an instance to the global
APP variable, as requested by HTerezov.
2016-10-21 09:46:09 -05:00
paweldomas
d342f93547 fix(Invite): remove unused 'updateInviteUrl' 2016-10-21 09:25:14 -05:00
paweldomas
ecfc56461e fix(ToolbarToggler): remove Yoda condition
Is not very readable and is not used across the project
2016-10-21 09:22:17 -05:00
Maxim Voloshin
d09a8b1896 Adjusted styles for "Live Streaming" indicator. 2016-10-21 13:38:12 +03:00
Maxim Voloshin
88be44b472 Relocated "HD" label 2016-10-21 13:38:12 +03:00
Дамян Минков
4b82bc0e33 Merge pull request #1049 from jitsi/fix_thank_you_dialog
fix(feedback): Fixes the logic for the thank you dialog
2016-10-20 22:30:18 -05:00
hristoterezov
3022754f19 fix(feedback): Fixes the logic for the thank you dialog 2016-10-20 14:20:28 -05:00
paweldomas
f7bfe8d8bf feat: introduce ConferenceUrl module
We need to make sure that on the page reload all original parameters
used to load the conference are preserved. New modules helps to manage
different types of conference URLs like the one used for invites and
the one for reloading the page.
2016-10-20 13:53:24 -05:00
paweldomas
210605d8f3 fix(MessageHandler): suppress the notifications on top of the overlay 2016-10-20 13:52:35 -05:00
paweldomas
52344ff741 fix(ToolbarToggler): restore 'force' arg in timeout logic 2016-10-20 13:52:35 -05:00
paweldomas
687b0cad8e fix(ToolbarToggler): remove call overlay from the timeout check
Remove check for the call overlay being visible in postponing
the toolbar being hidden, as we don't want to have it displayed at all
when the overlay is there.
2016-10-20 13:52:35 -05:00
paweldomas
0053c4df49 feat(PageReloadOverlay): log the reload event 2016-10-20 13:52:35 -05:00
paweldomas
2a5b4dde31 feat: implement PageReloadOverlay 2016-10-20 13:52:35 -05:00
paweldomas
d2690444ac fix(overlay): bring overlay on top of the toolbars 2016-10-20 13:52:35 -05:00
paweldomas
c473178dfe fix(UserMediaPermissionsGuidanceOverlay): broken display 2016-10-20 13:50:11 -05:00
paweldomas
229a3b4418 fix(conference): disconnect on VIDEOBRIDGE_NOT_AVAILABLE error
Will disconnect on ConferenceErrors.VIDEOBRIDGE_NOT_AVAILABLE.
Show the same message when either JVB is not available or Jicofo
disconnects.
2016-10-20 13:50:11 -05:00
yanas
63dfa5247f Merge pull request #1048 from BeatC/menu-restyle
Menu restyle
2016-10-20 13:48:19 -05:00
Maxim Voloshin
469dee36ee Initialised variable for notification opacity 2016-10-20 13:03:00 -05:00
Maxim Voloshin
abb1482456 Applied updated design for notifications 2016-10-20 13:03:00 -05:00
Lyubomir Marinov
e1c5ea11bc Merge branch 'kkrisstoff-task/dropdown-aui-changes'
the commit.
2016-10-20 12:39:23 -05:00
Lyubomir Marinov
55b741d11b Merge branch 'master' into kkrisstoff-task/dropdown-aui-changes 2016-10-20 12:10:50 -05:00
Ilya Daynatovich
8f57179aa4 return default value 2016-10-20 19:41:04 +03:00
yanas
0fa5aa48af Merge pull request #992 from kkrisstoff/task/make-extended-toolbar-dynamically-created
toolbar: authentication button changed
2016-10-20 11:40:35 -05:00
hristoterezov
a65fca851c refactor(FilmStrip): calculateThumbnailSizeFromAvailable 2016-10-20 11:34:14 -05:00
Ilya Daynatovich
62af73ea09 Add new option to jitsi-popover 2016-10-20 19:28:19 +03:00
Ilya Daynatovich
0e8297ea8d restyle of menu 2016-10-20 19:28:19 +03:00
Ilya Daynatovich
70861465e1 Editions in jitsi popover styles 2016-10-20 19:28:19 +03:00
yanas
3bf8b7fbe2 Merge pull request #1007 from BeatC/connection-indicator-restyle
Connection indicator restyle
2016-10-20 11:08:51 -05:00
Kostiantyn Pashura
436f3b9d9b auth btn removed. login/logout --> Profile 2016-10-20 12:28:58 +03:00
Kostiantyn Pashura
71475038ba toolbar: authentication button changed 2016-10-20 12:26:53 +03:00
Lyubomir Marinov
c9edc0ae15 Merge branch 'master' into kkrisstoff-task/dropdown-aui-changes 2016-10-19 19:06:58 -05:00
Lyubomir Marinov
242c1419fd Format source code for (some) consistency 2016-10-19 18:54:21 -05:00
yanas
8ca0943881 Merge pull request #880 from jitsi/ring-overlay-style
style(LargeVideo): Rename LARGE_VIDEO_AVATAR_DISPLAYED event
2016-10-19 16:24:34 -05:00
hristoterezov
58a07355fb style(RingOverlay): Rename onAvatarDisplayed to onAvatarVisible 2016-10-19 15:58:36 -05:00
hristoterezov
4acfb033c8 style(LargeVideo): Rename LARGE_VIDEO_AVATAR_DISPLAYED event 2016-10-19 15:57:02 -05:00
Lyubomir Marinov
572fb20dd4 Merge branch 'task/dropdown-aui-changes' of https://github.com/kkrisstoff/jitsi-meet into kkrisstoff-task/dropdown-aui-changes 2016-10-19 13:38:38 -05:00
Lyubomir Marinov
d15413cd18 Merge branch 'mlaux-bugfix/android-launcher-intent' 2016-10-19 12:24:37 -05:00
Matt Laux
c18caf52d0 Fix Android launcher intent so that app appears in drawer. 2016-10-19 10:59:09 -05:00
Ilya Daynatovich
c09e10a584 updates in connection indicator styles 2016-10-19 17:57:16 +03:00
Lyubomir Marinov
1ff0bdbcfd Fix the in-app icons on Android
Bundle our custom icon font jitsi.ttf in the Android app (which we
already do for the iOS app).

Additionally, remove icon font files which are not in use.
2016-10-19 09:10:11 -05:00
Kostiantyn Pashura
736b98869f dropdown restyle 2016-10-19 12:40:03 +03:00
Kostiantyn Pashura
91fd16e9b4 aui checkbox removed 2016-10-19 12:40:03 +03:00
Kostiantyn Pashura
8118b4aea1 aui select and checkbox added 2016-10-19 12:40:03 +03:00
Дамян Минков
f62d7dbdf7 Merge pull request #1040 from jitsi/fix-feedback-color-and-size
Fix feedback button color and star size
2016-10-18 15:25:40 -05:00
yanas
1bf2920f3e Fix feedback button color and star size 2016-10-18 15:23:52 -05:00
Дамян Минков
8ecf079a3f Merge pull request #1039 from jitsi/stop-logging-servers-in-the-name
Stop logging servers in the event name
2016-10-18 15:18:44 -05:00
Emil Ivov
05ae9134a8 Update conference.js 2016-10-18 15:15:47 -05:00
damencho
040f4a6618 Adds data-i18n attribute. 2016-10-18 15:02:09 -05:00
damencho
a9aa29d0ad Adds data-i18n attribute to the feedback. 2016-10-18 15:01:58 -05:00
damencho
54cfbaaba0 Updates some translations for login dialog. 2016-10-18 15:01:50 -05:00
damencho
0455c26fb2 Uses titleKey to generate title string containing data-i18n attribute. 2016-10-18 15:00:09 -05:00
damencho
65f8c9ad97 Removes title param from openTwoButtonDialog. 2016-10-18 14:54:30 -05:00
damencho
f0ac52614b Removes title param from openTwoButtonDialog. 2016-10-18 14:54:22 -05:00
damencho
b5f0d30298 Removes not used parameter of openMessageDialog (title).
We pass key which is enough to obtain the title.
2016-10-18 14:54:14 -05:00
Дамян Минков
d97ed17052 Merge pull request #1038 from jitsi/api_commands
fix(iframe_api): toggleScreenSharing command
2016-10-18 14:52:21 -05:00
hristoterezov
dc43135980 fix(iframe_api): toggleScreenSharing command 2016-10-18 14:37:55 -05:00
Дамян Минков
27158752b0 Merge pull request #1025 from BeatC/display-name-required-dialog-fixes
fix display name required dialog
2016-10-18 14:36:03 -05:00
Дамян Минков
5c6f897ce7 Merge pull request #1030 from coresh/patch-1
Fixes issue of method 'setTooltip'
2016-10-18 14:35:53 -05:00
Дамян Минков
d415a15e93 Merge pull request #1037 from jitsi/add-specific-read-only-color
Add specific color for read-only input
2016-10-18 14:35:47 -05:00
yanas
19709cd3fc Adds comments. 2016-10-18 14:30:59 -05:00
yanas
89e15b6d3d Add specific color for read-only input 2016-10-18 14:27:16 -05:00
yanas
dcf2d64067 Merge pull request #1036 from jitsi/fix-placeholder-style
Fixes placeholder color
2016-10-18 13:00:22 -05:00
yanas
c459e3cffd Merge pull request #1031 from BeatC/invite-dialog-visual-bugs
Fix some visual bugs
2016-10-18 11:59:11 -05:00
yanas
8eb7303bd9 Fixes placeholder color 2016-10-18 11:57:38 -05:00
yanas
de67abd21d Merge pull request #1032 from kkrisstoff/Feedback-dialog-theme
feedback style variables
2016-10-18 11:20:44 -05:00
yanas
bb5495b495 Merge pull request #990 from jitsi/chatmessage_position
fix(chat): Issue with position of chat messages
2016-10-18 11:13:26 -05:00
Kostiantyn Pashura
124303b8b8 feedback style variables 2016-10-18 18:37:32 +03:00
Ilya Daynatovich
9078596f3a fix after rebase 2016-10-18 18:23:08 +03:00
Ilya Daynatovich
3254bbaabb Change styles in jitsi poppover 2016-10-18 17:57:19 +03:00
Ilya Daynatovich
26792625f2 BEMificated classes and add title 2016-10-18 17:57:19 +03:00
Ilya Daynatovich
c54938374d Editions in jitsi popover styles 2016-10-18 17:57:19 +03:00
Ilya Daynatovich
83e7f23d0f Update Connection indicator and popover js 2016-10-18 17:57:19 +03:00
Ilya Daynatovich
b7fccf5040 Update styles for popover 2016-10-18 17:57:19 +03:00
Lyubomir Marinov
a91deca6cd Remove source code duplication
An error was discovered and fixed by GitHub user blackneck in
jitsi/jitsi-meet PR #1017. The faulty source code was a piece of
duplication though. Remove the source code duplication there to reduce
the risks of bugs.
2016-10-18 09:39:17 -05:00
Ilya Daynatovich
cbc7fe5d98 Add JSDoc and rename method 2016-10-18 17:20:48 +03:00
Lyubomir Marinov
cf3ea2b8af Merge branch 'blackneck-master' 2016-10-18 09:05:46 -05:00
Ilya Daynatovich
a4c3348630 Fix some visual bugs 2016-10-18 16:53:28 +03:00
coresh
6bd5d6e4d5 Fixes issue of method 'setTooltip'
Fixes issue of method 'setTooltip' in modules/UI/util/UIUtil.js: Excluded 'Uncaught TypeError':
```
UIUtil.js:134 Uncaught TypeError: Cannot read property 'setAttribute' of null
```
2016-10-18 09:34:09 +00:00
yanas
442d2fa316 Merge pull request #1024 from BeatC/shortcut-dialog-fixes
Fix shortcut dialog toggling
2016-10-17 23:40:22 -05:00
Lyubomir Marinov
3ecc24d85e Remove obsolete Temasys workaround on React Native
jitsi/lib-jitsi-meet#66b601e disabled the execution of Temasys'
adapter.screenshare.js on browsers on which we don't use Temasys such as
React Native. Henceforth, no Temasys workarounds are necessary on React
Native.
2016-10-17 19:51:58 -05:00
Lyubomir Marinov
5e3193e087 Fix the iOS enterprise deployment build 2016-10-17 18:57:15 -05:00
yanas
b96743f4de Merge pull request #1028 from jitsi/fix-profile-title
Trivial fix of capital letters.
2016-10-17 17:20:00 -05:00
yanas
2eec52485d Fixes Profile panel title 2016-10-17 17:18:06 -05:00
Дамян Минков
c2085a5a9d Merge pull request #1027 from jitsi/fix-contact-list-resizing
Some contact list styling adjustments
2016-10-17 17:17:22 -05:00
yanas
f8733b2501 Remove semicolon 2016-10-17 16:53:16 -05:00
yanas
5597847190 Some contact list styling adjustments 2016-10-17 16:49:31 -05:00
Дамян Минков
13d187b878 Merge pull request #1019 from jitsi/add-toolbar-splitter-button
Adds toolbar splitter button
2016-10-17 16:35:15 -05:00
yanas
43906a4e30 Fix undefined check. 2016-10-17 16:05:46 -05:00
yanas
9641dbf373 Adds toolbar splitter button 2016-10-17 16:05:46 -05:00
yanas
ad2fb28f97 Merge pull request #1023 from BeatC/invite-dialog-enter-for-password
Add possibilty to set password via return key
2016-10-17 14:42:44 -05:00
Дамян Минков
2f11e85304 Updates ios project file, disables LLVM Bitcode. 2016-10-17 10:58:58 -05:00
Ilya Daynatovich
25aeb184af fix display name required dialog 2016-10-17 17:29:41 +03:00
Lyubomir Marinov
ba778c50ac Merge branch 'master' of https://github.com/blackneck/jitsi-meet into blackneck-master 2016-10-17 08:56:19 -05:00
Ilya Daynatovich
d06aef511f Fix shortcut dialog toggling 2016-10-17 16:35:47 +03:00
Ilya Daynatovich
d94b50f1e4 Add possibilty to set password via return key 2016-10-17 15:51:55 +03:00
Дамян Минков
367c9401eb Merge pull request #1020 from jitsi/invite-dialog-fix
Initialise the invite dialog on user action
2016-10-14 16:08:05 -05:00
yanas
338e1bac00 Initialise the invite dialog on user action 2016-10-14 15:38:19 -05:00
Paweł Domas
6148b4b229 Merge pull request #1018 from jitsi/fix-gms-bars-2
Fixes cannot read property of undefined if there is no local video.
2016-10-14 15:18:43 -05:00
damencho
e5f38e34e9 Fixes cannot read property of undefined if there is no local video. 2016-10-14 15:14:56 -05:00
Alexander Chernoshej
60eb76355b fix tiny mistake on removing local tracks 2016-10-14 17:26:55 +03:00
Дамян Минков
da86cba7ea Merge pull request #1014 from jitsi/fix-cdn-issue-with-remove-pass
Fixes cdn issue with remove password link.
2016-10-13 20:06:40 -05:00
Paweł Domas
33c026cc06 Merge pull request #1010 from jitsi/fullscreen-feature-fixes
Fullscreen feature fixes
2016-10-13 18:39:47 -05:00
yanas
22a2d85ee2 Fixes cdn issue with remove password link. 2016-10-13 17:57:45 -05:00
yanas
26ff54366b Moves full screen functions in UIUtil 2016-10-13 17:28:24 -05:00
hristoterezov
762420fcc8 Merge pull request #997 from jitsi/gsm-bars-2
Calculates quality based on the resolution and upload.
2016-10-13 16:26:42 -05:00
Paweł Domas
856a18fc2a Merge pull request #1011 from jitsi/adds-id-to-etherpad-iframe
Adds an id to etherpad iframe.
2016-10-13 15:49:00 -05:00
damencho
9ed6e0e2f9 Adds an id to etherpad iframe. 2016-10-13 15:46:44 -05:00
damencho
bbe475cb4e Fixes review comments.
Uses some ES6 syntax. Also removes inputHeight key for resolution as it makes no sence to have dictionary with one key. Removes some code duplication. Makes code consistent: method params for updateLocalStats and updateRemoteStats.
2016-10-13 15:31:16 -05:00
yanas
36fdb3127f Removes unrelated comment. 2016-10-13 15:17:15 -05:00
yanas
ee31d24f7c Puts fullscreen button in the top toolbar 2016-10-13 15:10:10 -05:00
yanas
7baa473e55 Fixes full screen event handling 2016-10-13 15:10:10 -05:00
yanas
688e71cd1b Merge pull request #995 from jitsi/ring_overlay_disable_ringing
Add interfaceConfig option for disabling ringing
2016-10-13 14:28:21 -05:00
Lyubomir Marinov
ce9fff2a8d Merge remote-tracking branch 'origin/master' 2016-10-13 13:33:37 -05:00
Lyubomir Marinov
6202935a27 Merge branch 'm-voloshin-FIX-audio-level' 2016-10-13 13:29:54 -05:00
Дамян Минков
df7a6f0df6 Merge pull request #1004 from jitsi/hangup_fixes
Refactor hangup.

Refactor hangup after room.leave is made to return Promise that waits for actual leave.
2016-10-13 11:36:54 -05:00
Maxim Voloshin
4ae0d1b882 Clean up audio level after previous speaker 2016-10-13 16:43:21 +03:00
hristoterezov
84fd0531f6 fix(Avatar): Avatar to return the local avatar when jid is null 2016-10-12 17:02:50 -05:00
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
Lyubomir Marinov
c95a8e058c Merge branch 'master' into talk-muted 2016-09-30 08:57:28 -05:00
Lyubomir Marinov
ecf44498b8 Merge branch 'master' into webpack 2016-09-30 08:52:36 -05:00
Maxim Voloshin
2f92aa9645 Completely remove attributes to destroy tooltip properly 2016-09-30 14:06:57 +03:00
yanas
e894b0db43 Merge pull request #962 from jitsi/remove-tooltip
Remove tooltip update
2016-09-29 17:14:09 -05:00
damencho
da65bbaa2d Updates remove tooltip util method.
Destroy is just hiding current tooltip, we also need to remove other attributes to stop showing the tooltip.
2016-09-29 16:47:32 -05:00
ibauersachs
032509be15 Commit from translate.jitsi.org by user ibauersachs.: 265 of 265 strings translated (0 fuzzy). 2016-09-29 17:00:31 +00:00
Hristo Terezov
c6f81668de Remove an unnecessary exclude from Webpack 2016-09-29 11:31:28 -05:00
Lyubomir Marinov
43d0582b2f Don't use path.resolve 2016-09-29 11:31:28 -05:00
Lyubomir Marinov
818ddad2c3 Do not distribute unminimized artifacts
The build process is capable of bundling both minimized and unminimized
artifacts for lib-jitsi-meet, jitsi-meet and external_api. However,
there does not seem to be a good reason to (1) always wait for the
building of the two versions and (2) distributing the unminimized
artifacts.
2016-09-29 11:31:28 -05:00
Lyubomir Marinov
c8f79dbd2d Switch from Browserify to Webpack 2016-09-29 11:31:28 -05:00
Lyubomir Marinov
1ceb3f0129 Switch lib-jitsi-meet from Browserify to Webpack
Since the library lib-jitsi-meet does not publish its binaries, it is
always been necessary to produce the binaries i.e. lib-jitsi-meet.js and
lib-jitsi-meet.js as part of the npm install step. Which means that any
modifications to the devDependencies of lib-jitsi-meet's package.json
always have to be reflected in jitsi-meet's package.json. Because
Webpack replaced Browserify in lib-jitsi-meet, Webpack has to become a
devDependency of jitsi-meet.
2016-09-29 11:31:28 -05:00
yanas
fe7911b944 Merge pull request #959 from m-voloshin/keyboard-shortcuts-help
Removed duplicates from keyboard shortcuts
2016-09-29 10:42:27 -05:00
yanas
0dcf8add63 Merge pull request #961 from m-voloshin/username-editing
Allow user to edit initial username
2016-09-29 10:34:17 -05:00
Paweł Domas
ae2ea4f421 Merge pull request #954 from jitsi/handle-conference-left
Waits for conference left event before navigating away from the page.
2016-09-29 10:06:57 -05:00
Maxim Voloshin
664d7a4f67 Allow user to edit initial username 2016-09-29 17:40:26 +03:00
Maxim Voloshin
6e90b767ef Removed separate check for SPACE 2016-09-29 16:07:21 +03:00
Maxim Voloshin
268a2ea7ce Removed duplicates from keyboard shortcuts 2016-09-29 15:31:45 +03:00
yanas
854fef35cb Merge pull request #955 from jitsi/audio-levels-redesign
Audio levels redesign. PR Review done from @damencho and @emcho.
2016-09-29 00:48:29 -05:00
yanas
b58556b6c3 Fixes audio level algorithm. 2016-09-29 00:22:05 -05:00
hristoterezov
97aaa36f7d Merge pull request #942 from jitsi/enable-languages
Match enabled languages to available languages
2016-09-28 19:22:27 -05:00
damencho
07f111abbd Fixes hangup when callstats is disabled. 2016-09-28 17:27:55 -05:00
yanas
3bb877cc3a Audio levels redesign. 2016-09-28 16:41:13 -05:00
Любомир Маринов
17bcc9bfcc Merge pull request #956 from jitsi/revert-903-webpack
Revert "Switch from Browserify to Webpack"
2016-09-28 16:38:42 -05:00
hristoterezov
c7cd771de2 Revert "Switch from Browserify to Webpack" 2016-09-28 16:37:24 -05:00
hristoterezov
77e65f727f Merge pull request #903 from jitsi/webpack
Switch from Browserify to Webpack
2016-09-28 16:37:07 -05:00
damencho
d793cdc797 Waits for conference left event before navigating away from the page. 2016-09-28 16:05:51 -05:00
Дамян Минков
4ec266ef11 Merge pull request #953 from jitsi/log_server
feat(log): Logs server field from jwt token
2016-09-28 15:47:56 -05:00
hristoterezov
fcc9532bde feat(log): Logs server field from jwt token 2016-09-28 15:19:16 -05:00
Paweł Domas
b4a191e27a Merge pull request #946 from jitsi/fix-moderator-notifications
Fixes moderator notifications on moderator indicator disabled
2016-09-28 14:26:00 -05:00
Lyubomir Marinov
973d40a877 Don't use path.resolve 2016-09-28 14:15:02 -05:00
Lyubomir Marinov
ce3090b8fe Do not distribute unminimized artifacts
The build process is capable of bundling both minimized and unminimized
artifacts for lib-jitsi-meet, jitsi-meet and external_api. However,
there does not seem to be a good reason to (1) always wait for the
building of the two versions and (2) distributing the unminimized
artifacts.
2016-09-28 13:57:53 -05:00
Lyubomir Marinov
f6662745d1 Switch from Browserify to Webpack 2016-09-28 13:57:53 -05:00
Lyubomir Marinov
4289df1681 Switch lib-jitsi-meet from Browserify to Webpack
Since the library lib-jitsi-meet does not publish its binaries, it is
always been necessary to produce the binaries i.e. lib-jitsi-meet.js and
lib-jitsi-meet.js as part of the npm install step. Which means that any
modifications to the devDependencies of lib-jitsi-meet's package.json
always have to be reflected in jitsi-meet's package.json. Because
Webpack replaced Browserify in lib-jitsi-meet, Webpack has to become a
devDependency of jitsi-meet.
2016-09-28 13:57:53 -05:00
paweldomas
dad3c57fad fix(conference): react to local role change only when it changes
We initialise the UI for isModerator = false on startup, so we should
not react to the event unless it gets out of sync.
2016-09-28 13:41:02 -05:00
Lyubomir Marinov
8f4b94f732 Merge branch 'm-voloshin-tooltips-global-handler' 2016-09-28 13:10:51 -05:00
yanas
76f8ca2116 Merge pull request #947 from jitsi/not-allowed-error
Not allowed error
2016-09-28 12:40:53 -05:00
Paweł Domas
94e5cda02d Merge pull request #951 from jitsi/prosody-tokens-case-insensitive-room
Prosody tokens case insensitive room name
2016-09-28 12:36:28 -05:00
yanas
066b4f16a0 Merge pull request #949 from m-voloshin/videospace-layout-fix
Removed initial animation of the video thumbnail
2016-09-28 11:50:46 -05:00
damencho
f3381b31ed Updates tokens room name verification to be case insensitive.
Room names used inside prosody are all lower case, when verify with room name from token make sure we use the room name in lower case.
2016-09-28 11:49:50 -05:00
damencho
15f4288e4a Fixes some jshint errors. 2016-09-28 11:29:47 -05:00
Lyubomir Marinov
4569970bc4 Merge branch 'tooltips-global-handler' of https://github.com/m-voloshin/jitsi-meet into m-voloshin-tooltips-global-handler 2016-09-28 11:29:15 -05:00
Maxim Voloshin
b2e0b49556 Updated JSDocs for 'TOOLTIP_POSITIONS' constant 2016-09-28 18:09:09 +03:00
Lyubomir Marinov
03152d65ab Merge branch 'tooltips-global-handler' of https://github.com/m-voloshin/jitsi-meet into m-voloshin-tooltips-global-handler 2016-09-28 09:58:49 -05:00
Maxim Voloshin
96735d47c4 Attached JSDocs for 'TOOLTIP_POSITIONS' constant 2016-09-28 17:52:27 +03:00
Lyubomir Marinov
16266e3622 Merge branch 'tooltips-global-handler' of https://github.com/m-voloshin/jitsi-meet into m-voloshin-tooltips-global-handler 2016-09-28 09:27:58 -05:00
Maxim Voloshin
87ed7b7989 Redesigned "setTooltip" method 2016-09-28 17:22:03 +03:00
Lyubomir Marinov
fef95f7cf1 Merge branch 'tooltips-global-handler' of https://github.com/m-voloshin/jitsi-meet into m-voloshin-tooltips-global-handler 2016-09-28 07:38:32 -05:00
Maxim Voloshin
36d1f7d06f Removed initial animation of the video thumbnail 2016-09-28 15:08:15 +03:00
Maxim Voloshin
33078a868c Spacebar is used to activate Push-To-Talk 2016-09-28 13:03:47 +03:00
hristoterezov
2a8700bca3 Merge pull request #938 from jitsi/participant_conn_status
Adds participant connection status notifications
2016-09-27 17:54:22 -05:00
damencho
1e54111aad Adds authentication error page.
When we receive a conference failed event with reason not allowed we show that page.
2016-09-27 17:26:38 -05:00
damencho
57003be3a3 Renames the style from close to redirect page. 2016-09-27 16:49:23 -05:00
yanas
f10177a352 Fixes moderator notifications on moderator indicator disabled 2016-09-27 14:32:54 -05:00
Maxim Voloshin
939b87ffed Tooltiped elements are mardked with "data-tooltip" attribute 2016-09-27 19:49:49 +03:00
Emil Ivov
6ccc58a060 Merge pull request #945 from jitsi/feedback-improvements
Feedback window improvements.
2016-09-26 23:14:19 -05:00
yanas
08b2fbe30f Fixes feedback message and button active state 2016-09-26 22:43:20 -05:00
Emil Ivov
cbd15f45a4 Merge pull request #944 from jitsi/pin-hover-improvements
Pin hover improvements
2016-09-26 22:42:37 -05:00
yanas
37dcc6c994 Improves the pin and hover borders 2016-09-26 22:26:05 -05:00
yanas
6249ff89ff Feedback window improvements. 2016-09-26 21:15:24 -05:00
yanas
07441b092c Merge pull request #943 from m-voloshin/fix-cursor-for-icon
Default cursor for icons
2016-09-26 15:43:51 -05:00
yanas
1c8535a2d5 Improves the pin and hover borders 2016-09-26 15:40:56 -05:00
Maxim Voloshin
047a2369b3 Default cursor for icons 2016-09-26 22:46:39 +03:00
paweldomas
7585413e7d fix(VideoLayout): from avatar to video transition
When user reconnected and the avatar is displayed we need to perform
full large video update in order to transition correctly.
2016-09-26 14:40:00 -05:00
paweldomas
6e0ba1de33 ref(VideoLayout): rename 'videoConnectionMessage'
Renames 'videoConnectionMessage' to 'localConnectionMessage', because
it is displayed when we're having problems with our local connection
and a different one will be shown for the remote connectivity issues.
2016-09-26 14:40:00 -05:00
paweldomas
661ea2cf45 feat(VideoLayout): add remote connection problems UI
Grey filter will be applied to the remote video/avatar displayed on
"large" and a message indicating remote connectivity issues will be
shown on top of that.
2016-09-26 14:39:58 -05:00
ibauersachs
bcee2a207d Commit from translate.jitsi.org by user ibauersachs.: 265 of 265 strings translated (0 fuzzy). 2016-09-26 19:36:34 +00:00
Ingo Bauersachs
e94bf73cc3 Match enabled languages to available languages 2016-09-26 21:34:46 +02:00
Ingo Bauersachs
03e8331e4f Add polish and russian 2016-09-26 21:28:55 +02:00
ibauersachs
bbd5e55e5e Commit from translate.jitsi.org by user ibauersachs.: 263 of 263 strings translated (0 fuzzy). 2016-09-26 19:03:16 +00:00
Maxim Voloshin
212798ad19 Global handler for tooltips 2016-09-26 21:29:40 +03:00
yanas
bb0f6e0989 Remove unused variable. 2016-09-26 13:02:59 -05:00
paweldomas
42fd3097de feat(VideoContainer): add 'wasVideoRendered' flag
The 'wasVideoRendered' flag will tell whether or not we have any video
image rendered(even if stalled) on the large video element.
2016-09-26 13:01:35 -05:00
paweldomas
5952261e87 ref(LargeVideoManager): introduce 'setVideoConnectionMessage' 2016-09-26 13:01:35 -05:00
paweldomas
62d2e3e2a4 feat(conference.js): add 'getParticipantDisplayName' 2016-09-26 13:01:35 -05:00
paweldomas
5843c6c569 ref(LargeVideoManager): rename 'enableVideoProblemFilter' 2016-09-26 13:01:35 -05:00
paweldomas
352e784cad fix(VideoLayout): show video when the connection is back 2016-09-26 13:01:35 -05:00
paweldomas
b8937e0349 fix(LargeVideoManager): hide video when avatar is displayed 2016-09-26 13:01:35 -05:00
paweldomas
0aea799b50 doc(LargeVideoManager): fills missing JS doc 2016-09-26 13:01:35 -05:00
paweldomas
46766ec239 fix(RemoteVideo): avoid black thumbnail
When the user is having connectivity issues we use the image cached in
the video element to show the preview in greyscale. It looks like this
cached image gets invalided after prolonged periods of time the video
element being hidden(and it is hidden when the video is muted). So we
never show this image if the user gets muted during connectivity
disruption in order to avoid blackness.
2016-09-26 13:01:35 -05:00
paweldomas
66bbc4d9fd fix(RemoteVideo): change hasVideoStarted logic
We used to rely on 'currentTime' of the video element, but we execute
'updateView' from the 'onplay' callback and on fast machines it may
happen that the value is 0 even though the video has just started.
2016-09-26 13:01:35 -05:00
paweldomas
40f2c593a2 ref(SmallVideo): figure out what is to be displayed
At any point of time we display one of the three: video, avatar or
blackness. The purpose of this commit is to make that fact more clear
in the code.
2016-09-26 13:01:35 -05:00
paweldomas
30cb948dcf feat(SmallVideo): make thumbnail grey
The video or the avatar on a thumbnail will be displayed in greyscale
when the user is having connectivity issues.
2016-09-26 13:01:35 -05:00
paweldomas
fceb512a03 ref(SmallVideo): add 'isCurrentlyOnLargeVideo' 2016-09-26 13:01:35 -05:00
paweldomas
4722054c3e ref(SmallVideo): adds avatar selector 2016-09-26 13:01:34 -05:00
paweldomas
9d1364b6fb feat(RemoteVideo): show disconnected GSM bars for remotes 2016-09-26 13:01:34 -05:00
paweldomas
5daceaead7 feat(conference.js): add isParticipantConnectionActive 2016-09-26 13:01:34 -05:00
paweldomas
8a43699a89 feat(ConnectionIndicator): show disconnected GSM bars on local thumbnail 2016-09-26 13:01:34 -05:00
paweldomas
3ef5dd20ef ref(RemoteVideo): store JitsiParticipant instead of id 2016-09-26 13:01:34 -05:00
paweldomas
e9445866a5 ref(ConnectionIndicator.js): make CQ 'object' optional 2016-09-26 13:01:34 -05:00
paweldomas
cf931f8a9f ref(ConnectionIndicator.js) pass icon class as an argument 2016-09-26 13:01:34 -05:00
yanas
3140257b69 Remove unused function. 2016-09-26 12:55:18 -05:00
Дамян Минков
b3d6e5876e Merge pull request #922 from jitsi/fix_filter_not_applied
Fix notification about network issues not displayed when expected
2016-09-26 10:04:14 -05:00
Дамян Минков
c437f64f35 Merge pull request #933 from jitsi/fix-everyone-moderator
Fixes moderator related elements when everyone is moderator
2016-09-23 18:04:53 -05:00
yanas
af91fb50b2 Fixes moderator related elements when everyone is moderator 2016-09-23 17:42:29 -05:00
Emil Ivov
a35e194a2d Merge pull request #932 from jitsi/fix_jibri
fix(FilmStrip): Add check for thumbnails
2016-09-23 16:46:49 -05:00
hristoterezov
42d9d0393d fix(FilmStrip): Add check for thumbnails 2016-09-23 16:44:32 -05:00
jitsi-pootle
d319e837f5 New files added from translate.jitsi.org based on templates 2016-09-23 19:49:12 +00:00
yanas
a054a0d61d Merge pull request #919 from kkrisstoff/add/raise-hand-icon
rise-hand-ico: blured class added
2016-09-23 11:59:40 -05:00
yanas
8e75da8540 Merge pull request #926 from jitsi/lock-fixes
Changes the state of room locker if room was locked not by current user.
2016-09-23 11:51:42 -05:00
damencho
975b13f868 Fixes setting remote room lock state change. 2016-09-23 11:34:21 -05:00
yanas
75f80ae877 Update _close.scss 2016-09-23 11:26:48 -05:00
Kostiantyn Pashura
7c824d9da0 rise-hand-ico: blured class added 2016-09-23 15:56:16 +03:00
Gubin, Maksim
9aa7f80e82 hot fix api.executeCommand 2016-09-23 14:04:19 +03:00
hristoterezov
b772c151fc Merge pull request #925 from jitsi/invite-to-share-dialog
Invite to share dialog
2016-09-22 21:53:40 -05:00
yanas
d2e42c2a7d Update MessageHandler.js 2016-09-22 21:11:24 -05:00
yanas
b54f92b2ae Fixes the copy action. 2016-09-22 18:17:37 -05:00
yanas
5ef241ae66 Merge pull request #927 from jitsi/fix-feedback-resolve
Makes sure we always resolve(call the callback) in feedback dialog.
2016-09-22 17:47:17 -05:00
damencho
eb2e709749 Makes sure we always resolve(call the callback) in feedback dialog.
Call the callback even when clicking outside the dialog, or escaping to close it.
2016-09-22 16:55:08 -05:00
yanas
06247266ad Merge pull request #924 from jitsi/add-close-page
Adds close page
2016-09-22 16:20:14 -05:00
damencho
f9a5b62326 Changes the state of room locker if room was locked not by current user. 2016-09-22 16:10:17 -05:00
yanas
644faca306 Re-designs invite dialog as share link. 2016-09-22 15:50:09 -05:00
yanas
9cb0723f8d Remove duplicate styles. 2016-09-22 15:32:54 -05:00
yanas
48c99e796f Includes content to close html. 2016-09-22 15:32:54 -05:00
damencho
fcf7069b25 Adds close page.
When enabled after hanging up redirect to close page, if needed feedback will be displayed.
2016-09-22 15:32:54 -05:00
damencho
415619021f Moves handling of thank you dialog.
Moves handling of thank you dialog out of the Promise that handles the feedback and just before we redirect to welcome page.
2016-09-22 15:32:54 -05:00
yanas
88a45cf991 Fixes colors in dialogs. 2016-09-22 14:50:31 -05:00
yanas
7eb85fe7aa Merge pull request #923 from jitsi/fix_ringoverlay_sound
fix(ringoverlay): Path of the ogg file
2016-09-22 14:08:25 -05:00
hristoterezov
0e5fe88b5e fix(ringoverlay): Path of the ogg file 2016-09-22 13:50:10 -05:00
yanas
b754361268 Merge pull request #920 from jitsi/remove_prezi_leftovers
fix: remove Prezi leftovers
2016-09-22 12:45:20 -05:00
paweldomas
419950ca49 fix(VideoLayout): "connection interrupted" shown only on video
The message about having connectivity issues should be displayed only
on top of the video like the "video problems filter" is.
2016-09-22 12:43:23 -05:00
paweldomas
11953cbb60 feat(conference.js): add isConnectionInterrupted getter 2016-09-22 12:43:12 -05:00
paweldomas
ecfc05bcc8 fix(LargeVideoManager): enable video problems filter on VideoContainer
Only the VideoContainer is interested in showing the video problems
filter which is meant to be displayed when ICE is disconnected.
2016-09-22 12:43:03 -05:00
yanas
b0012b4d63 Merge pull request #921 from jitsi/contaclist-title-update
Always show number of participants badge in toolbar.
2016-09-22 12:40:39 -05:00
damencho
febaf49d07 Always show number of participants badge in toolbar.
Includes showing 1 when user is alone in the room.
2016-09-22 12:02:38 -05:00
paweldomas
e3f3287f14 fix: remove Prezi leftovers 2016-09-22 11:35:35 -05:00
Дамян Минков
fbd2879aa3 Merge pull request #918 from kkrisstoff/make-the-star-configurable
disable_star_indicator added
2016-09-22 10:19:16 -05:00
yanas
4db8faa526 Merge pull request #914 from jitsi/fix_toolbar_ringoverlay
fix(toolbar): Issue with toolbar is positioned under the ring overlay
2016-09-22 10:12:38 -05:00
Дамян Минков
586ea2ae0d Merge pull request #911 from jitsi/small_videolayout_refactoring
Small videolayout refactoring
2016-09-22 09:45:15 -05:00
paweldomas
e39648ce21 ref(LargeVideo): rename to LargeVideoManager
It is confusing when the name of the main class exported from the file
is not the same as the filename.
2016-09-22 08:57:14 -05:00
paweldomas
e0a05c5908 ref(LargeVideo): move VideoContainer to separate file
VideoContainer is a separate being which implements the LargeContainer
and it's confusing to have it in the same file. This was encouraging to
access private parts of the VideoContainer directly(not through
the interface).
2016-09-22 08:57:14 -05:00
paweldomas
2c01fde713 ref(SmallVideo): rename 'isMuted' to avoid confusion 2016-09-22 08:57:01 -05:00
Kostiantyn Pashura
82ebfd9945 disable_star_indicator added 2016-09-22 12:52:53 +03:00
yanas
92641c20f3 Merge pull request #916 from jitsi/contaclist-title-update
Moves the number in the code, not as a translation parameter.
2016-09-21 22:15:48 -05:00
yanas
f145d98a12 Merge pull request #915 from jitsi/update-tooltip-from-profile
Update tooltip from profile
2016-09-21 18:15:54 -05:00
yanas
a3d2c95d80 Merge pull request #913 from jitsi/adjust-feedback-question
Adjusts feedback dialog question.
2016-09-21 18:01:31 -05:00
yanas
a5a9936e25 Adjusts feedback text and takes into account comment 2016-09-21 18:00:21 -05:00
damencho
cfeb03740c Moves the number in the code, not as a translation parameter.
There is sometimes problems with cache and late loading of the translations, this commit avoids showing translation key in the contactlist title, by moving the parameter into the code.
2016-09-21 17:16:00 -05:00
damencho
4ab0fca4d7 Removes tooltip from profile avatar when not clickable. 2016-09-21 16:35:42 -05:00
damencho
df3b7e2dbc Adds utility method to remove tooltips. 2016-09-21 16:35:03 -05:00
hristoterezov
302b0cf776 fix(toolbar): Issue with toolbar is positioned under the ring overlay 2016-09-21 16:34:06 -05:00
yanas
e7cbacf9a2 Merge pull request #912 from jitsi/remove-download-logs-link
Remove download logs link
2016-09-21 16:18:18 -05:00
Любомир Маринов
f9817b12bf Merge pull request #910 from jitsi/fix_jitsi_track_error_import
fix(UI): Show the correct message on NO_DATA_FROM_SOURCE GUM errors
2016-09-21 15:57:32 -05:00
damencho
bbc7aedb48 Adds download logs method for debugging.
Adds a download logs method that can be called from console to take usefull messages for debugging.
console> APP.conference.saveLogs();
2016-09-21 15:46:10 -05:00
damencho
4fdc11c6fb Removes download logs references. 2016-09-21 15:45:08 -05:00
hristoterezov
e1cb75fe04 fix(UI): Show the correct message on NO_DATA_FROM_SOURCE GUM errors 2016-09-21 15:31:49 -05:00
yanas
0bf6d52eef Merge pull request #902 from jitsi/fix-authentication-failed-msg
Fixes message for authentication failed.
2016-09-20 12:47:53 -05:00
yanas
7453198472 Fixes message for authentication failed. 2016-09-20 12:08:44 -05:00
Дамян Минков
0c1120c1a8 Merge pull request #897 from jitsi/settings-css-adjustments
Some css and lang adjustments to settings and contact list.
2016-09-20 10:48:57 -05:00
yanas
efbc84d18b Merge pull request #898 from m-voloshin/tooltip-fix-layer
Adjustment for layer order
2016-09-20 10:45:57 -05:00
Дамян Минков
cdca1a46ef Merge pull request #901 from jitsi/remove-missing-method
Removes missing and unused method.
2016-09-20 10:20:23 -05:00
yanas
689f7dc8f3 Merge pull request #900 from jitsi/delete-css-ds_store
Delete css/.DS_Store
2016-09-20 10:17:35 -05:00
yanas
4ca9349de7 Removes missing and unused method. 2016-09-20 10:16:15 -05:00
Lyubomir Marinov
9d6253455a Delete css/.DS_Store 2016-09-20 10:12:56 -05:00
Maxim Voloshin
388f868165 Adjustment for layer order 2016-09-20 13:15:10 +03:00
yanas
aacb39a439 Some css adjustments to settings and contact list. 2016-09-20 01:14:00 -05:00
yanas
298338f076 Merge pull request #896 from jitsi/fix-feedback-dialog
Feedback dialog changes
2016-09-19 23:52:14 -05:00
yanas
2d2915967c Fixes focus in Feedback and makes animation configurable. 2016-09-19 23:25:03 -05:00
Kostiantyn Pashura
4572e1d344 feedback dialog changes 2016-09-19 22:27:41 -05:00
yanas
f8b200f32c Merge pull request #892 from m-voloshin/blue-badges
Blue badges
2016-09-19 22:27:10 -05:00
yanas
3d4addd9ef Fixes badge font and corrects file name. 2016-09-19 22:07:10 -05:00
yanas
2919a60403 Adds blue badges to contact list and chat. 2016-09-19 21:22:41 -05:00
Paweł Domas
a07858cc72 Merge pull request #891 from jitsi/video-thumbnail-toolbar-fixes
Video thumbnail toolbar fixes
2016-09-19 19:31:08 -05:00
yanas
d1d4674136 Fixes some jsdocs. 2016-09-19 18:04:55 -05:00
Paweł Domas
9b5d4b8ceb Merge pull request #856 from jitsi/implement_muted_ended_track_events
feat(UI): Add UI support for camera issue detection
2016-09-19 16:03:06 -05:00
hristoterezov
abe216a0bb feat(UI): Add UI support for camera issue detection 2016-09-19 14:49:50 -05:00
hristoterezov
84983c341e Merge pull request #844 from jitsi/device-selection-rework
Device selection rework
2016-09-19 13:56:21 -05:00
Paweł Domas
075423ee96 Merge pull request #895 from jitsi/fix-incorrect-json-file
Fix incorrect JSON file
2016-09-19 13:29:06 -05:00
Lyubomir Marinov
2ff77676e2 Fix incorrect JSON file
The extension of the file modules/UI/side_pannels/chat/smileys.json
suggests that the format of the file is JSON. However, it contains
JavaScript RegExp instances which do not represent valid JSON. Such
discrepancies between file extension and format cause failures in
certain tools such as Webpack. Convert the file (both extension and
format) into a valid ES2015 module.
2016-09-19 12:48:38 -05:00
yanas
2da3373e10 Merge pull request #890 from jitsi/updates-watermark-link
Updates handling links on watermarks.
2016-09-18 17:02:12 -05:00
yanas
1486eac752 Applies fixes to thumbnail video toolbar from m-voloshin 2016-09-18 16:58:34 -05:00
yanas
c5adecb6e1 Adds menu icon to font. 2016-09-18 16:42:33 -05:00
damencho
e4c4236386 Updates handling links on watermarks.
When link is missing disable clicking.
2016-09-16 15:17:34 -05:00
yanas
e5e7e043ee Merge pull request #889 from BeatC/tooltips-bg
Change color for tooltip
2016-09-16 12:54:15 -05:00
Ilya Daynatovich
f8d01b4312 Change color for tooltip 2016-09-16 19:05:23 +03:00
Дамян Минков
f0a898c674 Merge pull request #885 from jitsi/add-raise-hand-toggle
Adds raise hand toggle state.
2016-09-16 10:28:12 -05:00
yanas
8b7bdb4957 Changes the raise hand event name to fit better the action 2016-09-16 10:22:50 -05:00
yanas
bd46430434 Small color change 2016-09-16 10:22:50 -05:00
yanas
a1635ccc68 Adds javadoc 2016-09-16 10:22:50 -05:00
yanas
1853fa6fae Adds raise hand toggle state. 2016-09-16 10:22:50 -05:00
Дамян Минков
692f0792e1 Merge pull request #886 from jitsi/fix-some-tooltips
Fixes dominant speaker and raised hand tooltips
2016-09-16 10:18:23 -05:00
yanas
bc222c60e0 Fixes dominant speaker and raised hand tooltips 2016-09-16 00:37:29 -05:00
yanas
96bbf0419c Adds tooltips 2016-09-16 00:04:19 -05:00
yanas
531e3d2765 Merge pull request #884 from jitsi/updates-lock-room
Updates lock room
2016-09-15 22:24:58 -05:00
damencho
02165786f1 Handles case where somebody removed lock of the room while we attempt to join.
Receiving password required, marks the room as locked, but if we try to enter without password, mark it as unlocked till we receive a password required error or we successfully join.
2016-09-15 16:34:02 -05:00
damencho
a449223b40 Clears the password if user cancels password prompt.
Clears the password if user cancel attempt to enter password, as using one instance of locker for multiple attempts keeps the password.
2016-09-15 16:32:10 -05:00
yanas
12344ab486 Merge pull request #883 from jitsi/contactlist-displayname
Syncs contactlist display names with thumbnails.
2016-09-15 15:22:47 -05:00
yanas
b6e18d8a68 Merge pull request #882 from jitsi/fix-hide-toolbar
Fixes hiding toolbar.
2016-09-15 15:10:54 -05:00
damencho
1a0677cb59 Syncs contactlist display names with thumbnails.
Uses the same display names in the contact list as in the thumbnails, for local and remote.
2016-09-15 15:01:48 -05:00
damencho
c483587853 Fixes hiding toolbar.
Receiving messages docks the toolbar to be able to see number of unread messages. We need to undock it when we read the messages. We skip undocking if we are not in video mode (on large), cause stuff like youtube video share is docking/undocking the toolbar.
2016-09-15 14:02:56 -05:00
hristoterezov
9b25467080 Merge pull request #878 from jitsi/video-thumbnail-redesign
Video thumbnails redesign
2016-09-15 13:48:07 -05:00
yanas
f37fd15fca Merge pull request #876 from jitsi/ui-ringoverlay-stop
feat(ringoverlay): Stop ringing after 30s and change the message
2016-09-14 21:44:59 -05:00
yanas
5092f52716 Merge pull request #874 from jitsi/ui-fix-ringoverlay
feat(ringoverlay): Change the background when the avatar is displayed
2016-09-14 21:40:54 -05:00
yanas
0013745783 Video thumbnails redesign 2016-09-14 21:20:54 -05:00
hristoterezov
ad5fa13339 feat(ringoverlay): Stop ringing after 30s and change the message 2016-09-14 17:55:43 -05:00
yanas
e1fa5ecb34 Merge pull request #873 from jitsi/chat-updates
Chat updates
2016-09-14 17:08:34 -05:00
damencho
e1512e3776 Fixes focusing on write area or nickname input when chat is open. 2016-09-14 16:47:10 -05:00
hristoterezov
dab5252746 feat(ringoverlay): Change the background when the avatar is displayed 2016-09-14 16:26:17 -05:00
damencho
d8dd564b06 Fixes clearing message counter on opening the chat. 2016-09-14 15:22:36 -05:00
damencho
407b082780 Removes changing the message icon and flashing on new message. 2016-09-14 15:18:14 -05:00
damencho
a671093489 Introduces chat_container_id variable. 2016-09-14 15:13:15 -05:00
damencho
3ee61df319 Updates talk while muted indication after latest ui changes. 2016-09-14 13:26:28 -05:00
damencho
c43b1f54c7 Shows toolbar before showing talk while muted notification. 2016-09-14 13:26:28 -05:00
damencho
1a554828e1 Adds option to add custom timeout for hiding toolbar. 2016-09-14 13:26:28 -05:00
damencho
974a0334df Updates text for talk while muted. 2016-09-14 13:26:28 -05:00
damencho
e7e7c7d5a0 Handles talk while muted event. 2016-09-14 13:26:28 -05:00
Дамян Минков
29f0c0b311 Merge pull request #870 from jitsi/add-raised-hand-icon
Adds raise hand icon
2016-09-14 12:17:06 -05:00
yanas
955680018f Merge pull request #872 from jitsi/fix-hiding-toolbars
Fixes hiding toolbars.
2016-09-14 12:16:57 -05:00
damencho
686e85cd4f Fixes hiding toolbars.
Schedule new hide check if toolbar is hovered, overlay is shown or the sideBar container is visible (chat, contactlist , etc.).
2016-09-14 11:51:47 -05:00
hristoterezov
297d4e65fc style(gitignore): Add .sync-config.cson 2016-09-14 11:38:43 -05:00
yanas
0e94bf7e0b Merge pull request #871 from jitsi/fix-remote-video-thumb
Fixes parameters for VideoLayout.resizeThumbnails.
2016-09-14 11:00:14 -05:00
damencho
a5bc9625ef Fixes parameters for VideoLayout.resizeThumbnails. 2016-09-14 10:48:38 -05:00
yanas
cbde4f89b2 Adds raise hand icon 2016-09-14 09:00:59 -05:00
yanas
891c108191 Merges fix from m-voloshin for Firefox toolbar 2016-09-14 08:25:11 -05:00
yanas
764d767789 Update _variables.scss 2016-09-14 01:22:33 -05:00
yanas
7ded10cd8d Merge pull request #865 from jitsi/add-raise-hand-button
Adds a possibility to add raise hand as a button
2016-09-13 23:09:18 -05:00
yanas
3b05a16b32 Fix for button appearing in both toolbars 2016-09-13 22:10:13 -05:00
yanas
cf49c8c6ff Adds raise hand button to the side toolbar 2016-09-13 21:21:31 -05:00
yanas
99bf4bc44d Adds a possibility to add raise hand as a button 2016-09-13 21:21:31 -05:00
yanas
929639b06b Merge pull request #863 from jitsi/contact-list-update
Contact list update
2016-09-13 21:21:03 -05:00
Дамян Минков
c18b80c43f Merge pull request #862 from jitsi/make-settings-sections-configurable
Make settings sections configurable
2016-09-13 20:46:03 -05:00
yanas
9ce83250da Fixes console logs 2016-09-13 20:43:44 -05:00
yanas
a9e31a2843 Fixes settings menu for non moderators 2016-09-13 20:43:44 -05:00
yanas
45496b7592 Make settings sections configurable 2016-09-13 20:43:44 -05:00
yanas
4075a5f4f7 Merge pull request #864 from jitsi/origin/ui-redesign-guests-profile
fix(profile_icon): Cursor and background styles
2016-09-13 19:17:45 -05:00
hristoterezov
2d4819257b fix(profile_icon): Cursor and background styles 2016-09-13 18:19:38 -05:00
yanas
406618677b Merge pull request #861 from jitsi/ui-redesign-guests-profile
feat(profile): Don't allow non-guest users to edit their profile
2016-09-13 17:38:51 -05:00
damencho
4c72833f5a Adds an option and hide avatars in contact list. 2016-09-13 17:14:05 -05:00
damencho
e3eaac5bef Disables click toggler. 2016-09-13 17:12:10 -05:00
hristoterezov
f10b13328f feat(profile): Don't allow non-guest users to edit their profile 2016-09-13 16:56:05 -05:00
Дамян Минков
c609cd0ace Merge pull request #859 from jitsi/change-ringing-background
Ringing background changed to gradient
2016-09-13 16:53:32 -05:00
yanas
0396a05b38 Merge pull request #860 from jitsi/css-watermark-link-variable
Moves watermark link to be css variable.
2016-09-13 16:46:53 -05:00
damencho
4a460e09b9 Moves watermark link to be css variable. 2016-09-13 16:46:15 -05:00
yanas
d5d81c1bed Merge pull request #858 from jitsi/ui-redesign-feedback
Ui redesign feedback
2016-09-13 16:44:11 -05:00
yanas
dc6e8f99d8 Ringing background change to gradient 2016-09-13 16:32:00 -05:00
hristoterezov
e02a8c9103 fix(feedback): Styles of Feedback dialog 2016-09-13 16:06:53 -05:00
Maxim Voloshin
7b4941bde9 Redesigned feedback window 2016-09-13 16:06:53 -05:00
hristoterezov
c602839e06 Merge pull request #851 from jitsi/ui-redesign-in-progress
Ui redesign in progress
2016-09-13 14:50:59 -05:00
yanas
2aea6c4120 Remove unused dialog 2016-09-13 13:07:08 -05:00
hristoterezov
a937e025b5 fix(index.html): Remove preload attribute on local video tag 2016-09-13 12:59:59 -05:00
yanas
b9fb510006 Adds ringing.scss, which was missing 2016-09-13 10:47:22 -05:00
Дамян Минков
b3f66aea3b Merge pull request #618 from photoninger/add_firefox_supportedBrowsers
Add Firefox in list of supportedBrowsers for invite emails
2016-09-13 08:29:59 -05:00
yanas
8491fbbd95 Reverts change in makefile 2016-09-12 23:29:26 -05:00
yanas
c6ec96aca5 Adds avatar on stage specific background 2016-09-12 23:24:23 -05:00
yanas
d250623fde Ring overlay improvements and enable buttons fix 2016-09-12 23:24:10 -05:00
hristoterezov
c3b4ecbbd8 fix(ext_toolbar): position of authentication popup 2016-09-12 16:22:51 -05:00
hristoterezov
2b84a149fe fix(toolbar): Button popups 2016-09-12 14:43:34 -05:00
hristoterezov
99ca38d13f Merge pull request #852 from jitsi/make-node-sass
Installs node-sass on every update, fixes a problem in some operating…
2016-09-12 12:54:52 -05:00
damencho
bfc174ffdc Installs node-sass on every update, fixes a problem in some operating systems. 2016-09-12 12:02:43 -05:00
yanas
09f7615a35 Changes icon set. 2016-09-11 23:36:15 -05:00
yanas
fdf0e39516 Fix lock room 2016-09-11 20:49:59 -05:00
yanas
775f389e5c Fix watermark and help position related to toolbar 2016-09-11 17:06:08 -05:00
yanas
f811410b45 Settings re-design 2016-09-11 16:55:06 -05:00
yanas
50e803f1a0 Fixes side toolbar container behavior 2016-09-09 21:26:29 -05:00
Paweł Domas
9a0d8616ed Merge pull request #847 from jitsi/cs-custom-scriptUrl
Skips some url parameters that can inject scripts.
2016-09-08 18:09:04 -05:00
yanas
b4c9816d9f Rename side panels and implement toggle/untoggle policy 2016-09-08 17:38:41 -05:00
yanas
17e28069ab Re-designs toolbars, side panels like setting, contact list 2016-09-08 13:22:50 -05:00
yanas
8562d3d55d Remove bottom toolbar and change side panel position and behavior 2016-09-08 13:16:23 -05:00
damencho
d65479abc9 Skips some url parameters that can inject scripts. 2016-09-08 13:12:56 -05:00
yanas
ed29db290e Add mixins for animations and separate toolbar css 2016-09-08 12:19:45 -05:00
yanas
978c0f2f31 Remove unused import 2016-09-08 12:19:45 -05:00
damencho
62c4ff719e Fixes build. 2016-09-08 11:26:57 -05:00
Ilya Daynatovich
e28f646cef Fixed styles for unsupported browser page 2016-09-08 11:15:17 -05:00
yanas
fb63ed92a8 Resets the main font after remove 2016-09-07 22:07:13 -05:00
yanas
c0097d1e2b Merge pull request #833 from BeatC/configurable-text
Set up SASS and change base font
2016-09-07 22:05:58 -05:00
damencho
0683f94edb Skips storing devices (mic and camera) if there is no user selection.
Skips storing device ids in localstorage if the user hasn't selected a device to use, and keeps using system defaults. Removes calls to private library method for setting initial realDeviceIds, as this had been added to the library.
2016-09-07 16:48:57 -05:00
yanas
fe710d8de9 Merge pull request #842 from jitsi/revert-kicks
Revert "Temprorary disable kicks hack."
2016-09-07 10:59:23 -05:00
damencho
83546a899f Revert "Temprorary disable kicks hack."
This reverts commit 76a7c7b426.
2016-09-07 10:48:13 -05:00
hristoterezov
2eca459ff6 Merge pull request #840 from jitsi/moves-analytics-feedback
Moves analytics event for feedback to the library.
2016-09-07 09:42:30 -05:00
hristoterezov
6b23ad54db Merge pull request #839 from jitsi/removes-ds-error-onjoin
Skips selecting local participant when alone in the room.
2016-09-07 09:41:01 -05:00
damencho
5ef7f38bed Moves analytics event for feedback to the library. 2016-09-06 13:16:54 -05:00
damencho
f86056c4f8 Skips selecting local participant when alone in the room. 2016-09-06 12:00:13 -05:00
Emil Ivov
f19b364871 Merge pull request #838 from jitsi/fix_audio_not_working_msg
fix(lang): Change the message in the mic not working error dialog
2016-09-06 11:33:54 -05:00
hristoterezov
29f1d96d87 fix(lang): Change the message in the mic not working error dialog 2016-09-06 11:30:51 -05:00
yanas
2f966b7da4 Merge pull request #829 from BeatC/fix-sharing-resize-after-hiding-filmstrip
Fix problem with resizing
2016-09-04 20:16:08 -05:00
bgrozev
e3f599fbc0 Merge pull request #834 from jitsi/disable-kick-until-fixed-hack
Temprorary disable kicks hack.
2016-09-02 11:44:15 -05:00
yanas
76a7c7b426 Temprorary disable kicks hack. 2016-09-02 11:19:17 -05:00
Ilya Daynatovich
4044e11da2 Set up SASS and change base font 2016-09-02 12:55:33 +03:00
Дамян Минков
a07c21b2a3 Merge pull request #832 from jitsi/remove-avatar-url
Remove avatar url - not used anymore
2016-09-01 16:55:11 -05:00
yanas
109bedba75 Update index.html 2016-09-01 16:37:07 -05:00
Дамян Минков
aced860ba4 Merge pull request #830 from jitsi/detect_local_media_not_working
Shows dialog when lib-jitsi-meet report microphone issues
2016-09-01 14:16:50 -05:00
hristoterezov
d33324c198 Merge pull request #831 from jitsi/analytics-remove-browser-suffix
Adds browser name as parameter.
2016-09-01 14:16:41 -05:00
damencho
adb1b33441 Adds browser name as parameter. 2016-09-01 14:13:17 -05:00
yanas
238e1f1bea Merge pull request #814 from BeatC/fix-video-preview-when-resize
Fix problem with last video preview
2016-09-01 13:45:56 -05:00
hristoterezov
4c9b6ce193 Shows dialog when lib-jitsi-meet report microphone issues 2016-09-01 12:57:21 -05:00
Paweł Domas
5ef547d285 Merge pull request #828 from SamWhited/mod_token_use_proper_path
Use valid path for HTTP token fetches
2016-09-01 10:02:47 -05:00
Ilya Daynatovich
aea99b8ffb Fix problem with resizing 2016-09-01 08:53:51 +03:00
Sam Whited
9ec120d7cb Use valid path for HTTP token fetches 2016-08-31 16:25:49 -05:00
Дамян Минков
e2c5439112 Merge pull request #821 from SamWhited/hql1748_update_lock_icon_on_config_change
Update lock icon when moderator changes state
2016-08-31 15:53:17 -05:00
hristoterezov
19362d1904 Merge pull request #826 from jitsi/fix-random-avatar
Fixes random avatar
2016-08-31 15:46:53 -05:00
hristoterezov
1a69fd8a49 Merge pull request #822 from jitsi/removes-atarURL
Removes avatar url from UI.
2016-08-31 15:39:00 -05:00
yanas
224670ed03 Merge pull request #827 from jitsi/fix-missing-indications-on-no-video-device
Moves local video thumb initializations where they belong.
2016-08-31 14:55:12 -05:00
damencho
bb705e32d9 Moves local video thumb initializations where they belong.
Moves local video thumb initializations where they belong in the local video constructor. Fixes a problem when there is no video device, then audio levels and gsm bars are missing. We were doing this initializations every time a video device is changed.
2016-08-31 14:18:09 -05:00
Sam Whited
3e269978d9 Update lock icon when moderator changes state 2016-08-31 13:59:08 -05:00
Paweł Domas
9ba62c320b Merge pull request #825 from SamWhited/mod_token_improvements
Mod token improvements
2016-08-31 12:48:04 -05:00
damencho
8e6d7d3960 Sends and dispatches avatarId command. 2016-08-31 11:41:17 -05:00
damencho
3138748f57 Uses avatarId from settings.
Removes unused variable bottomToolbarEnabled.
2016-08-31 11:40:06 -05:00
damencho
6f10156bf3 Adds avatarId and respect it with lowest priority. 2016-08-31 11:37:11 -05:00
damencho
3852b34397 Adds avatarId to Settings. 2016-08-31 11:24:51 -05:00
Sam Whited
3128628d09 Populate the token cache 2016-08-31 09:30:07 -05:00
Sam Whited
d8c4c0627a SHA256 hash the kid claim before fetching tokens 2016-08-31 09:24:15 -05:00
hristoterezov
d9559ecf63 Merge pull request #817 from jitsi/fix-shortcut-tooltips
Fix shortcut appearing in tooltip of wrong buttons
2016-08-30 15:30:09 -05:00
yanas
2b492883ca Some code optimisations. 2016-08-30 14:14:52 -05:00
damencho
5ab6c551df Disables storing display name and email when using overlay ring. 2016-08-30 14:10:20 -05:00
damencho
0e27f471f1 Removes avatarURL from settings UI.
Removes storing avatarURL in localstorage and retrieving it.
2016-08-30 14:09:07 -05:00
hristoterezov
ba477ad720 Merge pull request #816 from jitsi/improve-device-errors
Updates string for not found devices.
2016-08-30 13:04:44 -05:00
yanas
7858c157c1 Fix shortcut appearing in tooltip of wrong buttons 2016-08-29 23:56:20 -05:00
damencho
a5d3cc63c3 Updates string for not found devices.
The user can be in case where there is no audio or no video device at all, so removing the requested word from the message.
2016-08-29 16:46:44 -05:00
hristoterezov
cac7ccf176 Merge pull request #812 from jitsi/attach-shortcuts-to-features
Attach keyboard shortcuts to features
2016-08-29 16:05:12 -05:00
yanas
9693cba17a Registers filmstrip shortcut from bottom toolbar 2016-08-29 15:47:24 -05:00
yanas
45e38ae4c9 Fix wrong import 2016-08-29 13:04:55 -05:00
Paweł Domas
ad68d535b4 Merge pull request #815 from SamWhited/mod_auth_token_tweaks
mod_auth_token: Misc minor fixes
2016-08-29 10:23:44 -05:00
Sam Whited
bb56ea4b33 mod_auth_token: Add semicolons
Remove unnecessary cjson config
2016-08-29 09:39:47 -05:00
Ilya Daynatovich
ba822eaeed Fix problem with last video preview 2016-08-29 16:39:57 +03:00
yanas
7076ada6f4 Attach keyboard shortcuts to features 2016-08-28 22:59:23 -05:00
Paweł Domas
84834dc4e6 Merge pull request #808 from SamWhited/auth_token_asap
Add support for fetching public keys from a server to mod_auth_token
2016-08-26 16:51:17 -05:00
hristoterezov
f9b3f34593 Merge pull request #810 from jitsi/fix-hangup-multiple-feedback-windows
Fix hangup triggering multiple feedback windows
2016-08-26 16:30:31 -05:00
Sam Whited
c17576a931 mod_auth_token: Don't timeout finished requests 2016-08-26 16:19:01 -05:00
yanas
570124058c Addresses comment about Feedback dependency 2016-08-26 16:07:20 -05:00
Sam Whited
3793119209 mod_auth_token: Fix cache hit log line 2016-08-26 16:03:08 -05:00
Sam Whited
7fb18d1cb3 Fix broken claims comparison 2016-08-26 14:47:34 -05:00
Sam Whited
4fc86175e1 mod_auth_token: Set room name on session 2016-08-26 14:41:06 -05:00
Sam Whited
c951f7f3e9 Add missing semicolons 2016-08-26 14:11:50 -05:00
yanas
777217bd75 Fixes hangup triggering multiple feedbacks. 2016-08-26 11:42:45 -05:00
yanas
2bb637e140 Fixes hangup triggering several times 2016-08-26 11:42:45 -05:00
Дамян Минков
b5c1c95a15 Merge pull request #807 from jitsi/fix_ss_external_install
Fixes the issue with SS external installation dialog is not closed after the plugin has been installed
2016-08-26 11:40:35 -05:00
Sam Whited
f2e369cfc0 mod_auth_token: Remove broken path.join 2016-08-26 09:48:02 -05:00
yanas
6329271731 Merge pull request #806 from BeatC/fix-help-dialog-behind-filmstrip
Change z-index of keyboard-shortcuts
2016-08-25 14:15:57 -05:00
yanas
1428559546 Merge pull request #805 from jitsi/fix-moderator-mute
Fixes muting particular remote participant.
2016-08-25 14:15:01 -05:00
hristoterezov
5c9a85e928 Fixes the issue with SS external installation dialog is not closed after the plugin has been installed 2016-08-25 13:27:58 -05:00
Illia Daynatovich
00355caf8d HQL-1829 Change z-index of keyboard-shortcuts 2016-08-25 12:12:29 +03:00
Sam Whited
feb1d9d8e1 Add an LRU cache to mod_auth_token 2016-08-24 15:28:13 -05:00
Sam Whited
7f2fa9597c Add basic ASAP support to mod_auth_token
See: http://s2sauth.bitbucket.org/
2016-08-24 14:08:21 -05:00
damencho
246ab88a3e Fixes muting particular remote participant.
There was a bug that the handlers for menuItem for mute and kick are added for all remote participants. When clicked multiple handlers are executed and the action will be executed for all remote participants.
2016-08-23 18:37:41 -05:00
Дамян Минков
49cc4ae087 Merge pull request #802 from jitsi/fix-video-linux-qt
Fix video thumbnails for Qt on Linux.
2016-08-23 15:36:52 -05:00
hristoterezov
8d466ad77f Merge pull request #801 from jitsi/reloads-update
Updates statistics implementation.
2016-08-23 10:20:44 -05:00
yanas
f824f78db9 Fix video thumbnails for Qt on Linux. 2016-08-22 16:31:20 -05:00
damencho
35f592bb2c Adds optional label to statistics implementation. 2016-08-22 15:18:13 -05:00
bgrozev
25a6728acc Merge pull request #663 from cmrd-senya/patch-1
Update manual-install.md
2016-08-21 14:36:06 -05:00
jitsi-pootle
169da33411 New files added from translate.jitsi.org based on templates 2016-08-21 19:30:40 +00:00
George Politis
db70cf4aa9 Merge pull request #795 from jitsi/hide-download-log
Hide download log by default
2016-08-17 16:00:09 -05:00
yanas
dcfab4401f Update main.css 2016-08-17 15:50:26 -05:00
hristoterezov
d85a91ae49 Merge pull request #792 from jitsi/remove-bottom-toolbar-button-separators-1
Remove unused css class
2016-08-16 16:53:49 -04:00
hristoterezov
a3b1a80658 Merge pull request #791 from jitsi/remove-bottom-toolbar-button-separators
Remove bottom toolbar button separators
2016-08-16 16:53:03 -04:00
yanas
db20f145fb Remove unused css class 2016-08-16 15:20:32 -05:00
yanas
986bfd02b3 Remove bottom toolbar button separators 2016-08-16 15:14:30 -05:00
Paweł Domas
57506934f2 Merge pull request #790 from jitsi/show-toolbar-in-ring-overlay
Show the toolbar even if in a ring overlay
2016-08-16 15:07:51 -05:00
yanas
372a5e2a49 Update UI.js
Show the toolbar even if in a ring overlay.
2016-08-16 13:44:34 -05:00
Дамян Минков
726b972223 Merge pull request #789 from bgrozev/cleanup
refactor: removes unused code.
2016-08-15 22:59:35 -05:00
Boris Grozev
65300b34df refactor: removes unused code. 2016-08-15 22:57:36 -05:00
Paweł Domas
d7a7733d30 Merge pull request #787 from bgrozev/resolution-change
Brings back resolution changes logging to callstats.
2016-08-15 15:16:05 -05:00
Boris Grozev
7154fd4d39 Brings back resolution changes logging to callstats. 2016-08-15 14:40:55 -05:00
Дамян Минков
45830c1086 Merge pull request #785 from bgrozev/stream-switch-logs
Logs stream switch delays using analytics instead of callstats.
2016-08-12 16:51:39 -05:00
Дамян Минков
202ad0542f Merge pull request #784 from bgrozev/round-analytics-values
Rounds floats passed to analytics (instead of truncating them).
2016-08-12 16:51:29 -05:00
Boris Grozev
c59d9e7c8b Rounds floats passed to analytics (instead of truncating them). 2016-08-12 15:22:38 -05:00
Boris Grozev
f4f0a7d90e Logs stream switch delays using analytics instead of callstats. 2016-08-12 15:13:27 -05:00
damencho
ec98e6fdff Revert "Skips the analytics file from main folder when creating deb." Excluding file, excludes it and from subfolders.
This reverts commit 157bb1931d.
2016-08-11 12:53:37 -05:00
Дамян Минков
c68bcb8fbc Merge pull request #782 from jitsi/fix-unsupported-browser-images
Fix unsupported browser images
2016-08-11 11:08:59 -05:00
yanas
c37876a8b7 Fix unsupported browser images
Fixes the path of the unsupported browser images
2016-08-11 10:14:06 -05:00
bgrozev
23a805b79c Merge pull request #780 from jitsi/fix-duplicate-analytics-files
Skips the analytics file from main folder when creating deb.
2016-08-10 16:09:01 -05:00
damencho
157bb1931d Skips the analytics file from main folder when creating deb. 2016-08-10 15:47:54 -05:00
bgrozev
e59ad67055 Merge pull request #779 from jitsi/fix_ss_from_popup
Implements extension external installation for popup windows
2016-08-10 15:25:35 -05:00
hristoterezov
97b9b67768 Merge pull request #777 from jitsi/analytics-move2
Moves loading of analytics in the library.
2016-08-10 15:19:36 -05:00
hristoterezov
f899d16a79 Implements extension external installation for popup windows 2016-08-10 14:13:32 -05:00
damencho
53288fc997 Moves analytics js next to libraries so it can be dynamically loaded. 2016-08-10 13:28:15 -05:00
yanas
7c89f2b7d1 Merge pull request #778 from jitsi/fix-toolbar-hide
Fixes the check whether we are hovering over the toolbar.
2016-08-09 18:04:04 -05:00
damencho
2c39514359 Fixes the check whether we are hovering over the toolbar. 2016-08-09 17:39:24 -05:00
damencho
536ffb31e0 Moves loading of analytics in the library. 2016-08-09 15:04:40 -05:00
Дамян Минков
a50a980de4 Merge pull request #776 from jitsi/isolate-object-fix-browser-specific
Isolate object-fit fix for Windows Qt browser only
2016-08-08 17:19:56 -05:00
yanas
da0898a066 Isolate object-fit fix for Windows Qt browser only 2016-08-08 17:03:13 -05:00
George Politis
541f83cf71 Merge pull request #774 from jitsi/analytics-move
Analytics move
2016-08-05 13:49:05 -05:00
Paweł Domas
fe6588516f Merge pull request #773 from jitsi/object-fit-fix-and-refactoring-around-it
Object fit fix and refactoring around it
2016-08-05 10:25:36 -05:00
damencho
6651168dd3 Moves render and ttfm connection times to the library. 2016-08-05 09:52:09 -05:00
yanas
ced7da405d Merge pull request #772 from jitsi/crash_no_mediastreamtrack
Fix a crash on IE/Safari when plugin is not installed
2016-08-04 16:24:03 -05:00
yanas
fd836560aa Fix object-fit on some browsers 2016-08-04 15:56:04 -05:00
yanas
5654d34ee8 Fix remote participant menu for moderator 2016-08-04 15:24:36 -05:00
damencho
6302e42229 Uses analytics from lib-jitsi-meet and adds new events.
Adds more analytics events for shortcuts, recording and shared video. Changes the way we calculate ttfm.
2016-08-04 14:19:09 -05:00
paweldomas
34a24ce290 Fix a crash on IE/Safari when plugin is not installed 2016-08-04 09:37:04 -05:00
bgrozev
71a778b65c Merge pull request #771 from jitsi/IE10-URL-fix
Fix broken invite URL on IE10
2016-08-03 15:12:25 -05:00
paweldomas
62fa4dffa8 Fix broken invite URL on IE10
IE 10 does not support "window.location.origin"
2016-08-03 14:45:50 -05:00
yanas
d3dd643a88 Revert "Fix object-fit: cover not supported for video"
This reverts commit db0c4e95f7.
2016-08-03 13:03:42 -05:00
yanas
6116df9411 Revert "Change the default font to Helvetica Neue"
This reverts commit b309ef25fd.
2016-08-03 13:01:46 -05:00
yanas
db0c4e95f7 Fix object-fit: cover not supported for video 2016-08-03 13:01:46 -05:00
Дамян Минков
9a25db34aa Merge pull request #763 from jitsi/hide_toolbar_when_ringing
Hide the toolbar when the the ring overlay is displayed
2016-08-03 13:00:52 -05:00
Paweł Domas
c7710bfe1c Merge pull request #769 from jitsi/ttfm
Adds analytics event and console log for TTFM (time to first media).
2016-08-03 12:52:20 -05:00
Дамян Минков
dd7502f8de Merge pull request #754 from bgrozev/log-json
Formats the resolution change log as JSON.
2016-08-03 12:50:22 -05:00
damencho
df01358fb8 Adds comment. 2016-08-03 12:49:19 -05:00
Paweł Domas
d3cd634bff Merge pull request #770 from jitsi/update-config-inclusion
Update config inclusion
2016-08-03 12:39:26 -05:00
damencho
1454a28a69 Fixes serving interface_config when using jetty. 2016-08-03 11:53:21 -05:00
damencho
7251c7a641 Fixes a problem when using base for the page.
The problem is when not using / before virtual files and having a base for the page nginx can search for the file in wrong location.
2016-08-03 11:52:56 -05:00
damencho
06c636311d Adds analytics event and console log for TTFM (time to first media). 2016-08-03 11:19:09 -05:00
hristoterezov
b457166726 Merge pull request #765 from jitsi/analytics-update2
Adds analytics event for rendering audio and video.
2016-08-02 14:53:19 -05:00
damencho
562c2e38db Adds analytics event for rendering audio and video. 2016-08-02 13:19:03 -05:00
hristoterezov
e2c16c9c11 Merge pull request #764 from jitsi/switch_to_luajwt
Switch back to 'luajwt' in order to fix broken JWT
2016-08-02 13:13:37 -05:00
hristoterezov
db91040443 Merge pull request #761 from jitsi/updates-index-title
Moves favicon into the title html.
2016-08-02 12:38:02 -05:00
paweldomas
9f3c209096 Switch back to 'luajwt' in order to fix broken JWT
Temporarily reference 'luajwtjitsi' luarock for immediate
deployment until our changes with RS256 support
eventually get merged with the master
2016-08-02 12:35:48 -05:00
paweldomas
123b5abb08 Hide the toolbar when the the ring overlay is displayed 2016-08-02 09:04:31 -05:00
damencho
6cb89891ce Moves favicon into the title html.
Moves favicon into the title html with all metadata for easy overriding. Moves the title html inclusion after all the connection optimisations to avoid downloading the icon to interfere those optimisations.
2016-08-01 17:11:16 -05:00
damencho
ff68caaa16 Adds a comment and disables jshint error.
Merge pull request #760 from aaronkvanmeerten/master
2016-08-01 17:00:47 -05:00
Aaron van Meerten
a58190a935 Interface Config loaded via SSI into index.html to allow deployment-specific overrides even when using CDN
update whitespace in toolbar buttons array to allow value to be more easily overridden
2016-08-01 16:42:15 -05:00
Дамян Минков
372278d163 Merge pull request #755 from jitsi/change-default-font
Change the default font to Helvetica Neue
2016-08-01 16:10:56 -05:00
Paweł Domas
a5a7b63abf Merge pull request #759 from jitsi/analytics-update
Adds more analytics events.
2016-08-01 15:43:31 -05:00
damencho
e9b7aaea84 Adds more analytics events. 2016-08-01 15:03:38 -05:00
George Politis
132d823f54 Merge pull request #758 from jitsi/updates-title-meta
Moves meta html headers inside title.html file.
2016-08-01 14:42:11 -05:00
George Politis
75eb30b09d Merge pull request #757 from jitsi/remove_query_string
Removes query arguments from the invite URL/address bar URL.
2016-08-01 14:22:43 -05:00
damencho
baa60347fb Moves meta html headers inside title.html file. 2016-08-01 14:18:54 -05:00
paweldomas
8de3e0ff0b Remove query parameters from the URL visible to the user 2016-08-01 13:44:42 -05:00
paweldomas
443c29f505 No longer use full href for the invite URL 2016-08-01 13:44:35 -05:00
yanas
b309ef25fd Change the default font to Helvetica Neue 2016-08-01 10:58:12 -05:00
Paweł Domas
0ea5175354 Merge pull request #737 from SamWhited/jwt_signing_none_check
Check for "none" alg in JWT signing
2016-08-01 08:33:08 -05:00
bgrozev
10517115c3 Merge pull request #752 from jitsi/fix_gsm_bars_resolution
Preventing the client for using/sending resolution data from/to remote participants
2016-07-28 15:37:38 -05:00
Boris Grozev
ddb356482f Formats the resolution change log as JSON. 2016-07-28 11:11:34 -05:00
hristoterezov
6ae35fb21d Preventing the client for using/sending resolution data from/to remote participants 2016-07-27 12:46:07 -05:00
bgrozev
330597182c Merge pull request #751 from jitsi/dc_send_throw
Handles the errors thrown by the data channel methods
2016-07-26 09:34:06 -05:00
Boris Grozev
adefa40dcc Simplifies code, reduces the scope of "try". 2016-07-26 08:32:25 -05:00
hristoterezov
8d162609e0 Handles the errors thrown by the data channel methods 2016-07-25 17:04:39 -05:00
Paweł Domas
0a51ddd7ef Merge pull request #750 from jitsi/fix_con_interrupted
Fixes issue with not removing connection interrupt label after reload
2016-07-25 14:09:30 -05:00
hristoterezov
c3ae8669e8 Fixes issue with not removing connection interrupt label after reload 2016-07-25 13:57:01 -05:00
Paweł Domas
974ba47e3c Merge pull request #748 from jitsi/gsm_bars_interrupted
Fixes the gsm bars during ice disconnected
2016-07-22 14:02:19 -05:00
hristoterezov
9d170e4c59 Fixes the gsm bars during ice disconnected 2016-07-22 13:42:41 -05:00
bgrozev
ae0e950c16 Merge pull request #746 from jitsi/dc_stats2
Changes the connection quality stats to be sent by the data channels
2016-07-22 07:34:01 +02:00
Дамян Минков
79412f20ab Updates quick-install doc with the new repo. 2016-07-21 22:53:58 -05:00
hristoterezov
7ea047cf1b Merge pull request #743 from jitsi/handle-initial-videotype
Uses videoType from the video track for the initial value.
2016-07-21 17:16:17 -05:00
hristoterezov
4bf5d69002 Changes the connection quality stats to be sent by the data channels 2016-07-21 17:00:57 -05:00
bgrozev
0e2d8a323a Merge pull request #732 from champtar/shortcut-help
Improve keyboard shortcut handling
2016-07-21 19:53:49 +02:00
Etienne CHAMPETIER
9a4cee1818 Improve keyboard shortcut handling
Use KeyboardEvent.key if available,
match both lower and upper case letters to keep previous behaviour

KeyboardEvent is a mess.

KeyboardEvent.which gives you, in theory, a decimal representation of the key pressed.
"r" or "R" gives you 82, which is "R", you can look at KeyboardEvent.shiftKey,
but you don't have access to capslock...

Maybe you want to use numbers, but of course NumPad will not give you the same than
"normal" numbers ...

Now if you use something else than letter, for exemple "?",
on a QWERTY keyboard "/" and "?" gives you 191,
on a AZERTY keyboard "," and "?" gives you 188, so we have to stick to letters.

This was for keydown and keyup events, keypressed event return the real char
(lower "a", "/", "?", ...) but it fails in some cases

The only non broken property is KeyboardEvent.key,
but it's only supported since Chrome 51, Opera 38, and not supported by Safari
https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key

A good reference & test:
http://unixpapa.com/js/testkey.html
http://unixpapa.com/js/key.html

Signed-off-by: Etienne CHAMPETIER <champetier.etienne@gmail.com>
2016-07-21 16:58:52 +02:00
bgrozev
b0957f387e Merge pull request #744 from jitsi/revert-741-dc_stats
Revert "Changes the connection quality stats to be sent by the data channels"
2016-07-21 08:36:12 +02:00
bgrozev
1f8dc54368 Revert "Changes the connection quality stats to be sent by the data channels" 2016-07-21 08:33:04 +02:00
damencho
74ece3a775 Uses videoType from the video track for the initial value.
Handles the case where the remote track is with initial value of camera and no further events are received for video type changed.
2016-07-20 22:13:26 -05:00
Дамян Минков
60f7b9ab93 Merge pull request #741 from jitsi/dc_stats
Changes the connection quality stats to be sent by the data channels
2016-07-20 16:13:51 -05:00
Paweł Domas
f8d555790b Merge pull request #742 from jitsi/add_languages
Adds Armenian and Occitan languages
2016-07-20 15:41:44 -05:00
hristoterezov
4ff297730c Adds Armenian and Occitan languages 2016-07-20 15:38:50 -05:00
ibauersachs
29050ea917 Commit from translate.jitsi.org by user ibauersachs.: 118 of 250 strings translated (10 fuzzy). 2016-07-20 20:19:10 +00:00
ibauersachs
c4c0bc1c37 Commit from translate.jitsi.org by user ibauersachs.: 150 of 250 strings translated (7 fuzzy). 2016-07-20 20:19:00 +00:00
ibauersachs
0f52f4e5a1 Commit from translate.jitsi.org by user ibauersachs.: 160 of 250 strings translated (6 fuzzy). 2016-07-20 20:18:47 +00:00
ibauersachs
cff7a5c2f5 Commit from translate.jitsi.org by user ibauersachs.: 151 of 250 strings translated (7 fuzzy). 2016-07-20 20:18:36 +00:00
ibauersachs
626d9a40ed Commit from translate.jitsi.org by user ibauersachs.: 163 of 250 strings translated (8 fuzzy). 2016-07-20 20:18:28 +00:00
ibauersachs
b8f26c58e3 Commit from translate.jitsi.org by user ibauersachs.: 238 of 250 strings translated (0 fuzzy). 2016-07-20 20:18:13 +00:00
ibauersachs
9dbd9b8405 Commit from translate.jitsi.org by user ibauersachs.: 237 of 250 strings translated (1 fuzzy). 2016-07-20 20:18:03 +00:00
ibauersachs
08f200f0eb Commit from translate.jitsi.org by user ibauersachs.: 203 of 250 strings translated (1 fuzzy). 2016-07-20 20:17:33 +00:00
ibauersachs
9fa65ccda6 Commit from translate.jitsi.org by user ibauersachs.: 203 of 250 strings translated (1 fuzzy). 2016-07-20 20:17:24 +00:00
hristoterezov
d0fa9e7ef1 Changes the connection quality stats to be sent by the data channels 2016-07-20 15:16:21 -05:00
Paweł Domas
d7c1976a52 Merge pull request #740 from jitsi/add_languages
Adds new languages to the language select box
2016-07-20 15:11:42 -05:00
hristoterezov
39e71efb2f Adds new languages to the language select box 2016-07-20 15:04:14 -05:00
Ingo Bauersachs
855bcf8fe3 Remove pt_BR language files 2016-07-20 21:25:37 +02:00
ibauersachs
97069f1dc6 Commit from translate.jitsi.org by user ibauersachs.: 250 of 250 strings translated (0 fuzzy). 2016-07-20 19:28:38 +00:00
ibauersachs
bc3c6412f6 Commit from translate.jitsi.org by user ibauersachs.: 250 of 250 strings translated (0 fuzzy). 2016-07-19 21:08:44 +00:00
ibauersachs
51dcb2befb Commit from translate.jitsi.org by user ibauersachs.: 250 of 250 strings translated (0 fuzzy). 2016-07-19 21:08:32 +00:00
ibauersachs
805c9e4eda Commit from translate.jitsi.org by user ibauersachs.: 250 of 250 strings translated (0 fuzzy). 2016-07-19 21:08:23 +00:00
Ingo Bauersachs
a38e85b39c Update languages.json 2016-07-19 22:51:38 +02:00
Ingo Bauersachs
96bd3a54cb Update languages.json 2016-07-19 22:37:24 +02:00
ibauersachs
4fd5fba768 Commit from translate.jitsi.org by user ibauersachs.: 250 of 250 strings translated (0 fuzzy). 2016-07-19 20:38:09 +00:00
ibauersachs
06027ea8e5 Commit from translate.jitsi.org by user ibauersachs.: 250 of 250 strings translated (0 fuzzy). 2016-07-19 20:37:30 +00:00
ibauersachs
6f38d58954 Commit from translate.jitsi.org by user ibauersachs.: 250 of 250 strings translated (0 fuzzy). 2016-07-19 20:37:10 +00:00
Ingo Bauersachs
30c964f1e3 Add Portuguese (Brazil) 2016-07-19 22:29:07 +02:00
ibauersachs
2a8e0bd866 Commit from translate.jitsi.org by user ibauersachs.: 249 of 249 strings translated (0 fuzzy). 2016-07-19 20:33:10 +00:00
Дамян Минков
644e12929c Merge pull request #733 from mbell8903/patch-1
Change reference to lib-jitsi-meet to use full github url
2016-07-19 10:50:06 -05:00
Sam Whited
d625b8e3f3 Check for "none" alg in JWT signing 2016-07-18 13:31:30 -05:00
hristoterezov
5b884806d2 Merge pull request #736 from jitsi/lock-error-dialog
Avoids multiple dialog when showing lock attempt errors.
2016-07-15 16:02:26 -05:00
damencho
7aa47647f0 Avoids multiple dialog when showing lock attempt errors. 2016-07-15 15:40:18 -05:00
Дамян Минков
c779dbe8ad Merge pull request #735 from jitsi/fix_typo
Fixes typo
2016-07-15 13:18:57 -05:00
Дамян Минков
64ee01d831 Merge pull request #734 from jitsi/no_audio_element_fix
Fixes the issue with missing audio element for remote participants
2016-07-15 13:18:47 -05:00
hristoterezov
52c6bbe731 Fixes typo 2016-07-15 13:14:10 -05:00
hristoterezov
1963972f75 Fixes the issue with missing audio element for remote participants 2016-07-15 13:12:14 -05:00
Michael Bell
85d0c62c1d Change reference to lib-jitsi-meet to use full github url
This resolves issue #694
2016-07-14 11:23:47 -04:00
Дамян Минков
dfa9bab9e1 Merge pull request #724 from jitsi/reloads
Implements support for conference reloads
2016-07-13 13:19:06 -05:00
champtar
3ed1532f25 Commit from translate.jitsi.org by user champtar.: 249 of 249 strings translated (0 fuzzy). 2016-07-13 11:01:42 +00:00
ibauersachs
115420db82 Commit from translate.jitsi.org by user ibauersachs.: 249 of 249 strings translated (0 fuzzy). 2016-07-12 16:39:53 +00:00
bgrozev
d2a6c4a97f Merge pull request #719 from jitsi/jibri-retries
Jibri retries
2016-07-11 15:53:25 -05:00
hristoterezov
c04874b087 Merge pull request #728 from jitsi/jwt-login-service-2
Jwt login service 2
2016-07-11 15:12:40 -05:00
Дамян Минков
a0b3018ea0 Merge pull request #729 from jitsi/issue_716
Fixes issue #716
2016-07-11 12:46:36 -05:00
hristoterezov
e46d45adea Fixes issue #716 2016-07-11 11:57:24 -05:00
paweldomas
f977030bd6 Add support for JWT login service 2016-07-11 13:47:10 +02:00
paweldomas
38fc1c01d4 Move XMPP login prompt handling to AuthHandler 2016-07-11 13:47:02 +02:00
hristoterezov
2f202deedf Merge branch 'master' into reloads 2016-07-08 16:03:10 -05:00
Дамян Минков
08bd40bb26 Merge pull request #722 from bgrozev/logging
Logs resolution changes to callstats.
2016-07-08 15:50:14 -05:00
Дамян Минков
28700173a0 Merge pull request #723 from bgrozev/doc
Adds documentation.
2016-07-08 15:49:48 -05:00
Boris Grozev
66a46fc580 Adds documentation. 2016-07-08 15:17:28 -05:00
Boris Grozev
de41977c77 Logs resolution changes to callstats. 2016-07-08 15:16:27 -05:00
hristoterezov
45c420561a Merge pull request #721 from jitsi/match-jquery-ui-version
Match the exact version of jquery-ui.
2016-07-08 14:43:22 -05:00
damencho
e240b15d61 Match the exact version of jquery-ui.
Using "compatible version" as ^... matches latest version 1.12.0 and not 1.10.5 (matches >=1.10.5 < 2.0.0) and this prevents it building from source with latest nodejs on clean environment.
2016-07-08 14:41:25 -05:00
bgrozev
486058834e Merge pull request #720 from jitsi/make-update
Executes npm update before making.
2016-07-08 10:54:45 -05:00
damencho
3e473ea9d7 Executes npm update before making.
Executes npm update before making, in order to update latest version of packages like lib-jitsi-meet which are updated from git. The npm install method is supposed to only resolve dependencies and not update to latest versions.
2016-07-08 10:52:04 -05:00
paweldomas
62dd54ab31 Display spinner for RETRYING recording status 2016-07-08 14:53:00 +02:00
paweldomas
b3e02add3d Fix moveToCorner method
If the class was contained the old code was removing it
2016-07-08 14:51:15 +02:00
hristoterezov
7bf9a82f0b Implements conference reload support 2016-07-07 20:44:04 -05:00
bgrozev
ce5ff20d5b Merge pull request #718 from jitsi/dialogs-update
Dialogs update
2016-07-06 14:52:45 -05:00
damencho
615daa8c9f Updates close function parameters. 2016-07-06 13:52:59 -05:00
damencho
5dffddceec Make sure we have only one dialog instance. 2016-07-06 13:26:27 -05:00
damencho
d5de49b5cf Returns the dialog instances that were created and adds an optional close callback. 2016-07-06 13:10:45 -05:00
damencho
62f7553ba4 Updates two button dialogs to be only single instance. 2016-07-06 11:00:04 -05:00
hristoterezov
b7ad6b606a Merge pull request #717 from tsareg/error_types
Expose JitsiTrackError through JitsiMeetJS.errorTypes.JitsiTrackError
2016-07-06 09:17:40 -05:00
tsareg
60c2ee41e3 Expose JitsiTrackError through JitsiMeetJS.errorTypes.JitsiTrackError 2016-07-06 16:21:26 +03:00
damencho
64475143cf Removes keyring dependency to switch to new build machine. 2016-06-30 15:31:35 -05:00
damencho
c1122eae3a Adds dependency to new keyring and new repo update. 2016-06-30 15:22:22 -05:00
Дамян Минков
1792b1ed85 Merge pull request #711 from jitsi/room_name_undefined
Fixes issue with room name parameter = undefined
2016-06-28 11:52:45 -05:00
hristoterezov
d624f2584d Fixes issue with room name parameter = undefined 2016-06-28 11:21:37 -05:00
Дамян Минков
f39f8d14fd Merge pull request #706 from jitsi/ui-improvements-and-styles
UI improvements and styles
2016-06-24 14:43:51 -05:00
yanas
770b003163 Change global font, unify fonts, colors and more 2016-06-24 14:09:34 -05:00
Дамян Минков
702b177e06 Merge pull request #708 from jitsi/gsm_bars_fix
Fixes issue with gsm bars for remote participants are always full
2016-06-24 12:26:48 -05:00
hristoterezov
3c0295e294 Removes console.debug 2016-06-24 12:25:21 -05:00
hristoterezov
970e8c764c Fixes issue with gsm bars for remote participants are always full 2016-06-24 12:22:51 -05:00
yanas
1d393f5786 Merge pull request #701 from tsareg/gum_permission_dialog_guidance
Show overlay with guidance for gUM permission prompts
2016-06-24 11:17:38 -05:00
tsareg
f03b228eea Merge remote-tracking branch 'remotes/upstream/master' into gum_permission_dialog_guidance 2016-06-24 13:02:58 +03:00
tsareg
d149ba6fc5 Fire an optional JitsiMediaDevices.PERMISSION_PROMPT_IS_SHOWN event when browser shows user media permission prompt when calling createLocalTracks 2016-06-24 12:47:13 +03:00
Дамян Минков
f3dc6f15e4 Merge pull request #705 from bgrozev/esc-shortcut
Hide the shortcuts panel when the Escape key is pressed.
2016-06-23 16:24:10 -05:00
tsareg
8ca282079a Changes after code review 2016-06-23 11:03:26 +03:00
yanas
769644a63f Merge pull request #700 from bgrozev/raise-hand2
Raise hand2
2016-06-22 21:59:22 -05:00
Boris Grozev
2cefea3677 Hide the shortcuts panel when the Escape key is pressed. 2016-06-22 13:30:00 -05:00
bgrozev
2e802c0f6d Merge pull request #698 from jitsi/external_api
Changes the implementation of the iframe API to use postis
2016-06-22 13:12:49 -05:00
hristoterezov
d29e39c1d2 Adds libs directory to .gitignore 2016-06-22 13:11:48 -05:00
hristoterezov
09fb5e5667 Merge pull request #703 from jitsi/fix-avatar-url-string
Fixes avatar URL setting string
2016-06-21 15:03:02 -05:00
yanas
70e5ce7aec Fixes avatar URL setting string 2016-06-21 15:01:43 -05:00
Любомир Маринов
1f942aa13d Merge pull request #697 from tsareg/fix_two_gum_error_dialogs
Fixing various edge-cases when two gUM error dialogs might be shown and other possible bugs
2016-06-21 12:49:10 -05:00
hristoterezov
b60095df28 Merge pull request #702 from jitsi/deb-update-deps
Removes unused dependency.
2016-06-21 10:52:20 -05:00
damencho
6715d41f92 Removes unused dependency.
Used to minimize strophe-plugins which were inside the source tree and now npm handles them.
2016-06-21 10:38:31 -05:00
tsareg
375b145030 Prevent possible memory leak 2016-06-21 17:39:00 +03:00
tsareg
9d3b2aee02 Show overlay with guidance for gUM permission prompts 2016-06-21 12:08:32 +03:00
Boris Grozev
2d2e27b8d0 Implements "raised hand". 2016-06-20 16:58:54 -05:00
Boris Grozev
4b6ac38058 Fixes a failure to show the dominant speaker indicator for the local participant. 2016-06-20 15:58:08 -05:00
hristoterezov
21c2469dd6 Removes unnecessary whitespaces from Makefile 2016-06-20 13:23:00 -05:00
hristoterezov
02f176c75a Changes the implementation of the iframe API to use postis 2016-06-17 15:35:40 -05:00
tsareg
8b528b582f Fixing various edge-cases when two gUM error dialogs might be shown and other possible bugs 2016-06-17 15:31:25 +03:00
Дамян Минков
72d38ad202 Merge pull request #696 from jitsi/add-pootle-langs
Add missing languages from Pootle
2016-06-15 12:53:59 -05:00
Ingo Bauersachs
7a5461e1cb Add missing languages from Pootle 2016-06-15 11:50:04 +02:00
Ingo Bauersachs
1714ede6d4 Rename Translation.md to readme.md 2016-06-15 11:45:03 +02:00
ibauersachs
f8ee97a71c Commit from translate.jitsi.org by user ibauersachs.: 240 of 240 strings translated (0 fuzzy). 2016-06-15 09:47:54 +00:00
tsareg
897a6bfbe6 Refactored conference.js code. Moved almost all code that relates to handling change of media devices to separate module. Fixed couple of bugs. 2016-06-14 20:40:15 -05:00
yanas
97237470af Visual improvements of keyboard shortcut popup 2016-06-14 20:21:32 -05:00
Boris Grozev
d79971a737 An initial version of a "keyboard shortcuts" help panel. 2016-06-14 20:16:38 -05:00
Дамян Минков
334f7bf95a Merge pull request #693 from jitsi/jwt_support
JWT client support
2016-06-14 14:38:36 -05:00
hristoterezov
661795fd51 Fixes accidentally changed value of strophejs-plugins property in package.json 2016-06-14 13:36:46 -05:00
hristoterezov
47fe71c1f1 Fixes issue with ToolbarToggle.setAlwaysVisibleToolbar 2016-06-14 11:34:56 -05:00
hristoterezov
c5eebcda98 Adds exception for preventing to send the JWT token 2016-06-13 16:43:15 -05:00
hristoterezov
8deb003ef6 JWT client support 2016-06-13 16:11:44 -05:00
George Politis
10b2746a3e Merge pull request #689 from bgrozev/makefile-improvements
Makefile improvements
2016-06-10 15:22:18 -05:00
Boris Grozev
62fd07e98e Copy the map files for the non-minified version to the deploy dir. 2016-06-10 19:44:27 +00:00
Boris Grozev
ee8a270a36 Don't run npm update, because it sometimes causes the lib-jitsi-meet npm link to be removed. 2016-06-10 19:43:29 +00:00
hristoterezov
870a4e705b Merge pull request #683 from jitsi/fixes-ff-warnings-2
Defines^2 the document encoding.
2016-06-09 10:41:43 -05:00
Любомир Маринов
9dcb717a51 Merge pull request #685 from tsareg/fix_type_error_when_enabling_permissions_for_devices
Fix TypeError when one of audioTracks or videoTracks was undefined
2016-06-09 09:37:02 -05:00
tsareg
f72e3bf552 Fix TypeError when one of audioTracks or videoTracks was undefined 2016-06-09 12:38:30 +03:00
George Politis
ef70ff7da0 Defines^2 the document encoding. 2016-06-08 23:51:45 -05:00
hristoterezov
61fa2d8ed1 Merge pull request #682 from jitsi/fixes-ff-warnings
Defines the document encoding.
2016-06-08 23:49:02 -05:00
George Politis
1bda4ca61c Defines the document encoding.
Make FF stop complaining about the character encoding of the HTML document
not being declared.
2016-06-08 18:35:28 -05:00
hristoterezov
ba00080462 Merge pull request #681 from jitsi/add-enable-disable-popup
Unifrms messageHandler access and adds enable disable
2016-06-08 15:05:03 -05:00
yanas
57815cb2fe Unifrms messageHandler access and adds enable disable 2016-06-08 14:48:45 -05:00
yanas
346ff889ea Merge pull request #679 from damencho/follow-me
Fixes follow-me to work without etherpad
2016-06-07 17:01:45 -05:00
damencho
165507b83a Removes printing audio levels by default in debug mode and makes it optional. 2016-06-07 16:40:43 -05:00
damencho
955e01a750 Adds comments for processing nextOnStage. 2016-06-07 16:39:08 -05:00
damencho
ca62f9bec2 Adds a check to make follow me work without etherpad enabled. 2016-06-07 15:13:28 -05:00
Emil Ivov
c82bf2a19c Merge pull request #678 from geekgonecrazy/master
Switch to https on iframe creation
2016-06-07 14:50:21 -05:00
Aaron Ogle
98919e0996 Changed variable from ssl to noSsl
Defaults to SSL, only if the noSsl flag is true will it use http
2016-06-07 14:08:02 -05:00
Aaron Ogle
81437263b4 Allow ssl variable to force https:// on the iframe 2016-06-06 23:06:37 -05:00
Aaron Ogle
f883199f4f Switch to https on iframe creation 2016-06-06 21:56:07 -05:00
damencho
207e6e1b7d Merge pull request #666 from champtar/source-package
Fix missing base.html in source-package
2016-06-06 17:19:45 -05:00
lyubomir
06911c4c75 Merge pull request #676 from jitsi/tsareg-handle_create_local_tracks_errors_better
Tsareg handle create local tracks errors better
2016-06-03 16:17:34 -05:00
Lyubomir Marinov
fa1ea94c5c Merge branch 'handle_create_local_tracks_errors_better' of https://github.com/tsareg/jitsi-meet into tsareg-handle_create_local_tracks_errors_better 2016-06-03 14:28:09 -05:00
hristoterezov
6b704f184b Merge pull request #675 from aaronkvanmeerten/master
Only push to history with present page URL plus room name
2016-06-03 14:13:49 -05:00
Aaron van Meerten
c2eede2bb5 Only push to history with present page URL plus room name
Use location.href instead of location.pathname to make the URL absolute
2016-06-03 13:00:09 -05:00
lyubomir
0fec9565e5 Merge pull request #668 from jitsi/jetty-ssi-impl
Adds property for initial jetty ssi configuration.
2016-06-03 09:56:43 -05:00
Emil Ivov
8114152369 Merge pull request #673 from jitsi/revert-history-pushState
Revert "Removes unnecessary history.pushState if the welcome page is …
2016-06-03 07:47:53 -05:00
yanas
968521ef7c Revert "Removes unnecessary history.pushState if the welcome page is disabled and the user enter the base URL"
This reverts commit 3d5af92c7a.
2016-06-03 07:45:57 -05:00
Paweł Domas
bdb4d019f8 Merge pull request #672 from tsareg/audio_output_change_warning
Log warning instead of error for audio output device change errors
2016-06-03 11:11:20 +02:00
tsareg
c1a93afeaf Log warning instead of error for audio output device change errors 2016-06-03 11:15:07 +03:00
hristoterezov
b8d8ef5cfd Merge pull request #670 from jitsi/handle-recording-errors
Handle recording errors
2016-06-02 18:18:42 -05:00
yanas
07c2e91ae2 Do not handle the actual error message yet 2016-06-02 17:12:40 -05:00
yanas
7e4b13fb44 Remove recorder errors import 2016-06-02 15:41:28 -05:00
yanas
69798848c0 Handle recording errors 2016-06-02 13:34:51 -05:00
Emil Ivov
9e52e65faa Merge pull request #669 from jitsi/remove_history_push
Removes unnecessary history.pushState if the welcome page is disabled and the user enter the base URL
2016-06-02 13:25:00 -05:00
hristoterezov
3d5af92c7a Removes unnecessary history.pushState if the welcome page is disabled and the user enter the base URL 2016-06-02 13:02:42 -05:00
damencho
ed9fd6c8fd Adds property for initial jetty ssi configuration. 2016-06-02 12:27:47 -05:00
Emil Ivov
6c1349c501 Merge pull request #667 from jitsi/history_fix
Fixes unhandled error from history.pushState
2016-06-01 17:53:41 -05:00
hristoterezov
6e34e33b0d Fixes unhandled error from history.pushState 2016-06-01 17:47:24 -05:00
Etienne CHAMPETIER
5d9d6b4642 Fix missing base.html in source-package
Signed-off-by: Etienne CHAMPETIER <champetier.etienne@gmail.com>
2016-06-01 15:58:55 +02:00
Senya
8196233ed2 Update manual-install.md
There is no YOURSECRET4 mentions in the document
2016-05-29 15:04:33 +03:00
yanas
c29f9921a1 Merge pull request #662 from aaronkvanmeerten/master
make the chatArrow image reference relative
2016-05-27 11:03:20 -05:00
tsareg
f574dbe056 Changes after code review 2016-05-27 18:49:26 +03:00
Aaron van Meerten
e6385bb95d make the chatArrow image reference relative, allows for better base href support 2016-05-27 10:45:38 -05:00
tsareg
ccdba03888 Minor fixes for error dialogs 2016-05-27 14:01:43 +03:00
tsareg
e257a3dfc9 Merge branch 'master' into handle_create_local_tracks_errors_better
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2016-05-27 11:29:23 +03:00
tsareg
448fcf36b6 Show dialog for GUM errors 2016-05-26 11:53:02 +03:00
tsareg
48b219111d Use special JitsiTrackError object instead just strings for various types of errors that may happen to JitsiTrack 2016-05-25 15:04:48 +03:00
yanas
7f9c4d6480 Merge pull request #659 from aaronkvanmeerten/master
SSI inclusion of config.js
2016-05-24 12:48:07 -05:00
hristoterezov
064917886e Merge pull request #660 from jitsi/fix-user-cancel-reject-handling
Handle Promise.reject for user cancel case
2016-05-23 17:22:51 -05:00
yanas
0cf291d796 Handle Promise.reject for user cancel case 2016-05-23 16:46:41 -05:00
champtar
8418fc97f1 Commit from translate.jitsi.org by user champtar.: 203 of 203 strings translated (0 fuzzy). 2016-05-23 09:13:54 +00:00
Aaron van Meerten
6170f6c268 add support for possible ssi of <base> attribute
left blank in default meet installations, to be overridden by adding <base href="CDN_URL"> to /base.html
2016-05-20 16:51:37 -05:00
Aaron van Meerten
4dd82b3376 switch config.js values to be present directly in index.html, loaded server-side during page render instead of as a separate request 2016-05-20 16:45:40 -05:00
bgrozev
9ce5e232bb Merge pull request #658 from jitsi/nuke-preconfigured-bridge
Nukes the pre-configured bridge from the config file.
2016-05-19 14:56:37 -05:00
George Politis
318ab2c9dc Nukes the pre-configured bridge from the config file. 2016-05-19 14:51:45 -05:00
yanas
29f06bbb77 Merge pull request #657 from tsareg/switch_tracks_on_device_list_change
Switch local audio and video track when list of available devices changes
2016-05-18 15:18:31 -05:00
Kostiantyn Tsaregradskyi
c1807c3649 Handle cases when new media devices are added/removed more precisely and more predictable 2016-05-18 14:23:12 +03:00
Kostiantyn Tsaregradskyi
b270256a7a Switch local audio and video track when list of available devices changes 2016-05-17 18:58:25 +03:00
damencho
27586643c3 Merge pull request #654 from jitsi/gsm_bars
Changes the way of calculating connection quality.
2016-05-17 10:53:38 +03:00
hristoterezov
99e6453e09 Changes the way of calculating connection quality. 2016-05-12 17:48:19 -05:00
yanas
eda11f4657 Merge pull request #653 from tsareg/device_list_change_basic_support
Update devices in settings panel when list of available devices changes
2016-05-12 15:02:19 -05:00
Kostiantyn Tsaregradskyi
474155ce9d Added ability to notify about available media device list changes 2016-05-11 16:59:27 +03:00
hristoterezov
49e60a8b4f Merge pull request #645 from tsareg/master
Added ability to change output audio device through settings
2016-05-10 13:28:40 -05:00
Kostiantyn Tsaregradskyi
5e027e0a91 Added ability to switch audio output device - changes after review 2016-05-10 13:11:41 +03:00
hristoterezov
e2a7a66772 Merge pull request #624 from jitsi/updates-callstats-error-reporting
Updates callstats error reporting
2016-05-09 13:23:01 -05:00
yanas
76017bcbe3 Merge pull request #649 from jitsi/flip_flag
Adds config option for enabling the flip menu for the local video
2016-05-09 13:21:33 -05:00
hristoterezov
1eb915d312 Adds config option for enabling the flip menu for the local video 2016-05-09 12:39:42 -05:00
bgrozev
3df47f0d72 Merge pull request #647 from jitsi/updates-deployment-non-min
Updates deployment with non-minified versions of libs.
2016-05-09 08:34:33 -05:00
champtar
cc5d563599 Commit from translate.jitsi.org by user champtar.: 203 of 203 strings translated (0 fuzzy). 2016-05-09 13:26:57 +00:00
damencho
c5e7ca8a26 Adds non-minified versions of app.bundle and lib-jitsi-meet to the libs folder which is included in the deb package. 2016-05-09 11:49:04 +03:00
yanas
626b37b4fe Merge pull request #646 from jitsi/flip
Implements custom context menu to flip the local video
2016-05-08 10:50:35 -05:00
hristoterezov
c3338d3bf2 Implements custom context menu to flip the local video 2016-05-06 20:50:37 -05:00
Kostiantyn Tsaregradskyi
d34adb67dd Added ability to switch audio output device 2016-05-06 17:31:23 +03:00
George Politis
ae543e68d6 Merge pull request #642 from jitsi/fix_ff_hangup
Fixes issue with not working hangup button on FF
2016-05-05 17:03:46 -05:00
Paweł Domas
50f261effc Merge pull request #643 from jitsi/fix-recorder-error-states
Fix recorder error and state handling
2016-05-05 14:50:51 -05:00
yanas
0736206722 Fix recorder error and state handling 2016-05-05 11:46:06 -05:00
hristoterezov
9dc9dc3685 Fixes issue with not working hangup button on FF 2016-05-05 11:11:05 -05:00
Kostiantyn Tsaregradskyi
2bd600aeaf Very raw version of ability to switch audio output device 2016-05-05 17:34:15 +03:00
jitsi-pootle
2c0d60a1f4 New files added from translate.jitsi.org based on templates 2016-05-05 10:45:10 +00:00
ibauersachs
25a62f330f Commit from translate.jitsi.org by user ibauersachs.: 203 of 203 strings translated (0 fuzzy). 2016-05-04 08:40:00 +00:00
Paweł Domas
b191c58462 Merge pull request #640 from jitsi/fix-recorder-states
Fix recorder state and moderator restart
2016-05-03 15:42:50 -05:00
yanas
c07060c9cd Fix recorder state and moderator restart 2016-05-03 15:26:35 -05:00
yanas
0957ee7547 Merge pull request #639 from jitsi/external_connect_and_auth
Fixes issues when external connect and authentication are enabled
2016-05-02 15:00:06 -05:00
hristoterezov
d6ef36b4b4 Passes the room name to connect when using authentication 2016-05-02 14:47:40 -05:00
hristoterezov
6b5f6ec704 Fixes issue with multiple room query parameters added to bosh url 2016-05-02 14:22:02 -05:00
hristoterezov
0970fdd7e7 Clears external connect data after using it 2016-05-02 14:09:57 -05:00
George Politis
1ff3efa7d2 Merge pull request #638 from jitsi/hide-recorder-thumbnail
Hide recorder local thumbnail
2016-05-01 13:59:41 -05:00
yanas
ab67b42eb9 Hide recorder local thumbnail 2016-05-01 13:47:43 -05:00
hristoterezov
cdefca9fbd Merge pull request #633 from jitsi/fix-and-refactor-shared-video
Fix and refactor shared video
2016-04-29 15:39:30 -05:00
hristoterezov
9b334777b3 Merge pull request #634 from jitsi/fix-remote-video-check
Make sure remote video exist before we use it
2016-04-29 12:55:01 -05:00
George Politis
4f2a57c3a5 Merge pull request #636 from jitsi/fix_externalConnectUrl_param
Fixes issue with externalConnectUrl hash param when the value is null
2016-04-29 11:47:44 -05:00
hristoterezov
d535765648 Fixes issue with externalConnectUrl hash param when the value is null 2016-04-29 11:46:24 -05:00
yanas
edf2f8114b Make sure remote video exist before we use it 2016-04-28 21:18:48 -05:00
yanas
d95b2b034b Fix initial state of user interaction mute 2016-04-28 17:47:40 -05:00
yanas
c2f46a5cfe Refactor shared video manager 2016-04-28 17:44:12 -05:00
hristoterezov
bd7740cba1 Merge pull request #632 from jitsi/add-url-param-conn-opt
Add support for connection optimisation URL param
2016-04-28 15:17:01 -05:00
yanas
4a4e25de28 Add support for connection optimisation URL param 2016-04-28 14:56:11 -05:00
damencho
65c49b6b4c Merge pull request #622 from jitsi/add-smart-mutes-unmutes-shared-video
Add shared video smart mike mutes unmutes
2016-04-28 19:59:00 +03:00
bgrozev
202c506a8d Merge pull request #630 from jitsi/fix-missing-remote-video
Fix missing remote video exception
2016-04-27 16:51:10 -05:00
yanas
aeabad4891 Fix missing remote video exception 2016-04-27 16:28:00 -05:00
bgrozev
5cb2b15b54 Merge pull request #629 from jitsi/lipsync
Lipsync
2016-04-27 15:16:15 -05:00
damencho
81a487b856 Merge pull request #628 from jitsi/add-hidden-participant-support
Add hidden participant support
2016-04-27 18:49:37 +03:00
yanas
c881e7b640 Add hidden participant support 2016-04-27 10:16:30 -05:00
paweldomas
f2c9b8b7a5 Fix issue updating large video 'src' while on stage 2016-04-26 15:42:18 -05:00
paweldomas
0116f547ed Log an error when not an audio nor a video track is added 2016-04-26 15:40:57 -05:00
ibauersachs
13a55089a5 Commit from translate.jitsi.org by user ibauersachs.: 203 of 203 strings translated (0 fuzzy). 2016-04-26 17:13:55 +00:00
George Politis
7bb20bb967 Merge pull request #617 from bgrozev/refactor-util
Exposes the number of participants with tracks.
2016-04-26 10:23:34 -05:00
damencho
08b60bf750 Merge pull request #625 from champtar/source-package
Fix "make source-package"
2016-04-26 17:14:09 +03:00
Etienne CHAMPETIER
ca31bb935b Fix "make source-package"
Signed-off-by: Etienne CHAMPETIER <champetier.etienne@gmail.com>
2016-04-26 13:51:09 +02:00
damencho
1f98fbb99f Adds unhandledrejection, that catches all unhandled promise rejection and logs them in callstats. 2016-04-26 11:00:42 +03:00
damencho
2442f0dfd3 Removes playerPaused variable and just use player to get its state. 2016-04-26 10:22:12 +03:00
yanas
3a9d743d47 Add shared video smart mike mutes unmutes 2016-04-25 15:39:31 -05:00
emcho
6a74296d3e Commit from translate.jitsi.org by user emcho.: 180 of 180 strings translated (0 fuzzy). 2016-04-25 19:29:18 +00:00
jitsi-pootle
af46e28fcc New files added from translate.jitsi.org based on templates 2016-04-25 17:14:01 +00:00
Bernhard Lichtinger
c9ebecbf10 Add Firefox in list of supportedBrowsers for invite emails 2016-04-22 12:32:46 +02:00
Boris Grozev
fb7c2082e6 Exposes the number of participants with tracks. 2016-04-21 17:48:30 -05:00
emcho
1feb5d00fe Commit from translate.jitsi.org by user emcho.: 180 of 180 strings translated (0 fuzzy). 2016-04-20 23:06:12 +00:00
jitsi-pootle
faa519cbeb New files added from translate.jitsi.org based on templates 2016-04-20 22:35:07 +00:00
Emil Ivov
40c7a7e1b8 Merge pull request #615 from jitsi/prosody_jwt_errors
Improve token error reporting in Prosody JWT plugin
2016-04-20 17:16:19 -05:00
paweldomas
5a95edbdcd Improve token error reporting in Prosody JWT plugin 2016-04-20 16:38:16 -05:00
hristoterezov
846ec1c9c8 Merge pull request #614 from jitsi/add-initial-id-pass-login
Adds id and password initial login
2016-04-20 15:06:23 -05:00
yanas
1c9903642b Do not remove the login params after read 2016-04-20 14:41:29 -05:00
yanas
6bfb28f63f Merge pull request #610 from jitsi/callstats_fix
Leaves the call when the hangup button is pressed
2016-04-20 14:06:16 -05:00
yanas
3408737693 Adds id and password initial login 2016-04-20 14:02:16 -05:00
damencho
bbc91f6e0c Merge pull request #613 from jitsi/fix-display-name-dialog
Fix require display name dialog
2016-04-19 16:26:22 -05:00
yanas
0bf4660309 Fix require display name dialog 2016-04-19 16:06:16 -05:00
damencho
58d5823d12 Merge pull request #612 from jitsi/add-smart-shared-video-unmute
Adds smart un-mute to the shared video
2016-04-19 13:27:08 -05:00
yanas
326dedaf40 Fix string 2016-04-19 13:24:27 -05:00
yanas
d08e37b42b Adds smart un-mute to the shared video logic 2016-04-19 13:07:04 -05:00
hristoterezov
7c7ce66ae4 Prettifying the code related to showing the feedback dialog 2016-04-19 12:15:04 -05:00
hristoterezov
73b4ad5a63 Added JitsiConference.leave() when the hangup button is pressed 2016-04-18 17:02:34 -05:00
hristoterezov
2b7ae5c167 Merge pull request #609 from jitsi/fix-feedback-enabling
Fix enable feedback button check
2016-04-15 16:11:04 -05:00
yanas
7ba8b0a24e Fix enable feedback button check 2016-04-15 15:41:51 -05:00
damencho
47a64190a6 Merge pull request #602 from jitsi/performanceTime_format
Renames performanceTimes to ConnectionTimes
2016-04-11 13:41:40 -05:00
hristoterezov
b00fb2ec7e Merge pull request #599 from damencho/updates-onDisplayNameChanged
Updates onDisplayNameChanged
2016-04-11 13:12:42 -05:00
damencho
13e3e99994 Updates websockets example. 2016-04-11 10:16:08 -05:00
hristoterezov
655b7019d1 Renames performanceTimes to ConnectionTimes 2016-04-11 10:01:23 -05:00
damencho
702eb8cbbe Merge pull request #600 from jitsi/performanceTime_format
Fixes time console.log text
2016-04-10 12:55:58 -05:00
hristoterezov
ddf39a20b8 Fixes time console.log text 2016-04-10 12:25:37 -05:00
damencho
0e4f4cbd74 Initializes display name with initial value and does not depend on initial on display name changed event. 2016-04-09 22:08:06 -05:00
bgrozev
26443b6d72 Merge pull request #598 from damencho/minimize-document-modifications
Minimize document modifications on every presence
2016-04-09 21:57:16 -05:00
damencho
0974e31da1 Updates connection quality popover only if its visible or about to be visible. 2016-04-09 12:35:54 -05:00
damencho
613569ff09 Checks whether we need to modify document, before change - on display name change. 2016-04-09 12:04:01 -05:00
hristoterezov
4d63ea2021 Merge pull request #597 from jitsi/fix-isvisible-early-call
Fix early call of SidePanel isVisible
2016-04-08 14:49:15 -05:00
yanas
b597f44605 Fix early call of SidePanel isVisible 2016-04-08 14:46:13 -05:00
lyubomir
28bac7b329 Merge pull request #596 from jitsi/fix-black-stripe
Fix the black stripe (another try)
2016-04-08 11:13:12 -05:00
yanas
d9c3eec9a8 Fix the black stripe (another try) 2016-04-08 10:55:19 -05:00
hristoterezov
a8aa62b075 Merge pull request #593 from jitsi/custom-role-recorder-view
Add custom-role to presence and special view for Recorders
2016-04-07 14:58:54 -05:00
yanas
9ef43d1fe7 Remove self and use this instead in conference.js 2016-04-07 14:11:59 -05:00
yanas
562eba8d78 Removed unused variable 2016-04-07 13:58:15 -05:00
yanas
351775a1c0 Add jsdocs to the recording view manager 2016-04-07 13:09:19 -05:00
yanas
99d9b16c13 Add Recorder controller. 2016-04-07 13:06:28 -05:00
yanas
e43c5ab54c Add custom-role to presence and special view for Recorders 2016-04-07 12:08:00 -05:00
damencho
a112b10a36 Merge pull request #591 from jitsi/fix-black-stripe
Fix black stripe and side panel animations
2016-04-06 16:15:22 -05:00
yanas
4990406010 Fix black stripe on the right of the screen 2016-04-06 15:36:41 -05:00
hristoterezov
8842823607 Merge pull request #587 from damencho/global-error-handler
Enables global error handler.
2016-04-06 13:11:22 -05:00
damencho
ccc9f4e033 Adds a check and reuses any previous onerror handlers if they exist. 2016-04-06 11:52:31 -05:00
damencho
e56c936798 Enables global error handler. 2016-04-05 17:18:38 -05:00
damencho
b46480dc16 Merge pull request #586 from jitsi/shared-video-auto-mute-popup
Shared video auto mute popup
2016-04-05 14:40:30 -05:00
yanas
a1cef0f181 Add notification popup for shared video auto mute 2016-04-05 14:17:50 -05:00
yanas
ba871d269f Fix toolbar slide up effect. 2016-04-05 14:14:30 -05:00
Paweł Domas
b60e074710 Merge pull request #584 from bgrozev/enable-as
Enable adaptive simulcast by default
2016-04-04 16:23:58 -05:00
Boris Grozev
8466aa2f78 Renames adaptiveSimulcast to disableAdaptiveSimulcast.
In conjunction with corresponding commits in lib-jitsi-meet and jicofo
this enables adaptive simulcast whenever simulcast is enabled.
2016-04-04 14:15:59 -05:00
yanas
e28975dcb5 Merge pull request #581 from damencho/shared-video-volumes
Changes mute/unmute behavior when playing a shared video.
2016-04-01 17:38:52 -05:00
damencho
e579a41284 Merge pull request #582 from jitsi/set-follow-me-initial
Init follow me attributes after enable
2016-04-01 17:29:26 -05:00
damencho
b949ffdda1 Prevents users that are not sharing the video of pausing the video and leaves the control to the user sharing the video. 2016-04-01 17:23:30 -05:00
damencho
7dad981112 Follow seeking while player is paused. 2016-04-01 17:08:35 -05:00
damencho
6efbf058fa Merge pull request #579 from jitsi/fix-black-stripe-on-load
Fix large black stripe on load.
2016-04-01 16:28:32 -05:00
yanas
a3bfce4c40 Set follow-me initial state after enable 2016-04-01 16:26:30 -05:00
damencho
bede8feccc Mutes local video when shared video is playing and mutes shared video if user wants to talk. 2016-04-01 16:24:35 -05:00
damencho
2d1e7c9baf Merge pull request #580 from jitsi/performance_torture
Stores measured times and exposes them
2016-04-01 15:43:33 -05:00
damencho
9a984b7f84 Instantly update volume changes. 2016-04-01 14:46:42 -05:00
hristoterezov
8d77088f6d Stores measured times and exposes them 2016-04-01 14:44:25 -05:00
yanas
56690037d0 Fix large black stripe on load. 2016-04-01 11:30:05 -05:00
damencho
bd09fa2601 Merge pull request #578 from jitsi/fix-settings-dialog-strings
Unifies all strings in Settings.
2016-04-01 11:21:29 -05:00
damencho
7c7f8960fa Merge pull request #576 from jitsi/hide-feedback-with-filmstrip
Hide feedback with filmstrip
2016-04-01 10:58:01 -05:00
damencho
af2809258c Merge pull request #575 from jitsi/fix-follow-me-exception
Fixes exception in follow-me when we receive an update for a video th…
2016-04-01 08:38:06 -05:00
damencho
2353c6f7e3 Merge pull request #577 from jitsi/update_gitignore
Adds libs/external_connect.js to .gitignore
2016-03-31 22:21:02 -05:00
hristoterezov
b031fdc398 Adds libs/external_connect.js to .gitignore 2016-03-31 18:03:27 -05:00
yanas
144dd85e98 Unifies all strings in Settings. 2016-03-31 17:58:02 -05:00
yanas
67e8118d74 Shows/hides feedback button when the filmstrip is shown/hidden. 2016-03-31 17:35:10 -05:00
yanas
ea9b909775 Fixes exception in follow-me when we receive an update for a video thumbnail that's not there yet. 2016-03-31 15:13:00 -05:00
yanas
b7cc03df26 Merge pull request #573 from damencho/shared-video-updates
Shared video updates
2016-03-31 14:31:57 -05:00
damencho
ebe37ff98a Handle on player error so we can remove the player. 2016-03-31 14:11:33 -05:00
damencho
fcf5c16945 Merge pull request #574 from jitsi/fix-welcome-page-field
Fixes enter room name field in the welcome page.
2016-03-31 13:45:54 -05:00
yanas
5cbe710075 Fixes enter room name field in the welcome page. 2016-03-31 13:31:05 -05:00
damencho
104503ee13 Make sure we store initial attributes in order, so it will hold the last state we want to be in. Respects quick initial stop received. 2016-03-31 12:14:45 -05:00
damencho
2e3dcb142d Updates translation. 2016-03-31 11:43:37 -05:00
damencho
6951089130 Force seek when transition from and to pause state. 2016-03-31 00:07:12 -05:00
damencho
952eaf5a0c Avoids double loading of the player. 2016-03-30 21:36:05 -05:00
hristoterezov
d9e08032ce Changes translation module to load async 2016-03-30 21:01:21 -05:00
damencho
8a80df2828 Merge pull request #561 from jitsi/connection_optimization
Implements server side connection establishment
2016-03-30 14:30:36 -05:00
hristoterezov
166a609b94 Removes console.warn message from do_external_connect.js if there is no error passed. 2016-03-30 13:32:17 -05:00
bgrozev
ff256f15a5 Merge pull request #567 from jitsi/recording-recorder-parameter
Adds an I am a recorder parameter that allows for the UI to be cleane…
2016-03-29 17:29:54 -05:00
damencho
06f3ddc822 Hides the toolbar if the user is a recorder. 2016-03-29 17:28:20 -05:00
yanas
7f7d9d5594 Adds an I am a recorder parameter that allows for the UI to be cleaner and simpler for the recorders. 2016-03-29 17:26:39 -05:00
damencho
3c33542874 Merge pull request #566 from jitsi/recording-related-work-in-progress
Fixes streaming tooltip. Checks if the stream id is not provided and …
2016-03-29 16:31:22 -05:00
yanas
76820bed8d Fixes recording state handling. 2016-03-29 16:30:08 -05:00
yanas
39c350cdba Fixes streaming tooltip. Checks if the stream id is not provided and requests the user before starting the recorder. 2016-03-29 16:07:01 -05:00
yanas
2ef9412a01 Merge pull request #565 from damencho/dock-toolbar-on-shared-video
Docks toolbar when shared video is shown.
2016-03-29 15:58:28 -05:00
damencho
a38b628d76 Docks toolbar when shared video is shown. 2016-03-29 14:36:20 -05:00
damencho
24896634f6 Merge pull request #564 from jitsi/recording-related-work-in-progress
Recording related UI modifications.
2016-03-29 13:52:24 -05:00
yanas
8b060e9cc0 Fixes mistakenly removed button. 2016-03-29 13:51:21 -05:00
yanas
6d51cb5f40 Fixes mistakenly removed button. 2016-03-29 13:49:05 -05:00
yanas
51037c2dca Fixes status change from pending to unavailable. 2016-03-29 13:46:10 -05:00
yanas
7df5e92bc9 Adds new recording module. 2016-03-29 13:10:31 -05:00
yanas
68994fbe74 Recording related UI modifications. 2016-03-29 12:13:54 -05:00
hristoterezov
4a1175d44f Fixes comments after review 2016-03-28 17:42:20 -05:00
hristoterezov
bf9c4ea444 Implements server side connection establishment 2016-03-28 16:19:32 -05:00
yanas
0bde7de37b Merge pull request #560 from damencho/seek-on-start-paused
Seeks in video when we start in paused state.
2016-03-28 13:56:09 -05:00
damencho
9632bd531c Does not accumulate multiple pause events in commands. 2016-03-28 13:38:48 -05:00
yanas
740c920cbb Merge pull request #557 from damencho/enables-sharedvideo-for-all-participants
Enables shared video for all participants, the first to share is the …
2016-03-28 13:13:46 -05:00
damencho
885210452c Updates button states on non moderator participants before showing the toolbar. 2016-03-28 11:46:45 -05:00
damencho
7c02803ef9 Seeks in video when we start in paused state. 2016-03-27 15:32:45 -05:00
damencho
7d0cd00a50 Enables shared video for all participants, the first to share is the video all will see, later attempts will result just a dialog informing that video is already shared. 2016-03-25 19:38:56 -05:00
damencho
055f96bb03 Merge pull request #556 from jitsi/fix-follow-me-exception
Fixes exception on follow me command.
2016-03-25 17:22:05 -05:00
yanas
76548f1cd0 Fixes exception on follow me command. 2016-03-25 17:15:50 -05:00
yanas
1897de75b1 Merge pull request #555 from damencho/fix-shared-video-undefined
Uses player functions only after the player has reported playing event.
2016-03-25 15:58:20 -05:00
damencho
508fd4a8df Uses player functions only after the player has reported playing event. 2016-03-25 15:36:41 -05:00
bgrozev
30cf17d99d Merge pull request #554 from jitsi/fix-background-css
Reverts back to black background. We need to fix some other things be…
2016-03-25 14:50:31 -05:00
yanas
568a5ba816 Reverts back to black background. We need to fix some other things before moving to grey background. 2016-03-25 14:48:31 -05:00
yanas
9b09e61877 Merge pull request #553 from damencho/fix-replacing-pinned
Fixes and issue where: if we receive dominant speaker event just befo…
2016-03-24 17:43:18 -05:00
yanas
1e7cd06555 Merge pull request #552 from damencho/shared-video-fixes
Shared video fixes
2016-03-24 17:42:13 -05:00
damencho
d48ef06ddb Fixes and issue where: if we receive dominant speaker event just before the video start playing, this can override already pinned video. 2016-03-24 17:10:29 -05:00
damencho
af9f651702 Check whether commands are coming from moderator. 2016-03-24 16:20:27 -05:00
damencho
9abc78ef24 Do not send SELECTED_ENDPOINT events for custom containers. 2016-03-24 16:20:27 -05:00
damencho
5112041e15 Merge pull request #551 from jitsi/fix-shared-video-ui-glitches
Fixes shared video thumbnail size and shared video on large background.
2016-03-24 14:51:42 -05:00
yanas
6edbcb9311 Fixes shared video thumbnail size and shared video on large background. 2016-03-24 14:49:26 -05:00
yanas
4ffafbe9a8 Merge pull request #545 from damencho/fix-video-switching-on-hide-container
Fix video switching on hide container
2016-03-24 13:27:41 -05:00
yanas
d0ad928d39 Merge pull request #549 from damencho/fixes-early-pause-shared-video
Fixes early initial pause event, may lead to player keep buffering wi…
2016-03-24 13:27:22 -05:00
yanas
c4f4dcdb4f Merge pull request #546 from damencho/shared-video-display-name
Removes hoverIn/Out detection for shared video that shows/hides displ…
2016-03-24 13:25:51 -05:00
damencho
27607e8754 Update variable name to pinnedId. 2016-03-24 13:16:42 -05:00
damencho
94d98ec0ab Fixes returning to dominant speaker after closing shared video. Renames a method and fix its behaviour was handling both case when removing just video element in small videos (local or remote) and when we are removingParticipantContainer, now just handles the second one and uses focusedID if any or dominantSpeakerID if any, otherwise elects new video. 2016-03-24 13:11:03 -05:00
damencho
e330dbf5d1 Fixes switching to pinned video when hiding a container. 2016-03-24 13:06:52 -05:00
damencho
f788a45bac Merge pull request #548 from jitsi/follow-me
Follow me
2016-03-24 13:02:42 -05:00
bgrozev
3f62b479da Merge pull request #550 from jitsi/polish-ui
Polish ui
2016-03-24 12:26:13 -05:00
yanas
d49dff4ae1 Fixes a config parameter name. Removes a console.log, which got there by mistake. Fixes some css properties of the chat unread messages. 2016-03-24 12:17:58 -05:00
yanas
1526d4e239 Toolbar style changes. 2016-03-24 10:03:48 -05:00
yanas
0a2a6e5677 Changing random avatars to robohash. 2016-03-24 10:03:48 -05:00
yanas
72454ff279 HD label added when the large video is in HD. 2016-03-24 10:03:48 -05:00
yanas
64d8cb2db2 Turning video thumbnails into squares. Changes the size of the dominant speaker avatar and fixes some minor thing around those two. 2016-03-24 10:01:08 -05:00
yanas
5c0088d2ef Main UI polishing. Removes rounded corners, fixes gaps. Adding custom avatars. 2016-03-24 09:59:03 -05:00
damencho
9efebc3702 Fixes early initial pause event, may lead to player keep buffering without starting. 2016-03-23 22:42:17 -05:00
yanas
cc761700fe Extends the follow-me feature by adding the possibility to follow the pinned participant, the shared video and the shared document. Adds the possibility to enable disable follow-me from the settings panel. Some other small fixes throughout the UI. 2016-03-23 20:43:29 -05:00
damencho
8df6a29741 Removes hoverIn/Out detection for shared video that shows/hides displayname, as we always display the name of the video when there is no thumb shown. And we do not want the name over the thumb. 2016-03-22 17:15:35 -05:00
yanas
b1469186d1 Merge branch 'master' of https://github.com/jitsi/jitsi-meet into follow-me 2016-03-22 15:24:02 -05:00
yanas
32c2d912be Merge pull request #543 from damencho/shared-video
Shared video, synchronized play/pause/seek/muting/volume, initial commit.
2016-03-22 15:15:36 -05:00
damencho
586b8401ae Renames event name. 2016-03-22 15:04:52 -05:00
damencho
f0fd7d7435 Renames method. 2016-03-22 14:59:03 -05:00
damencho
9a39898eea Renames event name. 2016-03-22 14:57:36 -05:00
damencho
fe7d05a951 Reverse the check to use only VIDEO_CONTAINER_TYPE. 2016-03-22 14:56:50 -05:00
damencho
1bdeda4ec3 Fixes updateLarge video to change to different container types which do not have stream. 2016-03-22 14:49:37 -05:00
damencho
2c1a9d20fd Fixes setting local video, default videoType. Fixes showing local video when there is no video device shown. 2016-03-22 13:27:11 -05:00
damencho
d82d4cbed9 Creates first the container before setting avatar, cause the avatar set will check the large video container type and type may be missing. Fixes error 'container of type undefined doesn't exist':
>    at LargeVideoManager.getContainer
>    at LargeVideoManager.get
>    at Object.isCurrentlyOnLarge
>    at Object.changeUserAvatar
>    at Object.UI.setUserAvatar
>    at Object.UI.addUser
2016-03-18 17:44:32 -05:00
damencho
9e7275acfb Updates large video when user left and we are removing the shared video. 2016-03-18 17:21:41 -05:00
damencho
ba01733c4f Adds confirmation dialog when closing shared video. 2016-03-18 17:04:13 -05:00
damencho
a1ac18a632 Fixes pausing. 2016-03-18 16:47:47 -05:00
damencho
38275ce045 Shared video, synchronized playing/seek/muting/volume initial commit. 2016-03-18 15:00:55 -05:00
damencho
83f07a7e67 Merge pull request #542 from champtar/unsupported_browser
Add unsupported_browser.css to source-package
2016-03-18 09:58:32 -05:00
Etienne CHAMPETIER
a61ce8ee3b Add unsupported_browser.css to source-package
Signed-off-by: Etienne CHAMPETIER <champetier.etienne@gmail.com>
2016-03-18 15:23:15 +01:00
yanas
eec8129026 Merge pull request #540 from damencho/fix-etherpad
Fix etherpad
2016-03-17 22:37:00 -05:00
damencho
2b26580a7c Disables switching to dominant speaker when Etherpad is shown on large video. 2016-03-17 22:19:09 -05:00
damencho
eefdbd4fe5 Renames EtherpadContainerType to ETHERPAD_CONTAINER_TYPE. 2016-03-17 21:58:40 -05:00
Paweł Domas
7b55d8b526 Merge pull request #537 from jitsi/max_users_error
Implements dialog for max users error
2016-03-17 14:52:48 -05:00
yanas
20af89abfa Merge pull request #539 from damencho/ui-container-management-and-fixes
Ui container management and fixes
2016-03-17 14:13:18 -05:00
damencho
5963f85ad6 Fixes avatar that is shown, when we switch from container with muted video to container from other type, like etherpad. 2016-03-17 13:29:07 -05:00
hristoterezov
438cae101f Fixes error with max users limit after review 2016-03-17 13:23:03 -05:00
yanas
6a7919a904 Merge pull request #532 from damencho/resize-ds-onfilm-toggle
Resizes large video on filmstrip toggle.
2016-03-16 14:46:32 -05:00
damencho
3577f338cc Does not do force-update when resizing. 2016-03-16 14:35:30 -05:00
damencho
9e0b1beed5 Always uses current video type to search for container that will handle it. Renames video container type to camera, to match the type ot the tracks. Add the same container to be used and for tracks with type of desktop. 2016-03-16 13:28:35 -05:00
damencho
ca56734d9c Moves VideoLayout reference in SmallVideo as it is used there in updateView. 2016-03-16 13:28:28 -05:00
damencho
6955bb71f3 Adds methods to abstraction LargeContainer which are used by LargeVideo when updating video. 2016-03-16 13:28:20 -05:00
damencho
5837ef506c Removes remoteVideoTypes and uses the set/get in the small video instances. 2016-03-16 13:28:09 -05:00
damencho
3fc839cb37 Adds optional parameter to addParticipantContainer, make possible to create the SmallVideo outside VideoLayout and pass it to be displayed. 2016-03-16 13:28:00 -05:00
yanas
15865c3d42 Merge pull request #531 from damencho/remove-prezi
Merges damencho's PR for removing prezi. We still need to remove all prezi related strings from translations through translate.jitsi.org.
2016-03-16 13:18:08 -05:00
Emil Ivov
897e7a1925 Update main.json 2016-03-15 16:16:50 -05:00
hristoterezov
02ff54b659 Implements dialog for max users error 2016-03-15 14:08:01 -05:00
damencho
95f36cfd9a Merge pull request #530 from isymchych/nwjs
Example NW.js app.
2016-03-14 15:19:33 -05:00
damencho
97733cd17a Resizes large video on filmstrip toggle. 2016-03-11 12:57:49 -06:00
damencho
4ff6d276ce Removes prezi. 2016-03-11 12:00:10 -06:00
isymchych
72a761e80a integrate with nwjs 2016-03-11 15:18:37 +02:00
Lyubomir Marinov
605a892f78 Implements an initial (demo) version of "Follow Me" for film strip visibility. 2016-03-11 04:55:29 -06:00
Lyubomir Marinov
c35590dbda Allows UI.toggleFilmStrip() and UIEvents.TOGGLE_FILM_STRIP to act as setters in addition to toggles. 2016-03-11 04:54:06 -06:00
Lyubomir Marinov
972fc402e4 Exposes a Command(s) API from conference.js. 2016-03-11 04:49:13 -06:00
yanas
ed85658ce5 Merge pull request #520 from isymchych/improve-settings
Apply new settings without clickint "Update" button
2016-03-10 13:08:23 -06:00
yanas
3759676770 Merge pull request #525 from damencho/sync-mute
Syncs mute/unmute calls.
2016-03-09 16:17:00 -06:00
damencho
1c3aafd5c4 Uses the Promise returned on mute/unmute, just prints when calls were canceled due to operation in progress. 2016-03-08 17:33:09 -06:00
yanas
729ca2fbe6 Merge pull request #524 from damencho/ds-error-handle
Improves desktop sharing error handling.
2016-03-07 13:41:17 -06:00
damencho
45d997e9f1 Adds a comment to default error handling for desktop sharing. 2016-03-07 12:57:12 -06:00
damencho
6b5a52926a Merge pull request #522 from jitsi/fix_lib_rename
Fixes the compatability with lib-jitsi-meet for TRACK_REMOVED events for remote track to use peerconnection event instead of relying on TRACK_STOPPED event.
2016-03-07 11:22:22 -06:00
damencho
3a933cfb84 Avoids showing two warning dialogs when firefox extension is required and missing. 2016-03-04 15:55:44 -06:00
damencho
d78666a49d Removes listener to missing event and duplicate dialog code. 2016-03-04 15:36:53 -06:00
damencho
413e5098c8 Handles the error when user cancels desktop sharing window. 2016-03-04 15:21:07 -06:00
damencho
0470106524 Shows and error dialog when we fail to install desktop sharing plugin for some reason. 2016-03-04 15:20:05 -06:00
hristoterezov
30e1e3b23a Fixes jitsi meet to work with the renamed events and methods from the latest version of lib-jitsi-meet. 2016-03-03 14:53:36 +02:00
damencho
25a9928758 Merge pull request #521 from jitsi/fix-resizing
Fixes resizing problems introduced in last resizing commit and some previous problems with side panel open/close.
2016-03-02 14:59:23 -06:00
yanas
67a73b163e Removes empty space from the available width calculation. 2016-03-02 14:46:57 -06:00
yanas
ad44cc518a Fixes resizing problems introduced with previous resizing commit. Fixes side panel open/close code and resizing. 2016-03-02 13:50:55 -06:00
isymchych
be0abf908e auto-save setiings 2016-03-02 17:39:39 +02:00
yanas
c201de86cc Merge pull request #519 from isymchych/lastn
Use overriden config.channelLastN property in VideoLayout
2016-02-29 13:49:28 -06:00
yanas
48b225f382 Merge pull request #516 from isymchych/fix-auth
Code cleanup
2016-02-29 13:35:53 -06:00
yanas
1339b306e6 Merge pull request #517 from jitsi/fix-resizing
An additional fix should be added, which allow for more smooth resizing (we still see thumbnails going on a second row and then coming back up again), but this will be added in a separate commit.
2016-02-29 13:20:19 -06:00
isymchych
cd71b0a603 use latest version of the config.channelLastN 2016-02-26 15:22:04 +02:00
isymchych
f242c8cfdc handle missing remoteVideo when removing video element 2016-02-26 15:20:36 +02:00
Paweł Domas
259fae331f Merge pull request #518 from isymchych/really-fix-auth
Fix login/logout
2016-02-25 11:06:21 -06:00
isymchych
3cf478826e implement user logout 2016-02-25 15:52:15 +02:00
isymchych
b73bddf1c4 handle AUTH_STATUS_CHANGED event 2016-02-25 14:32:52 +02:00
isymchych
e478a73988 fix on-the-fly auth 2016-02-25 14:32:34 +02:00
isymchych
c294f592c8 code cleanup: remove redundant span.nick elements 2016-02-25 12:40:24 +02:00
isymchych
5ec28ff3c1 code cleanup: remove unused settings 2016-02-25 12:40:24 +02:00
yanas
30f3da98e5 Fixes thumbnail resize and thumbnails going on a second row. Refactors code around the film strip and resize in general. 2016-02-24 15:05:24 -06:00
yanas
194b991fb1 Merge pull request #515 from damencho/handle-track-removed
Handles track removed and removes video elements. Tested by starting/stopping desktop sharing several times and we only have one video and one audio element after the PR is applied.
2016-02-24 11:09:07 -06:00
damencho
3c61bac3c8 Handles track removed and removes video elements. When switching on and off desktop sharing video elements number grow under remote video span. 2016-02-23 16:47:55 -06:00
Paweł Domas
1a656c2c89 Merge pull request #494 from isymchych/escape-nicknames
Escape nicknames before displaying them
2016-02-23 10:50:03 -06:00
isymchych
ebf57923ae hide chat if local display name is empty 2016-02-23 17:20:33 +02:00
isymchych
0bcbd105e3 escape nicknames before displaying them 2016-02-23 17:20:33 +02:00
Paweł Domas
47f2320e94 Merge pull request #511 from isymchych/improve-focus-left
leave the room if focus left
2016-02-22 12:55:10 -06:00
isymchych
c027050e11 leave the room if focus left 2016-02-22 16:57:36 +02:00
Paweł Domas
93d5497c76 Merge pull request #508 from isymchych/fix-unmute
LargeVideo: detach previous stream when attaching new one
2016-02-19 10:11:25 -06:00
isymchych
6476503240 LargeVideo: detach previous stream when attaching new one 2016-02-18 15:38:57 +02:00
Paweł Domas
8b2244b47a Merge pull request #503 from isymchych/fix-logo-blink
Fix watermark logo blinking during video switching
2016-02-17 09:27:41 -06:00
isymchych
255f374894 fix watermark logo blinking during video switching 2016-02-17 14:37:06 +02:00
Paweł Domas
61b28fccf2 Merge pull request #499 from isymchych/fix-auth-dialog
fix authentication dialog
2016-02-16 10:48:37 -06:00
Paweł Domas
8d65fcc4c2 Merge pull request #498 from isymchych/reorder-streams-operations
Remove old track from the conference before adding new one
2016-02-16 10:32:38 -06:00
isymchych
5a1d200098 fix authentication dialog 2016-02-16 17:42:28 +02:00
isymchych
9581afb612 remove old track from the conference before adding new one 2016-02-16 15:34:32 +02:00
Paweł Domas
de8f75ddee Merge pull request #493 from isymchych/fix-screensharing-mute-on-safari
Fix screensharing mute on safari
2016-02-12 11:43:08 -06:00
isymchych
24ffc816f4 LargeVideo: show watermark even if video is muted 2016-02-12 16:47:42 +02:00
isymchych
401e5e7ae0 fix jshint issues 2016-02-12 16:28:43 +02:00
isymchych
fdfa9de150 hide large video if stream is muted 2016-02-12 16:28:43 +02:00
Paweł Domas
61f4bb63ab Merge pull request #492 from isymchych/device-selection
Allow user to select camera and microphone
2016-02-10 15:51:36 -06:00
isymchych
f65d630ad8 allow user to select camera and microphone 2016-02-10 15:37:50 +02:00
damencho
b4b9160fcb Adds room name to the bosh connection. 2016-02-09 17:44:41 -06:00
damencho
bd16b9e346 Prints audio levels in debug mode. 2016-02-09 16:49:58 -06:00
Paweł Domas
e688a5cb9f Merge pull request #487 from isymchych/video-mute-screensharing
Handle video mute/unmute during screensharing
2016-02-09 11:31:42 -06:00
damencho
dbed8c2976 Fixes push to talk. 2016-02-09 10:29:50 -06:00
isymchych
79d5bf6cfa move screensharing into single function, properly handle mute/unmute 2016-02-09 12:52:54 +02:00
isymchych
44bae94701 code cleanup 2016-02-09 12:30:34 +02:00
damencho
e81d3c02ad Shows dominant speaker icon for the local user, when he is the dominant speaker. 2016-02-08 15:42:03 -06:00
Paweł Domas
ff4de4cb5b Merge pull request #489 from isymchych/handle-focus-left
handle FOCUS_LEFT conference error
2016-02-08 09:37:57 -06:00
yanas
e09a2f5bee Fixes all shortcuts. 2016-02-05 12:53:31 -06:00
yanas
e7e8dc3457 Fixes shifted audio level glow on thumbnails. Fixes missing audio level indicator on large video avatar. 2016-02-05 11:32:09 -06:00
isymchych
379f786225 handle FOCUS_LEFT conference error 2016-02-05 17:04:48 +02:00
damencho
4228537390 Fixes autoEnableDesktopSharing option. 2016-02-04 12:43:02 -06:00
damencho
9ebf4bfacb Adds method to access stats from torture. 2016-02-04 12:41:23 -06:00
paweldomas
7ec6e9ae29 Gets rid fo RTCBrowserType usages. 2016-02-02 15:52:02 -06:00
damencho
522ca64bce Adds some docs. 2016-02-02 14:54:15 -06:00
paweldomas
8a65407d0c Merge remote-tracking branch 'isymchych/move-statistics' 2016-02-02 13:55:00 -06:00
paweldomas
8144201636 Uses RTCUIHelper class from lib-jitsi-meet to select video elements. 2016-02-02 13:54:37 -06:00
paweldomas
a6ff9f8ee2 Removes unused code related to Firefox.
Commented part seems not to be required anymore as everything work well without it.
2016-02-02 13:54:37 -06:00
hristoterezov
67f1a040eb Removes link tag for the SS plugin because it is created dynamically by the library. 2016-02-02 11:40:29 -06:00
isymchych
d19789005e use statistics module from the library 2016-02-02 17:12:40 +02:00
paweldomas
103b5d71d0 Encapsulates direct access to .currentTime field into 'hasVideoStarted' method of RemoteVideo.
Removes duplicated logic for hiding video element when the user is muted.
2016-02-01 16:08:47 -06:00
paweldomas
ab13fa35b4 'currentTime' property of stream elements are now supported by Temasys plugin. 2016-02-01 16:08:36 -06:00
paweldomas
0bf98bf6cf Fixes broken call to waitForPlayback in lastN logic. 2016-02-01 15:37:35 -06:00
paweldomas
48cedb0865 Adopts to new semantics of JitsiTrack#attach method. 2016-02-01 15:01:45 -06:00
hristoterezov
11d43f32b2 Fixes JS error for function call that not exists when start desktop sharing. 2016-01-29 16:48:12 -06:00
hristoterezov
cea0916bfd Merge branch 'master' of github.com:jitsi/jitsi-meet 2016-01-29 16:07:04 -06:00
hristoterezov
ffbaaa2622 Moves videotype signaling to the library 2016-01-29 16:06:54 -06:00
Paweł Domas
04858e7f06 Merge pull request #481 from isymchych/fix-pinning
Do not pin participant if moderator clicked item in remote user menu
2016-01-29 13:44:46 -06:00
hristoterezov
1176390214 Fixes issues for audio only participants 2016-01-29 13:31:58 -06:00
damencho
4e66aefa26 Merge pull request #482 from isymchych/docs
Describe how to use local lib-jitsi-meet repository with npm link
2016-01-29 09:41:45 -07:00
isymchych
352195bcdd Describe how to use local library with npm link 2016-01-29 18:26:16 +02:00
yanas
fe2804f474 Fixes SmallVideo object not making a difference between an audio and a video stream, which was causing FireFox issues with large video set to the audio stream. 2016-01-28 18:33:27 -06:00
damencho
2c7ee3527a Updates readme for working with lib-jitsi-meet sources. Separates deploy make targets for deploying only the lib. 2016-01-28 17:43:48 -06:00
George Politis
70346e2307 Replaces obsolete config option and enables simulcast by default. 2016-01-28 22:07:39 +00:00
damencho
33cb79fb8a Fixes lib filename. 2016-01-28 15:28:56 -06:00
damencho
e3b518cb91 Uses lib-jitsi-meet from git repo and deploy it on make. 2016-01-28 15:06:09 -06:00
damencho
c0dde18e6b Merge branch 'jitsi-meet-new' 2016-01-28 14:10:50 -06:00
paweldomas
cd8af2a823 Logs an error which occurred when trying to obtain video stream to be used after screen sharing. 2016-01-28 11:28:07 -06:00
Paweł Domas
8221a59261 Merge pull request #477 from isymchych/fix-safari-audio
do not hide small video until stream has been attached
2016-01-28 11:10:02 -06:00
isymchych
93aac798f3 do not pin participant if moderator clicked item in remote user menu 2016-01-28 16:36:55 +02:00
isymchych
6998827982 do not hide small video until stream has been attached 2016-01-28 13:59:33 +02:00
yanas
6e7ed13370 Fixes missing local video thumbnail before entering a conference. 2016-01-26 17:18:10 -06:00
yanas
ae4f5c64d4 Merge branch 'jitsi-meet-new' of https://github.com/jitsi/jitmeet into jitsi-meet-new 2016-01-26 15:28:35 -06:00
yanas
5834fbe31a Re-implements last N related code to use the library. Fixes issues with resizeThumbnails. Fixes last N related event handling. 2016-01-26 15:27:07 -06:00
paweldomas
875a7b6f4f Uses property instead of jquery to hook "onplay" event of the large video. 2016-01-26 15:27:05 -06:00
paweldomas
4cf1f92e25 Fixes broken large video resize functionality. 2016-01-26 15:26:48 -06:00
paweldomas
2fb65dd752 Uses fadeTo instead of fadeIn/fadeOut which do not seem to work correctly on Safari. 2016-01-26 11:19:21 -06:00
Lyubomir Marinov
feb0abf701 Does not disconnect from the XMPP server on unload in jitsi-meet-new because the API has taken on that responsibility. 2016-01-26 11:11:50 -06:00
hristoterezov
2ccfc30813 Merge pull request #469 from isymchych/fix-fullscreen
fix issue with fullscreen in Safari in jitsi-meet-new
2016-01-26 11:01:41 -06:00
damencho
eab83e4fbc Merge pull request #471 from isymchych/minor-fixes
Minor fixes for jitsi-meet-new
2016-01-26 09:46:20 -06:00
isymchych
bc2afd7d64 Minor fixes for jitsi-meet-new
* use proper context for the function
* remove duplicate line
2016-01-26 13:50:33 +02:00
Lyubomir Marinov
a0becb918e Do synchronous Strophe disconnect in order to increase the chances of the delivery of the unavailable presence to the XMPP server. 2016-01-25 17:01:12 -06:00
hristoterezov
e0ba89e001 Merge branch 'isymchych-video-resize-issue' into jitsi-meet-new 2016-01-25 16:45:57 -06:00
hristoterezov
714e304e98 Merge branch 'video-resize-issue' of git://github.com/isymchych/jitsi-meet into isymchych-video-resize-issue 2016-01-25 16:45:36 -06:00
hristoterezov
5e3133547d Merge branch 'isymchych-replace-remaining-events' into jitsi-meet-new 2016-01-25 16:39:53 -06:00
hristoterezov
089a9880b0 Fixes issues related to PR #452 2016-01-25 16:39:05 -06:00
damencho
66212862ce Merge branch 'chat-subject-new' of https://github.com/isymchych/jitsi-meet into jitsi-meet-new 2016-01-25 16:13:53 -06:00
damencho
e707eb9a79 Merge branch 'video-fadein-fix' of https://github.com/isymchych/jitsi-meet into jitsi-meet-new 2016-01-25 15:35:40 -06:00
hristoterezov
d6620310f5 Merge pull request #464 from isymchych/jsdocs
added documentation (jsdocs) to jitsi-meet-new
2016-01-25 14:17:46 -06:00
hristoterezov
d09021457b Fixes JS error in API module 2016-01-25 14:08:50 -06:00
damencho
5bd0074eff Adds FF fake device settings when creating local tracks. 2016-01-25 13:44:48 -06:00
hristoterezov
c2cfd4d6e2 Merge pull request #456 from isymchych/rewrite-API-module
do not use xmpp module in API module
2016-01-25 12:55:30 -06:00
Lyubomir Marinov
6dbbea9944 Decides whether to use analytics after the analytics API has been given a chance to load. 2016-01-25 11:58:15 -06:00
Lyubomir Marinov
41872781f9 Fixes a lint error about a constructor name not starting with an uppercase letter. 2016-01-25 11:40:31 -06:00
isymchych
6cda300861 synchronize Large video fadeIn/fadeOut animations 2016-01-25 19:08:07 +02:00
isymchych
6df1fcef40 Avatar.js code cleanup 2016-01-25 19:08:07 +02:00
isymchych
6b98fd52ea added some documentation (jsdocs) 2016-01-25 19:07:05 +02:00
isymchych
d31aca4483 use lib to change chat subject 2016-01-25 19:00:18 +02:00
hristoterezov
a0355ea080 Updates the lib 2016-01-22 17:30:40 -06:00
damencho
8b8cbb2ccc Handles fake video track and fixes remote audio. 2016-01-22 16:37:33 -06:00
hristoterezov
dbd24417c4 Fixes DS icon glow 2016-01-22 15:10:59 -06:00
hristoterezov
724ebdfe04 Merge branch 'jitsi-meet-new' of github.com:jitsi/jitsi-meet into jitsi-meet-new 2016-01-22 11:41:02 -06:00
hristoterezov
6ad9243446 Updates the library. Removes oncontextmenu handlers. 2016-01-22 11:37:48 -06:00
damencho
03a9c8aa1c Updates library to fix start muted. 2016-01-22 11:35:27 -06:00
paweldomas
ea6eaad563 Fixes bridge is down UI notification. 2016-01-22 11:33:17 -06:00
hristoterezov
c5f94fadd8 Merge branch 'jitsi-meet-new' of github.com:jitsi/jitsi-meet into jitsi-meet-new 2016-01-22 11:30:29 -06:00
isymchych
93aef0683b fix issue with fullscreen in Safari 2016-01-22 19:18:59 +02:00
George Politis
ff97321ea4 Updates lib-jitsi-meet@ba21635b3d04bb7f2505b446f21d341992149107 2016-01-21 17:19:53 -06:00
hristoterezov
ce41ddd024 Merge branch 'jitsi-meet-new-callstats' into jitsi-meet-new 2016-01-21 13:29:53 -06:00
hristoterezov
b174f231bf Merge branch 'jitsi-meet-new' of github.com:jitsi/jitsi-meet into jitsi-meet-new 2016-01-21 13:28:54 -06:00
hristoterezov
4ec62e40f1 Fixes jshint 2016-01-21 13:28:43 -06:00
damencho
2ef96d21e9 Updates package.json with some changes from master. 2016-01-21 13:27:55 -06:00
yanas
3fe0487df7 Fixes local video flickering when locally muted. Rearranges some of the large video avatar related code. 2016-01-21 11:39:05 -06:00
damencho
bc43108877 Makes sure we unmark remote videos as dominant speaker if any when the local participant becomes dominant speaker. 2016-01-21 11:28:47 -06:00
damencho
0291287ecb Temporary fix to make sure 2.2.0 isn't pulled which has a bug. 2016-01-21 11:08:08 -06:00
damencho
0db262da6a Fixes showing local resolution in UI. 2016-01-21 10:45:19 -06:00
damencho
c54e6c0f3c Fixes showing remote resolutions in UI. 2016-01-20 22:54:05 -06:00
hristoterezov
8787723330 Fixes desktop streaming for FF 2016-01-20 18:17:22 -06:00
George Politis
e0e5de6ec0 Revert "Temporarily disable hard video mute."
This reverts commit f02bee06aa.
2016-01-20 17:38:07 -06:00
damencho
1dd0fe4bca Decrease the ping interval. 2016-01-20 17:02:10 -06:00
hristoterezov
0d03a4fceb callstats 2016-01-20 15:41:37 -06:00
isymchych
cff44286f5 resize #videospace on window resize 2016-01-20 16:26:39 +02:00
yanas
27d509332a Merges Boris Grozev's commit from Dec 8, 2015, named: Uses a single avatar URL, allows to override gravatar with a custom URL. Commit: a2c41392 2016-01-19 17:11:16 -06:00
damencho
2af941d607 Fixes forcing tcp connections. 2016-01-19 16:58:04 -06:00
yanas
dacd54b73c Fixes clicking remote participant in the contact list. 2016-01-19 16:51:48 -06:00
yanas
2bee98744d Merges commit from Boris Grozev on jitsi-meet: Fixes a typo. 2016-01-19 16:51:47 -06:00
damencho
41b1a6f3c3 Merge branch 'logs' of https://github.com/isymchych/jitsi-meet into jitsi-meet-new 2016-01-19 14:53:10 -06:00
damencho
482f71f5ea Adds helpers to access audio levels from torture. 2016-01-19 13:32:29 -06:00
damencho
09d08b034c Removes unused code. 2016-01-19 13:31:37 -06:00
paweldomas
2dba1d9d17 Requires prosody-trunk at least 607 for jitsi-meet-tokens 2016-01-19 12:59:22 -06:00
paweldomas
428fa3f16a New JWT token impl that does not require token verification in Jicofo and uses anonymous authentication method(token goes as BOSH query param). Adds 'allow_empty_token" config option. 2016-01-19 12:59:06 -06:00
paweldomas
ac8e1ce388 Configures Jicofo when jitsi-meet-tokens package is installed 2016-01-19 12:58:59 -06:00
paweldomas
d666fbb6a4 Uses JWT for token generation in prosody plugin. 2016-01-19 12:58:51 -06:00
paweldomas
1565f0a598 Removes Prosody patch(the code is in trunk) 2016-01-19 12:55:10 -06:00
George Politis
f02bee06aa Temporarily disable hard video mute. 2016-01-15 18:50:03 -06:00
George Politis
954345da48 Removes space in cname generation of recvonly streams. 2016-01-15 14:39:53 -06:00
damencho
029ccf3b31 Adds method used by torture to obtain current audio levels. 2016-01-15 14:12:15 -06:00
damencho
7e35794e47 Passes all configs to the connection. 2016-01-15 13:50:16 -06:00
Lyubomir Marinov
ec954ad3cc Decides whether to use analytics after the analytics API has been given a chance to load. 2016-01-15 16:09:29 +02:00
Lyubomir Marinov
b49a08c485 Decides whether to use analytics after the analytics API has been given a chance to load. 2016-01-15 15:42:04 +02:00
damencho
aed2d97c10 Fixes displayname on remote video on FF. Seems innerText is not working on FF, replace it with innerHTML. 2016-01-14 16:34:22 -06:00
damencho
dcb607a586 Shows displayname after editing it. 2016-01-14 16:21:03 -06:00
damencho
3cd549a758 Hides video wrapper when avtar is shown, and make it visible when we hide the avtar. 2016-01-14 14:11:01 -06:00
damencho
765f07109a Adds utility to check for remote participants with tracks. 2016-01-14 13:50:10 -06:00
paweldomas
ea24c6a66a Fixes broken requireDisplayName feature.
It was asking for new display name even if we have had one configured already.
2016-01-14 13:39:32 -06:00
damencho
cd4ebca730 Fixes showing display name and hiding avtar, when video is muted and avtar is on large. 2016-01-14 13:30:56 -06:00
damencho
a6a6d2992e Adds helper function to obtain large video id from tests. 2016-01-14 13:30:27 -06:00
damencho
b875dc62dc Fixing remote avatars to be the same as local one. 2016-01-14 13:04:21 -06:00
damencho
809f68104d Fixes undefined error. 2016-01-14 11:15:38 -06:00
damencho
0531daf541 Updates the way we update large/small video, avatars and displayname. Fixes issue with not displying avatars in local or remote video when video muted. Fixes if pinned participant turns off video and when unpin we return to the correct dominant speaker. 2016-01-14 10:28:24 -06:00
isymchych
24b24a62c4 fixed "download logs" button 2016-01-14 17:35:37 +02:00
isymchych
666dfb9b63 do not use xmpp module in API module 2016-01-14 17:05:54 +02:00
Lyubomir Marinov
4a6e8e5e6e Manually formats config.js to bring in a bit of consistency and make uncommenting properties a tad easier and less error prone. 2016-01-14 10:06:47 +02:00
Lyubomir Marinov
ca3dd8865f Asynchronously downloads the callstats.io API because the third-party server may take 'forever' to respond. 2016-01-14 09:39:57 +02:00
Lyubomir Marinov
9b28e64e5d Prevents breakages of our functionality caused by side-effect callstats.io API failures. 2016-01-14 09:28:14 +02:00
Lyubomir Marinov
2b570a2251 Prefers public getters over duplication of logic and/or access to private fields at multiple locations. 2016-01-14 09:27:46 +02:00
Lyubomir Marinov
d7c9a97e8d Adds a FIXME (comment) to make a note of the fact that loading analytics.js after modules/statistics/AnalyticsAdapter.js forces the method AnalyticsAdapter.sendEvent to a no-op. 2016-01-14 09:27:46 +02:00
damencho
cb40ab5420 Fixes moderator icon on remote videos. 2016-01-13 15:17:33 -06:00
hristoterezov
f8c12304dc Fixes start muted. Adds the local track before the conference is joined. 2016-01-12 21:38:58 -06:00
hristoterezov
78c4c11736 Merge branch 'jitsi-meet-new' of github.com:jitsi/jitsi-meet into jitsi-meet-new 2016-01-12 21:13:03 -06:00
damencho
6a91a48823 Fixes element id name. 2016-01-12 17:29:52 -06:00
damencho
c64d008d05 Fixes element id name. 2016-01-12 16:48:47 -06:00
hristoterezov
5cda355142 Merge branch 'isymchych-jitsi-meet-new' into jitsi-meet-new 2016-01-12 15:51:00 -06:00
damencho
9fa4b02673 Reports pinned participants back to the library. 2016-01-12 15:11:24 -06:00
isymchych
0262917aa6 implementation of "start muted" 2016-01-12 15:51:43 +02:00
damencho
3fd68fa0fd Renames all active speaker references to be called dominant speaker. 2016-01-11 18:14:01 -06:00
damencho
f2c5e7da41 Removes unused code. 2016-01-11 17:34:02 -06:00
damencho
8249aea796 Call mucJoined of video layout when the actual joining occurs, as the local id is needed when the presence for the email is received/processed and avatar is set. 2016-01-11 17:14:56 -06:00
George Politis
dc07fd733f Removes the local SSRC replacement hack and fixes video muting/unmuting when simulcast is enabled. 2016-01-11 15:51:55 -06:00
George Politis
8ec90ea675 Bumps the sdp-simulcast version. 2016-01-11 15:05:56 -06:00
yanas
d6a1192a0f Fixes issue with avatar not being centered. 2016-01-11 14:58:07 -06:00
yanas
bbb144f1bd Fixes issue with conference starting before the UI is ready + enableWelcomePage config support. 2016-01-11 14:26:04 -06:00
hristoterezov
632b56b069 Fixes audio mute issue 2016-01-06 17:25:53 -06:00
hristoterezov
00e606663d Updates lib-jitsi-meet.js 2016-01-06 17:02:08 -06:00
hristoterezov
29a85b797a Fixes audio / video mutes 2016-01-06 16:39:13 -06:00
damencho
8aad75d9fa Sets local avatar after local video id is set on joined (VideoLayout.mucJoined()). 2016-01-05 17:23:24 -06:00
damencho
01a9d47959 Fixes setting custom avatar based on the email and reverts the functionality to set custom avatar links to replace the default gravatars. 2016-01-05 17:22:29 -06:00
damencho
1702105b06 Adds utility methods used by torture. 2016-01-05 16:20:02 -06:00
hristoterezov
a56d462dae Fixes the format of the data in connection quality module 2016-01-04 17:16:58 -06:00
hristoterezov
54f2364f18 Updates the library 2016-01-04 16:23:18 -06:00
hristoterezov
95b23f994c Fixes issues with unloading the page 2016-01-04 14:55:43 -06:00
hristoterezov
3168c86f77 Fixes mute participant functionality 2015-12-31 16:02:03 -06:00
hristoterezov
c8c6a6d583 Implements recording 2015-12-31 14:38:43 -06:00
hristoterezov
ce43ce4cd8 Remove unused files 2015-12-30 16:36:46 -06:00
hristoterezov
97697ed9f0 Fixes JS errors in UI.js 2015-12-30 14:57:28 -06:00
hristoterezov
9b7ddec703 Merge pull request #441 from isymchych/jitsi-meet-new
refactoring of Etherpad and Prezi
2015-12-30 13:52:30 -06:00
isymchych
335cc6ca6f cleanup desktopsharing events 2015-12-30 15:28:56 +02:00
isymchych
c36001f861 removed xmpp and RTC modules 2015-12-30 14:34:10 +02:00
isymchych
6ee6b6e9e5 fixes after rebase 2015-12-30 14:14:56 +02:00
isymchych
b375b14696 abstract out remoteVideos management 2015-12-30 13:12:01 +02:00
isymchych
3400925f99 on-the-fly auth improvements 2015-12-30 13:12:01 +02:00
isymchych
a10f9437f1 Integration of statistics module 2015-12-30 13:12:01 +02:00
isymchych
0fd0f5b633 refactoring of Etherpad and Prezi 2015-12-30 13:12:01 +02:00
hristoterezov
e494c3028d Adds SIP calls support 2015-12-29 17:52:24 -06:00
hristoterezov
3ec04d5a95 Implements desktop sharing. 2015-12-29 16:30:50 -06:00
paweldomas
ca8a147ea6 JWT token is now passed as BOSH URL parameter. 2015-12-23 14:58:15 +01:00
hristoterezov
6e007a03af Merge pull request #433 from isymchych/jitsi-meet-new
Integration of UI module with lib-jitsi-meet
2015-12-22 16:56:47 -06:00
paweldomas
9d60af1a9d New JWT token impl that does not require token verification in Jicofo and uses anonymous authentication method(token goes as BOSH query param). Adds 'allow_empty_token" config option. 2015-12-22 19:51:43 +01:00
isymchych
ebaa657678 finished "on the fly" auth 2015-12-21 15:02:07 +02:00
isymchych
035e20eceb allow to kick users 2015-12-21 14:30:54 +02:00
isymchych
f56eb3440a properly update toolbar if auth enabled 2015-12-21 13:27:36 +02:00
isymchych
3a00837107 better error handling while establishing connection 2015-12-18 19:54:15 +02:00
isymchych
0ec8ab69a0 properly update nickname 2015-12-18 17:26:31 +02:00
damencho
baf31aa9f3 Adds logging for results of mungeLocalVideoSSRC. 2015-12-17 16:22:07 -06:00
isymchych
58d1c76ab0 handle external auth; xmpp auth tbd 2015-12-17 18:05:03 +02:00
isymchych
28e5bf4bec add "authentication required" dialog 2015-12-17 17:31:56 +02:00
isymchych
ec2be349df refactor authentication module 2015-12-17 17:31:56 +02:00
isymchych
fbe5ef7ee6 fix issue with nickname input in chat 2015-12-17 17:31:56 +02:00
isymchych
e666ed70f7 use proper message timestamp 2015-12-17 17:31:56 +02:00
isymchych
4f91ac01fd refactoring 2015-12-17 17:31:56 +02:00
isymchych
2af591f6d9 updated library 2015-12-17 17:31:56 +02:00
isymchych
36874c395a remove user from VideoLayout 2015-12-17 17:31:56 +02:00
isymchych
6ded050b51 do not use RTC/xmpp in UI module 2015-12-17 17:31:56 +02:00
isymchych
cb522eadd8 code cleanup 2015-12-17 17:31:56 +02:00
isymchych
de9d991f98 do not use xmpp module in side_panels module 2015-12-17 17:31:56 +02:00
isymchych
437a8a6ef0 refactor ToolbarToggler 2015-12-17 17:31:56 +02:00
isymchych
e23dd62d86 refactor BottomToolbar 2015-12-17 17:31:56 +02:00
isymchych
cf578b7732 do not use xmpp module in Toolbar 2015-12-17 17:31:56 +02:00
isymchych
7cc682d5a4 move random stuff out of Toolbar 2015-12-17 17:31:56 +02:00
isymchych
eeb390cd9d handle DTMF_SUPPORT_CHANGED event 2015-12-17 17:31:56 +02:00
isymchych
fc207ccf34 extract room locking out of Toolbar 2015-12-17 17:31:56 +02:00
isymchych
5846a25fc3 remove Prezi and Etherpad dependencies from Toolbar 2015-12-17 17:31:56 +02:00
isymchych
fbcd2d2320 use JitsiParticipant to handle user roles 2015-12-17 17:31:56 +02:00
isymchych
0460e7da29 add local media streams to UI 2015-12-17 17:31:56 +02:00
isymchych
6a3704d826 replace resourceIds with ids in AudioLevels 2015-12-17 17:31:56 +02:00
isymchych
586988f327 properly generate room name 2015-12-17 17:31:56 +02:00
isymchych
fc76aa5293 handle incoming messages 2015-12-17 17:31:56 +02:00
isymchych
ff6ec2ec6b use babel 2015-12-17 17:31:56 +02:00
isymchych
1690be3e5b add missing module dependency 2015-12-17 17:31:56 +02:00
damencho
034ed200f3 Displays correct resolution coming from FF. 2015-12-16 12:46:32 -06:00
damencho
589380c7b3 Displays correct resolution coming from FF. 2015-12-16 12:45:13 -06:00
damencho
97ebcebdbe Revert "Fixes a problem with receiving presence for start muted video before creating the stream element, which will end up that the muted video element will hide the avatar."
This reverts commit 303287f7a6.
2015-12-15 16:55:25 -06:00
paweldomas
9734da3083 Configures Jicofo when jitsi-meet-tokens package is installed 2015-12-15 11:46:58 -06:00
Boris Grozev
2b2a34175f Adds a missing require. 2015-12-14 13:43:05 -06:00
Boris Grozev
e06ec616a6 Changes enableThirdParty requests to disableThirdParty requests, in
order to not change existing behaviour (without changes to config.js).
2015-12-14 13:39:57 -06:00
Jesse Bickel
2b06ca9df7 Shrink the avatar on contact list to <=30px. 2015-12-14 13:39:47 -06:00
Jesse Bickel
fd9485b7e5 Use gravatar when enabled. 2015-12-14 13:34:13 -06:00
Jesse Bickel
46a5c909c8 Only load 3rd party JavaScript when config.enableThirdPartyRequests is true. 2015-12-14 13:26:27 -06:00
damencho
303287f7a6 Fixes a problem with receiving presence for start muted video before creating the stream element, which will end up that the muted video element will hide the avatar. 2015-12-11 14:18:16 -06:00
damencho
067de62a6d Fixes long line. 2015-12-11 14:18:05 -06:00
paweldomas
e0e0baf87e Makes sure that we keep local video SSRC as a "recvonly" when muted. 2015-12-09 23:30:53 -06:00
damencho
75a822be66 Removes second audio track for fake FF devices. 2015-12-08 19:00:21 -06:00
damencho
08107ca95b Fixes retrieving correct local ssrc in FF. Fixes tests that were checking for audio levels. 2015-12-08 19:00:21 -06:00
Boris Grozev
a2c41392dd Uses a single avatar URL, allows to override gravatar with a custom URL for avatars in interface_config.js. 2015-12-08 17:34:40 -06:00
Boris Grozev
a647400cb8 Merge branch 'third-party-requests' 2015-12-08 22:53:43 +00:00
Boris Grozev
f42684d789 Changes enableThirdParty requests to disableThirdParty requests, in
order to not change existing behaviour (without changes to config.js).
2015-12-08 22:52:12 +00:00
paweldomas
1e3ef532aa Adds 'enforcedBridge' property used to make Jicofo use specific bridge and ignore what BridgeSelector module says. 2015-12-08 15:30:46 -06:00
paweldomas
3406802aa8 Uses JWT for token generation in prosody plugin. 2015-12-08 15:30:46 -06:00
Jesse Bickel
c2c3d0fd87 Shrink the avatar on contact list to <=30px. 2015-12-07 15:52:11 -06:00
Jesse Bickel
895bb3fd60 Use gravatar when enabled. 2015-12-07 14:41:35 -06:00
Jesse Bickel
3f42f8bf67 Only load 3rd party JavaScript when config.enableThirdPartyRequests is true. 2015-12-04 13:03:10 -06:00
damencho
5f6bba435c Fixes Uncaught TypeError: mediaStream.detachEvent on stopping desktop sharing. 2015-12-04 11:30:11 -06:00
damencho
09a509400f Fixes showing prezi button. 2015-12-04 10:38:42 -06:00
hristoterezov
98f0de258b Merge pull request #421 from isymchych/use-API
Use JS API in jitsi-meet
2015-12-03 16:21:03 -06:00
isymchych
91fbf1e274 added editorconfig 2015-12-03 15:11:25 +02:00
isymchych
09aa9482c0 do not use members module 2015-12-03 15:11:01 +02:00
damencho
1c19f977ad Converts ssltcp candidate to tcp one on FF. 2015-12-02 17:15:55 -06:00
damencho
d7317a94bb Converts ssltcp candidate to tcp one on FF. 2015-12-02 16:35:45 -06:00
isymchych
272cfea493 share user email through commands 2015-12-02 17:24:57 +02:00
isymchych
941cd13193 do not use xmpp in connectionquality module 2015-12-02 15:05:29 +02:00
George Politis
3ca288d74d Adds comment. 2015-12-01 13:27:01 -06:00
George Politis
72c7812376 Revert "Sets up simulcast for 2 layers."
This reverts commit b2993d8cf3.
2015-12-01 13:26:24 -06:00
George Politis
d42415959f Adds comment. 2015-12-01 13:25:20 -06:00
George Politis
b678671607 Revert "Sets up simulcast for 2 layers."
This reverts commit b2993d8cf3.
2015-12-01 13:24:15 -06:00
isymchych
8226914348 load library from index.html 2015-12-01 18:55:54 +02:00
isymchych
8002dcbe66 update lib 2015-12-01 15:44:50 +02:00
isymchych
fe77846b89 do not use xmpp in settings menu 2015-12-01 15:41:58 +02:00
isymchych
c50151d85d do not use NicknameHandler 2015-12-01 14:53:01 +02:00
isymchych
4152106a06 listen to CONNECTION_INTERRUPTED and CONNECTION_RESTORED events 2015-12-01 12:05:55 +02:00
isymchych
c21c9ce1b8 do not use xmpp module in AudioLevels 2015-12-01 11:12:40 +02:00
isymchych
4ef57ceada do not use XMPP or RTC modules in UI 2015-11-30 17:24:42 +02:00
isymchych
59f98205c7 use JS API; UI module refactoring 2015-11-30 13:54:54 +02:00
paweldomas
0a7cea26b3 Exposes methods for obtaining stream SSRCs and audio levels. 2015-11-25 20:09:24 -06:00
paweldomas
286225e81e Removes unused code used to inject local SSRCs. 2015-11-25 20:09:12 -06:00
bgrozev
b2a3866fe4 Fixes a typo (reported by Emil Ivov) 2015-11-25 15:46:41 -06:00
damencho
c5b3677e71 Updates sdp-interop and sdp-transform versions, thanks to virtuacoplenny. 2015-11-24 13:10:29 -06:00
damencho
6b621654ab Adds speaker indicator and no longer use the display name for that purpose. 2015-11-23 17:30:24 -06:00
George Politis
c3f9226ec8 Updates the supported browser list and closes #372.
- Adds Safari and IE in the supported browser list.
- Adds version numbers for the supported browsers.
2015-11-23 15:56:35 -06:00
hristoterezov
d060db476f Merge branch 'isymchych-bug/large-video-on-safari' 2015-11-20 11:21:14 -06:00
hristoterezov
2e7e7d2dd8 Merge branch 'bug/large-video-on-safari' of git://github.com/isymchych/jitsi-meet 2015-11-20 11:06:40 -06:00
isymchych
1d59283518 fixed switching to large video from FF on safari 2015-11-20 14:05:37 +02:00
hristoterezov
de311b1372 Updates gitignore 2015-11-19 16:21:10 -06:00
isymchych
19d9c0be50 fixed switching to large video from FF on safari 2015-11-19 14:32:07 +02:00
yanas
236c4bb37c Adds a method in callstats in order to check if it's enabled. 2015-11-17 16:39:40 -06:00
isymchych
72c39a0162 accumulate erorrs unitl connected to callstats 2015-11-17 16:39:40 -06:00
damencho
94b54279f2 Fixes wrong handler name, which causes adding multiple local video tags in the local video. 2015-11-17 14:27:38 -06:00
George Politis
9f1e953e8a Bumps sdp-simulcast@0.1.2. 2015-11-17 18:16:19 +00:00
George Politis
5d571e696f Sets up simulcast for 2 layers. 2015-11-17 18:16:19 +00:00
George Politis
ce397d9e74 Fixes issue in ssrc-group SDP parsing.
How did this even work before?
2015-11-17 18:15:24 +00:00
damencho
b64f3a5913 Adds method to obtain remote video type. 2015-11-16 18:17:18 -06:00
yanas
7ea675159e Disables feedback functionality if callstats isn't available. 2015-11-16 18:06:47 -06:00
damencho
0ae702922c Makes the room parameter lower case. 2015-11-16 16:50:15 -06:00
damencho
f9d1fd13df Fixes an issue where lastN event, includes in the logic local resource and detects it as removed from lastN and schedules update of large video. If we receive this event for newly joined participant and we have pinned the local video, the event triggers update of large video which displays the wrong participant, not the pinned local video. 2015-11-16 13:33:29 -06:00
damencho
74c420a609 Adds config option for auto enable desktop sharing when opening an url. 2015-11-13 16:18:22 -06:00
yanas
26e2fd6ef0 Fixes desktop streaming layout. 2015-11-13 11:04:49 -06:00
damencho
4b62f7f0ac Adds shortcut to toggle desktop sharing. 2015-11-12 16:57:00 -06:00
damencho
fbb5f9b6c1 Merge pull request #361 from bickelj/master
Use member.isFocus to decide whether a given member is the focus user
2015-11-12 10:37:35 -06:00
damencho
e460f0c8fa Fixes lastN video change. Resulting 'Uncaught TypeError: stream.getOriginalStream is not a function', problem detected by torture (3 participants and the last one receives last-n changed event on joining and screenshot shows: it is missing one of the participants and logs contain this error). 2015-11-10 16:40:34 -06:00
damencho
dc2a60edbb Fixes long lines. 2015-11-10 16:40:25 -06:00
yanas
071fbfbd0d Merge pull request #399 from isymchych/callstats-error-reporting
Callstats error reporting. Ivan is going to publish another PR about earlier failures that would apply on top of this one.
2015-11-10 13:39:23 -06:00
Ingo Bauersachs
819f1414d6 Add Swedish to active languages 2015-11-10 09:38:59 +01:00
damencho
1bb5188ac8 Simplifies the check for installed nginx, fixes purge when nginx was not used. 2015-11-09 16:26:13 -06:00
damencho
b6cb424720 Fixes ff logo width. 2015-11-09 13:30:13 -06:00
damencho
6a30e9178c Updates firefox logo in unsupported page. 2015-11-09 13:12:05 -06:00
damencho
f005606428 Reverts messing with css files. 2015-11-09 12:36:01 -06:00
damencho
8f6fe2a5b3 Revert "Reorder css files in alphabet order."
This reverts commit 88fa2ae8b3.
2015-11-09 11:48:35 -06:00
damencho
7cebc563db Use all css file. 2015-11-09 11:39:15 -06:00
damencho
840dbbeef1 Adds missing unsupported_browser.css. 2015-11-09 11:38:57 -06:00
damencho
88fa2ae8b3 Reorder css files in alphabet order. 2015-11-09 11:38:25 -06:00
damencho
b6f9cf93d5 Updates dev build instructions. 2015-11-09 09:38:42 -06:00
ibauersachs
ea7283aa52 Commit from translate.jitsi.org by user ibauersachs.: 175 of 180 strings translated (0 fuzzy). 2015-11-09 13:01:12 +00:00
ibauersachs
76f889bcdd Commit from translate.jitsi.org by user ibauersachs.: 180 of 180 strings translated (0 fuzzy). 2015-11-09 13:00:59 +00:00
paweldomas
cfcf6fbc67 Merge branch 'multiple-tracks' 2015-11-06 16:27:14 -06:00
Boris Grozev
4009fed35d Moves the roomname generator to util, reuses a function. 2015-11-06 16:21:21 -06:00
paweldomas
27fc4636b7 Adjustments to make lip-sync work. Stream merging is now done by Jicofo. 2015-11-06 16:18:33 -06:00
Boris Grozev
fb6367d687 Wraps at 80 chars. 2015-11-06 16:05:22 -06:00
Boris Grozev
5542642933 Exposes functions in RandomUtils. 2015-11-06 15:45:34 -06:00
Boris Grozev
005cc4b27a Simplifies code. 2015-11-06 15:30:41 -06:00
yanas
a2c37fa3f6 Fixes some warnings. 2015-11-06 15:02:42 -06:00
isymchych
9f2b3aa011 rename callStatsUID to callStatsUserName 2015-11-06 14:58:07 -06:00
isymchych
c89c9e78ff move username generator to utils 2015-11-06 14:56:12 -06:00
isymchych
0a71c2e1d3 Generate random username for callstats 2015-11-06 14:49:32 -06:00
yanas
03018a2ead Fixing documentation warnings. 2015-11-06 11:48:00 -06:00
paweldomas
333cd6f25f Converts constants in RandomUtil to hex. 2015-11-05 14:14:52 -06:00
isymchych
05b3df0560 added jsdocs 2015-11-05 20:30:30 +02:00
isymchych
5be8c33054 report webrtc errors to callstats 2015-11-05 20:21:34 +02:00
bgrozev
a64627aa47 Clarifies supported systems 2015-11-05 11:58:13 -06:00
yanas
73b1d3c7c2 Adds a feedback button and dialog. 2015-11-05 11:28:01 -06:00
Boris Grozev
2117aefacc Removes unused code. 2015-11-05 11:01:19 -06:00
yanas
a3264ce6b7 Merge pull request #396 from isymchych/fix-username-xss
Escape html from username.
2015-11-05 10:06:05 -06:00
damencho
374763c325 Fixes mute check, prevents disabling the menu when the remote participant is muted. 2015-11-04 17:23:49 -06:00
paweldomas
73317c920a Merge branch 'master' into multiple-tracks 2015-11-04 15:09:51 -06:00
isymchych
fdc2ecd86f escape html from username 2015-11-04 17:01:11 +02:00
damencho
5446c513f5 Adds room name parameter to the bosh connection. 2015-11-03 14:32:41 -06:00
paweldomas
b1f617502e Integrates token authentication. 2015-11-03 13:21:52 -06:00
Boris Grozev
a5e15025f8 Implements switching streams on firefox by using RTPSender.replaceTrack(). Fixes bugs with switching between camera and screen sharing. 2015-11-03 11:27:48 -06:00
paweldomas
7ff7545570 Reload Prosody after successful tokens install. 2015-11-03 11:14:01 -06:00
paweldomas
ca89b59638 Fixes for jitsi-meet-tokens Debian package. 2015-11-03 11:11:54 -06:00
damencho
67b35f0f1e Uses inactive callback if available instead of deprecated onended one. 2015-11-02 16:42:32 -06:00
damencho
249e032ad6 Uses stopping tracks and use MediaStream.stop method only if defined. Based on previous code and inspired by PR #390. 2015-11-02 16:42:32 -06:00
damencho
fa138eae43 Replaces deprecated ended call with active check for media streams. 2015-11-02 16:42:32 -06:00
paweldomas
9406669aae Fix for jitsi-meet-tokens 2015-11-02 15:28:19 -06:00
paweldomas
531b81cce3 Adds Prosody plugin for token authentication. 2015-11-02 15:28:18 -06:00
damencho
b08308e5e4 Fixes isMuted check. 2015-11-02 10:48:09 -06:00
damencho
74227e182a Makes sure we use stream.ended in one place. 2015-10-30 17:57:25 -05:00
damencho
8cebbbb347 Stops the MediaStream using the utility method in RTC. 2015-10-30 17:57:25 -05:00
damencho
1ba0a182f6 Makes sure we add/remove all onended events for media streams in one central place. 2015-10-30 17:57:25 -05:00
damencho
11e1197901 Uses one method from RTC to stop media streams. 2015-10-30 17:57:25 -05:00
Boris Grozev
932af962b2 Adds an option to advertise our SSRCs in presence to the MUC (as well as
Jingle) for backward compatibility with jirecon. Partially reverts
a1b0677442
2015-10-29 16:50:33 -05:00
Boris Grozev
e0522f6977 Simplifies code. 2015-10-29 16:30:36 -05:00
Boris Grozev
9111797913 Removes a tangle of spaghetti. 2015-10-29 14:30:30 -05:00
Boris Grozev
a2ad7b8f53 Mutes video elements. 2015-10-28 12:05:42 -05:00
paweldomas
7abe02d756 Merge audio and video on the receiver's side. 2015-10-28 12:01:21 -05:00
Boris Grozev
cd1e761699 Creates multiple (Jitsi-Meet) MediaStreams if the RTCMediaStream object
contains both audio and video tracks.
2015-10-28 11:30:48 -05:00
damencho
14fe5d09d1 Adds ssl stronger settings to default nginx config. 2015-10-26 12:47:34 -05:00
bgrozev
83339382ab s/jessie/Wheezy/ 2015-10-21 09:53:51 -05:00
bgrozev
28d63ec2c1 Adds a note for running on Debian jessie. 2015-10-21 09:52:42 -05:00
bgrozev
30c601e054 Removes words from the roomname generator. 2015-10-21 09:46:54 -05:00
Boris Grozev
23ff99db6e Implements choosing from a list of possible BOSH addresses. 2015-10-20 10:44:41 -05:00
Boris Grozev
554808549e Fixes a bug reported by George Politis. 2015-10-19 15:59:24 -05:00
Boris Grozev
657a3fb2e1 Removes comments (fixes warnings). 2015-10-19 15:59:16 -05:00
bgrozev
bbbe1fe5c7 Merge pull request #374 from spellauge/authdomain2
authdomain2
2015-10-14 11:25:19 -05:00
Yana Stamcheva
b2f94783fa Loads css before js, attempting to fix an issue with incorrect video initial size. 2015-10-13 16:07:27 -05:00
damencho
4ed5fa2813 Adds version param to all resources. 2015-10-13 11:47:55 -05:00
Boris Grozev
ae793726ca Allows the URLProcessor to replace a property even if its type changes. 2015-10-12 17:46:58 -05:00
Spellauge
277f340063 authdomain2 2015-10-12 17:38:35 +02:00
bgrozev
0e66552a7f Clarifies documentation
Add a note about the need to forward ports, as suggested by @joudinet on github.
2015-10-09 12:39:00 -05:00
Jesse Bickel
806cacb755 Use member.isFocus to decide whether a given member is the conference focus user. 2015-09-25 08:49:19 -05:00
534 changed files with 47272 additions and 22395 deletions

6
.buckconfig Normal file
View File

@@ -0,0 +1,6 @@
[android]
target = Google Inc.:Google APIs:23
[maven_repositories]
central = https://repo1.maven.org/maven2

13
.editorconfig Normal file
View File

@@ -0,0 +1,13 @@
# http://editorconfig.org
root = true
[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = space
max_line_length = 80
trim_trailing_whitespace = true
[Makefile]
indent_style = tab

12
.eslintignore Normal file
View File

@@ -0,0 +1,12 @@
# The build artifacts of the jitsi-meet project.
build/*
# Third-party source code which we (1) do not want to modify or (2) try to
# modify as little as possible.
flow-typed/*
libs/*
# ESLint will by default ignore its own configuration file. However, there does
# not seem to be a reason why we will want to risk being inconsistent with our
# remaining JavaScript source code.
!.eslintrc.js

44
.eslintrc.js Normal file
View File

@@ -0,0 +1,44 @@
module.exports = {
'env': {
'browser': true,
'commonjs': true,
'es6': true
},
'extends': [
'eslint:recommended',
'plugin:flowtype/recommended'
],
'globals': {
// The globals that (1) are accessed but not defined within many of our
// files, (2) are certainly defined, and (3) we would like to use
// without explicitly specifying them (using a comment) inside of our
// files.
'__filename': false
},
'parser': 'babel-eslint',
'parserOptions': {
'ecmaFeatures': {
'experimentalObjectRestSpread': true
},
'sourceType': 'module'
},
'plugins': [
'flowtype'
],
'rules': {
'new-cap': [
'error',
{
'capIsNew': false // Behave like JSHint's newcap.
}
],
// While it is considered a best practice to avoid using methods on
// console in JavaScript that is designed to be executed in the browser
// and ESLint includes the rule among its set of recommended rules, (1)
// the general practice is to strip such calls before pushing to
// production and (2) we prefer to utilize console in lib-jitsi-meet
// (and jitsi-meet).
'no-console': 'off',
'semi': 'error'
}
};

50
.flowconfig Normal file
View File

@@ -0,0 +1,50 @@
[ignore]
; We fork some components by platform
.*/*[.]android.js
; Ignore "BUCK" generated dirs
<PROJECT_ROOT>/\.buckd/
; Ignore unexpected extra "@providesModule"
.*/node_modules/.*/node_modules/fbjs/.*
; Ignore duplicate module providers
; For RN Apps installed via npm, "Libraries" folder is inside
; "node_modules/react-native" but in the source repo it is in the root
.*/Libraries/react-native/React.js
.*/Libraries/react-native/ReactNative.js
; Ignore packages in node_modules which we (i.e. the jitsi-meet project) have
; seen to cause errors and we have chosen not to fix.
.*/node_modules/babel-core/.*
.*/node_modules/bower/.*
.*/node_modules/jsonlint/.*
[include]
[libs]
node_modules/react-native/Libraries/react-native/react-native-interface.js
node_modules/react-native/flow
flow/
[options]
module.system=haste
experimental.strict_type_args=true
munge_underscores=true
module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
suppress_type=$FlowIssue
suppress_type=$FlowFixMe
suppress_type=$FixMe
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-7]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-7]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
unsafe.enable_getters_and_setters=true
[version]
^0.37.0

2
.gitattributes vendored
View File

@@ -1 +1,3 @@
*.bundle.js -text -diff
*.pbxproj -text
lib-jitsi-meet.js -text -diff

68
.gitignore vendored
View File

@@ -1,8 +1,68 @@
node_modules
*.swp
.idea/
*.iml
.*.tmp
deploy-local.sh
libs/app.bundle.*
libs/
all.css
*css.map
.remote-sync.json
.sync-config.cson
# The following are automatically generated by the react-native command line
# utility (either with the init or upgrade option which pull in the latest
# template files recommended by Facebook for React Native).
# OSX
#
.DS_Store
# Xcode
#
build/
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata
*.xccheckout
*.moved-aside
DerivedData
*.hmap
*.ipa
*.xcuserstate
project.xcworkspace
# Android/IntelliJ
#
build/
.idea
.gradle
local.properties
*.iml
# node.js
#
node_modules/
npm-debug.log
yarn-error.log
# BUCK
#
buck-out/
\.buckd/
android/app/libs
*.keystore
# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use
# fastlane to re-generate the screenshots whenever they are needed. For more
# information about the recommended setup visit:
# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
#
fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots

View File

@@ -1,8 +1,12 @@
node_modules
libs
debian
analytics.js
# The following do not need to be checked because they do not represent JS
# source code.
build/
debian/
libs/
node_modules/
modules/xmpp/strophe.emuc.js
modules/UI/prezi/Prezi.js
modules/RTC/adapter.screenshare.js
# The following are checked by ESLint which supersedes JSHint.
flow-typed/
react/
analytics.js

View File

@@ -15,5 +15,6 @@
"newcap": true, // true: Require capitalization of all constructor functions e.g. `new F()`
"maxlen": 80, // {int} Max number of characters per line
"latedef": false, //This option prohibits the use of a variable before it was defined
"laxbreak": true //Ignore line breaks around "=", "==", "&&", etc.
"laxbreak": true, //Ignore line breaks around "=", "==", "&&", etc.
"esnext": true //support ES2015
}

1
.watchmanconfig Normal file
View File

@@ -0,0 +1 @@
{}

12
404.html Normal file
View File

@@ -0,0 +1,12 @@
<html>
<head>
<link rel="stylesheet" href="css/all.css"/>
<!--#include virtual="title.html" -->
</head>
<body>
<div class="error_page">
<h2>404 Not Found</h2>
<p class="error_page__message">You can create new conversation <a class="link" href="/">here</a></p>
</div>
</body>
</html>

4
ConferenceEvents.js Normal file
View File

@@ -0,0 +1,4 @@
/**
* Notifies interested parties that hangup procedure will start.
*/
export const BEFORE_HANGUP = "conference.before_hangup";

View File

@@ -1,34 +1,61 @@
NPM = npm
BROWSERIFY = ./node_modules/.bin/browserify
UGLIFYJS = ./node_modules/.bin/uglifyjs
EXORCIST = ./node_modules/.bin/exorcist
BUILD_DIR = build
CLEANCSS = ./node_modules/.bin/cleancss
CSS_FILES = font.css toastr.css main.css videolayout_default.css font-awesome.css jquery-impromptu.css modaldialog.css notice.css popup_menu.css login_menu.css popover.css jitsi_popover.css contact_list.css chat.css welcome_page.css settingsmenu.css
DEPLOY_DIR = libs
BROWSERIFY_FLAGS = -d
LIBJITSIMEET_DIR = node_modules/lib-jitsi-meet/
NODE_SASS = ./node_modules/.bin/node-sass
NPM = npm
OUTPUT_DIR = .
STYLES_BUNDLE = css/all.bundle.css
STYLES_DESTINATION = css/all.css
STYLES_MAIN = css/main.scss
WEBPACK = ./node_modules/.bin/webpack
all: compile uglify deploy clean
all: update-deps compile deploy clean
# FIXME: there is a problem with node-sass not correctly installed (compiled)
# a quick fix to make sure it is installed on every update
# the problem appears on linux and not on macosx
update-deps:
$(NPM) update && $(NPM) install node-sass
compile:
$(NPM) update && $(BROWSERIFY) $(BROWSERIFY_FLAGS) -e app.js -s APP | $(EXORCIST) $(OUTPUT_DIR)/app.bundle.js.map > $(OUTPUT_DIR)/app.bundle.js
$(WEBPACK) -p
clean:
rm -f $(OUTPUT_DIR)/app.bundle.*
rm -fr $(BUILD_DIR)
deploy:
mkdir -p $(DEPLOY_DIR) && \
cp $(OUTPUT_DIR)/app.bundle.min.js $(OUTPUT_DIR)/app.bundle.min.map $(DEPLOY_DIR) && \
(cd css; cat $(CSS_FILES)) | $(CLEANCSS) > css/all.css && \
deploy: deploy-init deploy-appbundle deploy-lib-jitsi-meet deploy-css deploy-local
deploy-init:
mkdir -p $(DEPLOY_DIR)
deploy-appbundle:
cp \
$(BUILD_DIR)/app.bundle.min.js \
$(BUILD_DIR)/app.bundle.min.map \
$(BUILD_DIR)/external_api.min.js \
$(BUILD_DIR)/external_api.min.map \
$(OUTPUT_DIR)/analytics.js \
$(DEPLOY_DIR)
deploy-lib-jitsi-meet:
cp \
$(LIBJITSIMEET_DIR)/lib-jitsi-meet.min.js \
$(LIBJITSIMEET_DIR)/lib-jitsi-meet.min.map \
$(LIBJITSIMEET_DIR)/connection_optimization/external_connect.js \
$(DEPLOY_DIR)
deploy-css:
$(NODE_SASS) $(STYLES_MAIN) $(STYLES_BUNDLE) && \
$(CLEANCSS) $(STYLES_BUNDLE) > $(STYLES_DESTINATION) ; \
rm $(STYLES_BUNDLE)
deploy-local:
([ ! -x deploy-local.sh ] || ./deploy-local.sh)
uglify:
$(UGLIFYJS) -p relative $(OUTPUT_DIR)/app.bundle.js -o $(OUTPUT_DIR)/app.bundle.min.js --source-map $(OUTPUT_DIR)/app.bundle.min.map --in-source-map $(OUTPUT_DIR)/app.bundle.js.map
source-package:
mkdir -p source_package/jitsi-meet/css && \
cp -r analytics.js external_api.js favicon.ico fonts images index.html interface_config.js libs plugin.*html sounds title.html unsupported_browser.html LICENSE config.js lang source_package/jitsi-meet && \
cp -r *.js *.html connection_optimization favicon.ico fonts images libs sounds LICENSE lang source_package/jitsi-meet && \
cp css/all.css source_package/jitsi-meet/css && \
(cd source_package ; tar cjf ../jitsi-meet.tar.bz2 jitsi-meet) && \
rm -rf source_package

View File

@@ -1,10 +1,10 @@
Jitsi Meet - Secure, Simple and Scalable Video Conferences
====
# Jitsi Meet - Secure, Simple and Scalable Video Conferences
Jitsi Meet is an open-source (Apache) WebRTC JavaScript application that uses [Jitsi Videobridge](https://jitsi.org/videobridge) to provide high quality, scalable video conferences. You can see [Jitsi Meet in action](http://youtu.be/7vFUVClsNh0) here at the session #482 of the VoIP Users Conference.
You can also try it out yourself at https://meet.jit.si .
Jitsi Meet allows for very efficient collaboration. It allows users to stream their desktop or only some windows. It also supports shared document editing with Etherpad and remote presentations with Prezi.
Jitsi Meet allows for very efficient collaboration. It allows users to stream their desktop or only some windows. It also supports shared document editing with Etherpad.
## Installation
@@ -12,14 +12,20 @@ Installing Jitsi Meet is quite a simple experience. For Debian-based systems, we
For other systems, or if you wish to install all components manually, see the [detailed manual installation instructions](https://github.com/jitsi/jitsi-meet/blob/master/doc/manual-install.md).
## Download
You can download Debian/Ubuntu binaries:
* [stable](https://download.jitsi.org/stable/) ([instructions](https://jitsi.org/Main/InstallJitsiMeetDebianStableRepository))
* [testing](https://download.jitsi.org/testing/) ([instructions](https://jitsi.org/Main/InstallJitsiMeetDebianTestingRepository))
* [nightly](https://download.jitsi.org/unstable/) ([instructions](https://jitsi.org/Main/InstallJitsiMeetDebianNightlyRepository))
## Building the sources
Jitsi Meet uses [Browserify](http://browserify.org). If you want to make changes in the code you need to [install Browserify](http://browserify.org/#install). Browserify requires [nodejs](http://nodejs.org).
Jitsi Meet uses [Browserify](http://browserify.org). If you want to make changes in the code you need to [install Browserify](http://browserify.org/#install). Browserify requires [nodejs](http://nodejs.org).
On Debian/Ubuntu systems, the required packages can be installed with:
```
sudo apt-get install npm
sudo npm install -g browserify
sudo apt-get install npm nodejs-legacy
cd jitsi-meet
npm install
```
@@ -29,9 +35,64 @@ To build the Jitsi Meet application, just type
make
```
## Working with the library sources (lib-jitsi-meet)
By default the library is build from its git repository sources. The default dependency path in package.json is :
```json
"lib-jitsi-meet": "jitsi/lib-jitsi-meet",
```
To work with local copy you must change the path to:
```json
"lib-jitsi-meet": "file:///Users/name/local-lib-jitsi-meet-copy",
```
To make the project you must force it to take the sources as 'npm update' will not do it.
```
npm install lib-jitsi-meet --force && make
```
Or if you are making only changes to the library:
```
npm install lib-jitsi-meet --force && make deploy-lib-jitsi-meet
```
Alternative way is to use [npm link](https://docs.npmjs.com/cli/link).
It allows to link `lib-jitsi-meet` dependency to local source in few steps:
```bash
cd lib-jitsi-meet
# create global symlink for lib-jitsi-meet package
npm link
cd ../jitsi-meet
# create symlink from the local node_modules folder to the global lib-jitsi-meet symlink
npm link lib-jitsi-meet
```
So now after changes in local `lib-jitsi-meet` repository you can rebuild it with `npm run install` and your `jitsi-meet` repository will use that modified library.
Note: when using node version 4.x, the make file of jitsi-meet do npm update which will delete the link, no longer the case with version 6.x.
If you do not want to use local repository anymore you should run
```bash
cd jitsi-meet
npm unlink lib-jitsi-meet
npm install
```
## Embedding in external applications
Jitsi Meet provides a very flexible way of embedding it in external applications by using the [Jitsi Meet API](doc/api.md).
## Mobile app
Jitsi Meet is also available as a React Native application for Android and iOS.
Instructions on how to build it can be found [here](doc/mobile.md).
## Discuss
Please use the [Jitsi dev mailing list](http://lists.jitsi.org/pipermail/dev/) to discuss feature requests before opening an issue on Github.
Please use the [Jitsi dev mailing list](http://lists.jitsi.org/pipermail/dev/) to discuss feature requests before opening an issue on Github.
## Acknowledgements
Jitsi Meet started out as a sample conferencing application using Jitsi Videobridge. It was originally developed by then ESTOS' developer Philipp Hancke who then contributed it to the community where development continues with joint forces!
Jitsi Meet started out as a sample conferencing application using Jitsi Videobridge. It was originally developed by then ESTOS' developer Philipp Hancke who then contributed it to the community where development continues with joint forces!

View File

@@ -1,5 +1,9 @@
/* global ga */
(function (ctx) {
function Analytics() {
/* eslint-disable */
/**
* Google Analytics
*/
@@ -8,11 +12,22 @@
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-319188-14', 'jit.si');
ga('send', 'pageview');
/* eslint-enable */
}
Analytics.prototype.sendEvent = function (action, data) {
ga('send', 'event', 'jit.si', action);
// empty label if missing value for it and add the value,
// the value should be integer or null
var value = data.value;
value = value? Math.round(parseFloat(value)) : null;
var label = data.label || "";
ga('send', 'event', 'jit.si',
action + '.' + data.browserName, label, value);
};
ctx.Analytics = Analytics;
}(window));
if(typeof ctx.analyticsHandlers === "undefined")
ctx.analyticsHandlers = [];
ctx.analyticsHandlers.push(Analytics);
}(window));

66
android/app/BUCK Normal file
View File

@@ -0,0 +1,66 @@
import re
# To learn about Buck see [Docs](https://buckbuild.com/).
# To run your application with Buck:
# - install Buck
# - `npm start` - to start the packager
# - `cd android`
# - `keytool -genkey -v -keystore keystores/debug.keystore -storepass android -alias androiddebugkey -keypass android -dname "CN=Android Debug,O=Android,C=US"`
# - `./gradlew :app:copyDownloadableDepsToLibs` - make all Gradle compile dependencies available to Buck
# - `buck install -r android/app` - compile, install and run application
#
lib_deps = []
for jarfile in glob(['libs/*.jar']):
name = 'jars__' + re.sub(r'^.*/([^/]+)\.jar$', r'\1', jarfile)
lib_deps.append(':' + name)
prebuilt_jar(
name = name,
binary_jar = jarfile,
)
for aarfile in glob(['libs/*.aar']):
name = 'aars__' + re.sub(r'^.*/([^/]+)\.aar$', r'\1', aarfile)
lib_deps.append(':' + name)
android_prebuilt_aar(
name = name,
aar = aarfile,
)
android_library(
name = 'all-libs',
exported_deps = lib_deps
)
android_library(
name = 'app-code',
srcs = glob([
'src/main/java/**/*.java',
]),
deps = [
':all-libs',
':build_config',
':res',
],
)
android_build_config(
name = 'build_config',
package = 'org.jitsi.meet',
)
android_resource(
name = 'res',
res = 'src/main/res',
package = 'org.jitsi.meet',
)
android_binary(
name = 'app',
package_type = 'debug',
manifest = 'src/main/AndroidManifest.xml',
keystore = '//android/keystores:debug',
deps = [
':app-code',
],
)

158
android/app/build.gradle Normal file
View File

@@ -0,0 +1,158 @@
apply plugin: 'com.android.application'
import com.android.build.OutputFile
/**
* The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets
* and bundleReleaseJsAndAssets).
* These basically call `react-native bundle` with the correct arguments during the Android build
* cycle. By default, bundleDebugJsAndAssets is skipped, as in debug/dev mode we prefer to load the
* bundle directly from the development server. Below you can see all the possible configurations
* and their defaults. If you decide to add a configuration block, make sure to add it before the
* `apply from: "../../node_modules/react-native/react.gradle"` line.
*
* project.ext.react = [
* // the name of the generated asset file containing your JS bundle
* bundleAssetName: "index.android.bundle",
*
* // the entry file for bundle generation
* entryFile: "index.android.js",
*
* // whether to bundle JS and assets in debug mode
* bundleInDebug: false,
*
* // whether to bundle JS and assets in release mode
* bundleInRelease: true,
*
* // whether to bundle JS and assets in another build variant (if configured).
* // See http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Build-Variants
* // The configuration property can be in the following formats
* // 'bundleIn${productFlavor}${buildType}'
* // 'bundleIn${buildType}'
* // bundleInFreeDebug: true,
* // bundleInPaidRelease: true,
* // bundleInBeta: true,
*
* // the root of your project, i.e. where "package.json" lives
* root: "../../",
*
* // where to put the JS bundle asset in debug mode
* jsBundleDirDebug: "$buildDir/intermediates/assets/debug",
*
* // where to put the JS bundle asset in release mode
* jsBundleDirRelease: "$buildDir/intermediates/assets/release",
*
* // where to put drawable resources / React Native assets, e.g. the ones you use via
* // require('./image.png')), in debug mode
* resourcesDirDebug: "$buildDir/intermediates/res/merged/debug",
*
* // where to put drawable resources / React Native assets, e.g. the ones you use via
* // require('./image.png')), in release mode
* resourcesDirRelease: "$buildDir/intermediates/res/merged/release",
*
* // by default the gradle tasks are skipped if none of the JS files or assets change; this means
* // that we don't look at files in android/ or ios/ to determine whether the tasks are up to
* // date; if you have any other folders that you want to ignore for performance reasons (gradle
* // indexes the entire tree), add them here. Alternatively, if you have JS files in android/
* // for example, you might want to remove it from here.
* inputExcludes: ["android/**", "ios/**"],
*
* // override which node gets called and with what additional arguments
* nodeExecutableAndArgs: ["node"]
*
* // supply additional arguments to the packager
* extraPackagerArgs: []
* ]
*/
apply from: '../../node_modules/react-native/react.gradle'
/**
* Set this to true to create two separate APKs instead of one:
* - An APK that only works on ARM devices
* - An APK that only works on x86 devices
* The advantage is the size of the APK is reduced by about 4MB.
* Upload all the APKs to the Play Store and people will download
* the correct one based on the CPU architecture of their device.
*/
def enableSeparateBuildPerCPUArchitecture = false
/**
* Run Proguard to shrink the Java bytecode in release builds.
*/
def enableProguardInReleaseBuilds = false
android {
compileSdkVersion 23
buildToolsVersion '23.0.1'
defaultConfig {
applicationId 'org.jitsi.meet'
minSdkVersion 16
targetSdkVersion 22
versionCode Integer.parseInt("${version}")
versionName "1.2.${version}"
ndk {
abiFilters 'armeabi-v7a', 'x86'
}
packagingOptions {
// The project react-native does not provide 64-bit binaries at the
// time of this writing. Unfortunately, packaging any 64-bit
// binaries into the .apk will crash the app at runtime on 64-bit
// platforms.
exclude 'lib/x86_64/libjingle_peerconnection_so.so'
exclude 'lib/arm64-v8a/libjingle_peerconnection_so.so'
}
}
splits {
abi {
reset()
enable enableSeparateBuildPerCPUArchitecture
universalApk false // If true, also generate a universal APK
include 'armeabi-v7a', 'x86'
}
}
buildTypes {
release {
minifyEnabled enableProguardInReleaseBuilds
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
// applicationVariants are e.g. debug, release
applicationVariants.all { variant ->
variant.outputs.each { output ->
// For each separate APK per architecture, set a unique version code as described here:
// http://tools.android.com/tech-docs/new-build-system/user-guide/apk-splits
def versionCodes = ['armeabi-v7a':1, 'x86':2]
def abi = output.getFilter(OutputFile.ABI)
if (abi != null) { // null for the universal-debug, universal-release variants
output.versionCodeOverride =
versionCodes.get(abi) * 1048576 + defaultConfig.versionCode
}
}
}
}
if (project.hasProperty('JITSI_SIGNING')
&& new File(project.property('JITSI_SIGNING')).exists()) {
apply from: project.property('JITSI_SIGNING');
}
dependencies {
compile project(':react-native-immersive')
compile project(':react-native-keep-awake')
compile project(':react-native-vector-icons')
compile project(':react-native-webrtc')
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:23.0.1'
compile 'com.facebook.react:react-native:+' // From node_modules
}
apply from: '../../node_modules/react-native-vector-icons/fonts.gradle'
// Run this once to be able to run the application with BUCK
// puts all compile dependencies into folder libs for BUCK to use
task copyDownloadableDepsToLibs(type: Copy) {
from configurations.compile
into 'libs'
}

66
android/app/proguard-rules.pro vendored Normal file
View File

@@ -0,0 +1,66 @@
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
# in /usr/local/Cellar/android-sdk/24.3.3/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the proguardFiles
# directive in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# Add any project specific keep options here:
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
# Disabling obfuscation is useful if you collect stack traces from production crashes
# (unless you are using a system that supports de-obfuscate the stack traces).
-dontobfuscate
# React Native
# Keep our interfaces so they can be used by other ProGuard rules.
# See http://sourceforge.net/p/proguard/bugs/466/
-keep,allowobfuscation @interface com.facebook.proguard.annotations.DoNotStrip
-keep,allowobfuscation @interface com.facebook.proguard.annotations.KeepGettersAndSetters
-keep,allowobfuscation @interface com.facebook.common.internal.DoNotStrip
# Do not strip any method/class that is annotated with @DoNotStrip
-keep @com.facebook.proguard.annotations.DoNotStrip class *
-keep @com.facebook.common.internal.DoNotStrip class *
-keepclassmembers class * {
@com.facebook.proguard.annotations.DoNotStrip *;
@com.facebook.common.internal.DoNotStrip *;
}
-keepclassmembers @com.facebook.proguard.annotations.KeepGettersAndSetters class * {
void set*(***);
*** get*();
}
-keep class * extends com.facebook.react.bridge.JavaScriptModule { *; }
-keep class * extends com.facebook.react.bridge.NativeModule { *; }
-keepclassmembers,includedescriptorclasses class * { native <methods>; }
-keepclassmembers class * { @com.facebook.react.uimanager.UIProp <fields>; }
-keepclassmembers class * { @com.facebook.react.uimanager.annotations.ReactProp <methods>; }
-keepclassmembers class * { @com.facebook.react.uimanager.annotations.ReactPropGroup <methods>; }
-dontwarn com.facebook.react.**
# okhttp
-keepattributes Signature
-keepattributes *Annotation*
-keep class okhttp3.** { *; }
-keep interface okhttp3.** { *; }
-dontwarn okhttp3.**
# okio
-keep class sun.misc.Unsafe { *; }
-dontwarn java.nio.file.*
-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
-dontwarn okio.**

View File

@@ -0,0 +1,58 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.jitsi.meet"
android:versionCode="1"
android:versionName="1.0">
<!-- XXX: ACCESS_NETWORK_STATE is required by WebRTC. -->
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
<uses-feature android:name="android.hardware.camera" />
<uses-feature android:name="android.hardware.camera.autofocus"/>
<uses-sdk
android:minSdkVersion="19"
android:targetSdkVersion="23" />
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:name=".MainApplication"
android:theme="@style/AppTheme">
<activity
android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
android:label="@string/app_name"
android:launchMode="singleTask"
android:name=".MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.DEFAULT" />
<data android:host="beta.hipchat.me" android:scheme="https" />
<data android:host="beta.meet.jit.si" android:scheme="https" />
<data android:host="chaos.hipchat.me" android:scheme="https" />
<data android:host="enso.me" android:scheme="https" />
<data android:host="hipchat.me" android:scheme="https" />
<data android:host="meet.jit.si" android:scheme="https" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.DEFAULT" />
<data android:scheme="org.jitsi.meet" />
</intent-filter>
</activity>
<activity
android:name="com.facebook.react.devsupport.DevSettingsActivity" />
</application>
</manifest>

Binary file not shown.

View File

@@ -0,0 +1,46 @@
package org.jitsi.meet;
import com.facebook.react.ReactActivity;
import com.facebook.react.ReactActivityDelegate;
import com.facebook.react.ReactRootView;
public class MainActivity extends ReactActivity {
/**
* {@inheritDoc}
*
* Overrides {@link ReactActivity#createRootActivityDelegate()} to customize
* the {@link ReactRootView} with a background color that is in accord with
* the JavaScript and iOS parts of the application and causes less perceived
* visual flicker than the default background color.
*/
@Override
protected ReactActivityDelegate createReactActivityDelegate() {
return new ReactActivityDelegate(this, getMainComponentName()) {
/**
* {@inheritDoc}
*
* Overrides {@link ReactActivityDelegate#createRootView()} to
* customize the {@link ReactRootView} with a background color that
* is in accord with the JavaScript and iOS parts of the application
* and causes less perceived visual flicker than the default
* background color.
*/
@Override
protected ReactRootView createRootView() {
ReactRootView rootView = super.createRootView();
rootView.setBackgroundColor(0xFF111111);
return rootView;
}
};
}
/**
* Returns the name of the main component registered from JavaScript.
* This is used to schedule rendering of the component.
*/
@Override
protected String getMainComponentName() {
return "App";
}
}

View File

@@ -0,0 +1,63 @@
package org.jitsi.meet;
import android.app.Application;
import com.facebook.react.ReactApplication;
import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage;
import com.facebook.soloader.SoLoader;
import java.util.Arrays;
import java.util.List;
public class MainApplication extends Application implements ReactApplication {
private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
/**
* {@inheritDoc}
*/
@Override
public boolean getUseDeveloperSupport() {
return BuildConfig.DEBUG;
}
/**
* {@inheritDoc}
*/
@Override
protected List<ReactPackage> getPackages() {
return Arrays.<ReactPackage>asList(
new com.corbt.keepawake.KCKeepAwakePackage(),
new com.facebook.react.shell.MainReactPackage(),
new com.oblador.vectoricons.VectorIconsPackage(),
new com.oney.WebRTCModule.WebRTCModulePackage(),
new com.rnimmersive.RNImmersivePackage(),
new org.jitsi.meet.audiomode.AudioModePackage()
);
}
};
/**
* {@inheritDoc}
*/
@Override
public ReactNativeHost getReactNativeHost() {
return mReactNativeHost;
}
/**
* {@inheritDoc}
*/
@Override
public void onCreate() {
super.onCreate();
SoLoader.init(this, /* native exopackage */ false);
if (!getReactNativeHost()
.getReactInstanceManager()
.getDevSupportManager()
.getDevSupportEnabled()) {
// TODO Auto-generated method stub
}
}
}

View File

@@ -0,0 +1,322 @@
package org.jitsi.meet.audiomode;
import android.annotation.TargetApi;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.media.AudioDeviceInfo;
import android.media.AudioManager;
import android.os.Build;
import android.os.Handler;
import android.os.Looper;
import android.util.Log;
import com.facebook.react.bridge.Promise;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactContextBaseJavaModule;
import com.facebook.react.bridge.ReactMethod;
import java.util.HashMap;
import java.util.Map;
/**
* Module implementing a simple API to select the appropriate audio device for a
* conference call.
*
* Audio calls should use <tt>AudioModeModule.AUDIO_CALL</tt>, which uses the
* builtin earpiece, wired headset or bluetooth headset. The builtin earpiece is
* the default audio device.
*
* Video calls should should use <tt>AudioModeModule.VIDEO_CALL</tt>, which uses
* the builtin speaker, earpiece, wired headset or bluetooth headset. The
* builtin speaker is the default audio device.
*
* Before a call has started and after it has ended the
* <tt>AudioModeModule.DEFAULT</tt> mode should be used.
*/
public class AudioModeModule extends ReactContextBaseJavaModule {
/**
* Constants representing the audio mode.
* - DEFAULT: Used before and after every call. It represents the default
* audio routing scheme.
* - AUDIO_CALL: Used for audio only calls. It will use the earpiece by
* default, unless a wired or Bluetooth headset is connected.
* - VIDEO_CALL: Used for video calls. It will use the speaker by default,
* unless a wired or Bluetooth headset is connected.
*/
private static final int DEFAULT = 0;
private static final int AUDIO_CALL = 1;
private static final int VIDEO_CALL = 2;
/**
*
*/
private static final String ACTION_HEADSET_PLUG
= (Build.VERSION.SDK_INT >= 21)
? AudioManager.ACTION_HEADSET_PLUG
: Intent.ACTION_HEADSET_PLUG;
/**
* React Native module name.
*/
private static final String MODULE_NAME = "AudioMode";
/**
* Tag used when logging messages.
*/
static final String TAG = MODULE_NAME;
/**
* {@link AudioManager} instance used to interact with the Android audio
* subsystem.
*/
private final AudioManager audioManager;
/**
* {@link BluetoothHeadsetMonitor} for detecting Bluetooth device changes in
* old (< M) Android versions.
*/
private BluetoothHeadsetMonitor bluetoothHeadsetMonitor;
/**
* {@link Handler} for running all operations on the main thread.
*/
private final Handler mainThreadHandler
= new Handler(Looper.getMainLooper());
/**
* {@link Runnable} for running update operation on the main thread.
*/
private final Runnable mainThreadRunner
= new Runnable() {
@Override
public void run() {
if (mode != -1) {
updateAudioRoute(mode);
}
}
};
/**
* Audio mode currently in use.
*/
private int mode = -1;
/**
* Initializes a new module instance. There shall be a single instance of
* this module throughout the lifetime of the application.
*
* @param reactContext the {@link ReactApplicationContext} where this module
* is created.
*/
public AudioModeModule(ReactApplicationContext reactContext) {
super(reactContext);
audioManager
= (AudioManager)
reactContext.getSystemService(Context.AUDIO_SERVICE);
// Setup runtime device change detection.
setupAudioRouteChangeDetection();
}
/**
* Gets a mapping with the constants this module is exporting.
*
* @return a {@link Map} mapping the constants to be exported with their
* values.
*/
@Override
public Map<String, Object> getConstants() {
Map<String, Object> constants = new HashMap<>();
constants.put("AUDIO_CALL", AUDIO_CALL);
constants.put("DEFAULT", DEFAULT);
constants.put("VIDEO_CALL", VIDEO_CALL);
return constants;
}
/**
* Gets the name for this module, to be used in the React Native bridge.
*
* @return a string with the module name.
*/
@Override
public String getName() {
return MODULE_NAME;
}
/**
* Helper method to trigger an audio route update when devices change. It
* makes sure the operation is performed on the main thread.
*/
void onAudioDeviceChange() {
mainThreadHandler.post(mainThreadRunner);
}
/**
* Helper method to set the output route to a Bluetooth device.
*
* @param enabled true if Bluetooth should use used, false otherwise.
*/
private void setBluetoothAudioRoute(boolean enabled) {
if (enabled) {
audioManager.startBluetoothSco();
audioManager.setBluetoothScoOn(true);
} else {
audioManager.setBluetoothScoOn(false);
audioManager.stopBluetoothSco();
}
}
/**
* Public method to set the current audio mode.
*
* @param mode the desired audio mode.
* @param promise a {@link Promise} which will be resolved if the audio mode
* could be updated successfully, and it will be rejected otherwise.
*/
@ReactMethod
public void setMode(final int mode, final Promise promise) {
if (mode != DEFAULT && mode != AUDIO_CALL && mode != VIDEO_CALL) {
promise.reject("setMode", "Invalid audio mode " + mode);
return;
}
Runnable r = new Runnable() {
@Override
public void run() {
if (updateAudioRoute(mode)) {
AudioModeModule.this.mode = mode;
promise.resolve(null);
} else {
promise.reject(
"setMode",
"Failed to set the requested audio mode");
}
}
};
mainThreadHandler.post(r);
}
/**
* Setup the audio route change detection mechanism. We use the
* {@link android.media.AudioDeviceCallback} API on Android >= 23 only.
*/
private void setupAudioRouteChangeDetection() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
setupAudioRouteChangeDetectionM();
} else {
setupAudioRouteChangeDetectionPreM();
}
}
/**
* Audio route change detection mechanism for Android API >= 23.
*/
@TargetApi(Build.VERSION_CODES.M)
private void setupAudioRouteChangeDetectionM() {
android.media.AudioDeviceCallback audioDeviceCallback =
new android.media.AudioDeviceCallback() {
@Override
public void onAudioDevicesAdded(
AudioDeviceInfo[] addedDevices) {
Log.d(TAG, "Audio devices added");
onAudioDeviceChange();
}
@Override
public void onAudioDevicesRemoved(
AudioDeviceInfo[] removedDevices) {
Log.d(TAG, "Audio devices removed");
onAudioDeviceChange();
}
};
audioManager.registerAudioDeviceCallback(audioDeviceCallback, null);
}
/**
* Audio route change detection mechanism for Android API < 23.
*/
private void setupAudioRouteChangeDetectionPreM() {
Context context = getReactApplicationContext();
// Detect changes in wired headset connections.
IntentFilter wiredHeadSetFilter = new IntentFilter(ACTION_HEADSET_PLUG);
BroadcastReceiver wiredHeadsetReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
Log.d(TAG, "Wired headset added / removed");
onAudioDeviceChange();
}
};
context.registerReceiver(wiredHeadsetReceiver, wiredHeadSetFilter);
// Detect Bluetooth device changes.
bluetoothHeadsetMonitor = new BluetoothHeadsetMonitor(this, context);
}
/**
* Updates the audio route for the given mode.
*
* @param mode the audio mode to be used when computing the audio route.
* @return true if the audio route was updated successfully, false
* otherwise.
*/
private boolean updateAudioRoute(int mode) {
Log.d(TAG, "Update audio route for mode: " + mode);
if (mode == DEFAULT) {
audioManager.setMode(AudioManager.MODE_NORMAL);
audioManager.abandonAudioFocus(null);
audioManager.setSpeakerphoneOn(false);
audioManager.setMicrophoneMute(true);
setBluetoothAudioRoute(false);
return true;
}
audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
audioManager.setMicrophoneMute(false);
if (audioManager.requestAudioFocus(
null,
AudioManager.STREAM_VOICE_CALL,
AudioManager.AUDIOFOCUS_GAIN)
== AudioManager.AUDIOFOCUS_REQUEST_FAILED) {
Log.d(TAG, "Audio focus request failed");
return false;
}
boolean useSpeaker = (mode == VIDEO_CALL);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
// On Android >= M we use the AudioDeviceCallback API, so turn on
// Bluetooth SCO from the start.
if (audioManager.isBluetoothScoAvailableOffCall()) {
audioManager.startBluetoothSco();
}
} else {
// On older Android versions we must set the Bluetooth route
// manually. Also disable the speaker in that case.
setBluetoothAudioRoute(
bluetoothHeadsetMonitor.isHeadsetAvailable());
if (bluetoothHeadsetMonitor.isHeadsetAvailable()) {
useSpeaker = false;
}
}
// XXX: isWiredHeadsetOn is not deprecated when used just for knowing if
// there is a wired headset connected, regardless of audio being routed
// to it.
audioManager.setSpeakerphoneOn(
useSpeaker
&& !(audioManager.isWiredHeadsetOn()
|| audioManager.isBluetoothScoOn()));
return true;
}
}

View File

@@ -0,0 +1,48 @@
package org.jitsi.meet.audiomode;
import com.facebook.react.ReactPackage;
import com.facebook.react.bridge.JavaScriptModule;
import com.facebook.react.bridge.NativeModule;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.uimanager.ViewManager;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
* Implements {@link ReactPackage} for {@link AudioModeModule}.
*/
public class AudioModePackage implements ReactPackage {
/**
* {@inheritDoc}
*/
@Override
public List<Class<? extends JavaScriptModule>> createJSModules() {
return Collections.emptyList();
}
/**
* {@inheritDoc}
*
* @return List of native modules to be exposed by React Native.
*/
@Override
public List<NativeModule> createNativeModules(
ReactApplicationContext reactContext) {
List<NativeModule> modules = new ArrayList<>();
modules.add(new AudioModeModule(reactContext));
return modules;
}
/**
* {@inheritDoc}
*/
@Override
public List<ViewManager> createViewManagers(
ReactApplicationContext reactContext) {
return Collections.emptyList();
}
}

View File

@@ -0,0 +1,189 @@
package org.jitsi.meet.audiomode;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothHeadset;
import android.bluetooth.BluetoothProfile;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.media.AudioManager;
import android.os.Handler;
import android.os.Looper;
import android.util.Log;
/**
* Helper class to detect and handle Bluetooth device changes. It monitors
* Bluetooth headsets being connected / disconnected and notifies the module
* about device changes when this occurs.
*/
public class BluetoothHeadsetMonitor {
/**
* {@link AudioModeModule} where this monitor reports.
*/
private final AudioModeModule audioModeModule;
/**
* The {@link Context} in which {@link #audioModeModule} executes.
*/
private final Context context;
/**
* Reference to a proxy object which allows us to query connected devices.
*/
private BluetoothHeadset headset;
/**
* Flag indicating if there are any Bluetooth headset devices currently
* available.
*/
private boolean headsetAvailable = false;
/**
* {@link Handler} for running all operations on the main thread.
*/
private final Handler mainThreadHandler
= new Handler(Looper.getMainLooper());
/**
* Helper for running Bluetooth operations on the main thread.
*/
private final Runnable updateDevicesRunnable
= new Runnable() {
@Override
public void run() {
headsetAvailable
= (headset != null)
&& !headset.getConnectedDevices().isEmpty();
audioModeModule.onAudioDeviceChange();
}
};
public BluetoothHeadsetMonitor(
AudioModeModule audioModeModule,
Context context) {
this.audioModeModule = audioModeModule;
this.context = context;
AudioManager audioManager
= (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
if (!audioManager.isBluetoothScoAvailableOffCall()) {
Log.w(AudioModeModule.TAG, "Bluetooth SCO is not available");
return;
}
if (getBluetoothHeadsetProfileProxy()) {
registerBluetoothReceiver();
// Initial detection.
updateDevices();
}
}
private boolean getBluetoothHeadsetProfileProxy() {
BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
if (adapter == null) {
Log.w(AudioModeModule.TAG, "Device doesn't support Bluetooth");
return false;
}
// XXX: The profile listener listens for system services of the given
// type being available to the application. That is, if our Bluetooth
// adapter has the "headset" profile.
BluetoothProfile.ServiceListener listener
= new BluetoothProfile.ServiceListener() {
@Override
public void onServiceConnected(
int profile,
BluetoothProfile proxy) {
if (profile == BluetoothProfile.HEADSET) {
headset = (BluetoothHeadset) proxy;
updateDevices();
}
}
@Override
public void onServiceDisconnected(int profile) {
// The logic is the same as the logic of onServiceConnected.
onServiceConnected(profile, /* proxy */ null);
}
};
return
adapter.getProfileProxy(
context,
listener,
BluetoothProfile.HEADSET);
}
/**
* Returns the current headset availability.
*
* @return true if there is a Bluetooth headset connected, false otherwise.
*/
public boolean isHeadsetAvailable() {
return headsetAvailable;
}
private void onBluetoothReceiverReceive(Context context, Intent intent) {
final String action = intent.getAction();
if (action.equals(BluetoothHeadset.ACTION_CONNECTION_STATE_CHANGED)) {
// XXX: This action will be fired when a Bluetooth headset is
// connected or disconnected to the system. This is not related to
// audio routing.
int state = intent.getIntExtra(BluetoothHeadset.EXTRA_STATE, -99);
switch (state) {
case BluetoothHeadset.STATE_CONNECTED:
case BluetoothHeadset.STATE_DISCONNECTED:
Log.d(
AudioModeModule.TAG,
"BT headset connection state changed: " + state);
updateDevices();
break;
}
} else if (action.equals(AudioManager.ACTION_SCO_AUDIO_STATE_UPDATED)) {
// XXX: This action will be fired when the connection established
// with a Bluetooth headset (called a SCO connection) changes state.
// When the SCO connection is active we route audio to it.
int state
= intent.getIntExtra(AudioManager.EXTRA_SCO_AUDIO_STATE, -99);
switch (state) {
case AudioManager.SCO_AUDIO_STATE_CONNECTED:
case AudioManager.SCO_AUDIO_STATE_DISCONNECTED:
Log.d(
AudioModeModule.TAG,
"BT SCO connection state changed: " + state);
updateDevices();
break;
}
}
}
private void registerBluetoothReceiver() {
BroadcastReceiver receiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
onBluetoothReceiverReceive(context, intent);
}
};
IntentFilter filter = new IntentFilter();
filter.addAction(AudioManager.ACTION_SCO_AUDIO_STATE_UPDATED);
filter.addAction(BluetoothHeadset.ACTION_CONNECTION_STATE_CHANGED);
context.registerReceiver(receiver, filter);
}
/**
* Detects if there are new devices connected / disconnected and fires the
* {@link AudioModeModule#onAudioDeviceChange()} callback.
*/
private void updateDevices() {
mainThreadHandler.post(updateDevicesRunnable);
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

View File

@@ -0,0 +1,3 @@
<resources>
<string name="app_name">Jitsi Meet</string>
</resources>

View File

@@ -0,0 +1,9 @@
<resources>
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
<!-- Customize your theme here. -->
<item name="android:windowTranslucentStatus">true</item>
</style>
</resources>

24
android/build.gradle Normal file
View File

@@ -0,0 +1,24 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.3.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}
allprojects {
repositories {
mavenLocal()
jcenter()
maven {
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
url "$rootDir/../node_modules/react-native/android"
}
}
}

21
android/gradle.properties Normal file
View File

@@ -0,0 +1,21 @@
# Project-wide Gradle settings.
# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx10248m -XX:MaxPermSize=256m
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
android.useDeprecatedNdk=true
version=1

Binary file not shown.

View File

@@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip

164
android/gradlew vendored Executable file
View File

@@ -0,0 +1,164 @@
#!/usr/bin/env bash
##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
warn ( ) {
echo "$*"
}
die ( ) {
echo
echo "$*"
echo
exit 1
}
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
esac
# For Cygwin, ensure paths are in UNIX format before anything is touched.
if $cygwin ; then
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
fi
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >&-
APP_HOME="`pwd -P`"
cd "$SAVED" >&-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin, switch paths to Windows format before running java
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
function splitJvmOpts() {
JVM_OPTS=("$@")
}
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

90
android/gradlew.bat vendored Normal file
View File

@@ -0,0 +1,90 @@
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto init
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:init
@rem Get command-line arguments, handling Windowz variants
if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_args
:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2
:win9xME_args_slurp
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
goto execute
:4NT_args
@rem Get arguments from the 4NT Shell from JP Software
set CMD_LINE_ARGS=%$
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega

8
android/keystores/BUCK Normal file
View File

@@ -0,0 +1,8 @@
keystore(
name = 'debug',
store = 'debug.keystore',
properties = 'debug.keystore.properties',
visibility = [
'PUBLIC',
],
)

View File

@@ -0,0 +1,4 @@
key.store=debug.keystore
key.alias=androiddebugkey
key.store.password=android
key.alias.password=android

11
android/settings.gradle Normal file
View File

@@ -0,0 +1,11 @@
rootProject.name = 'jitsi-meet-react'
include ':app'
include ':react-native-immersive'
project(':react-native-immersive').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-immersive/android')
include ':react-native-keep-awake'
project(':react-native-keep-awake').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-keep-awake/android')
include ':react-native-vector-icons'
project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
include ':react-native-webrtc'
project(':react-native-webrtc').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webrtc/android')

162
app.js
View File

@@ -1,101 +1,75 @@
/* jshint -W117 */
/* application specific logic */
require("jquery");
require("jquery-ui");
require("strophe");
require("strophe-disco");
require("strophe-caps");
require("tooltip");
require("popover");
window.toastr = require("toastr");
require("jQuery-Impromptu");
require("autosize");
import "babel-polyfill";
import "jquery";
import "jquery-contextmenu";
import "jquery-ui";
import "strophe";
import "strophe-disco";
import "jQuery-Impromptu";
import "autosize";
var APP =
{
init: function () {
this.UI = require("./modules/UI/UI");
this.API = require("./modules/API/API");
this.connectionquality =
require("./modules/connectionquality/connectionquality");
this.statistics = require("./modules/statistics/statistics");
this.RTC = require("./modules/RTC/RTC");
this.desktopsharing =
require("./modules/desktopsharing/desktopsharing");
this.xmpp = require("./modules/xmpp/xmpp");
this.keyboardshortcut =
require("./modules/keyboardshortcut/keyboardshortcut");
this.translation = require("./modules/translation/translation");
this.settings = require("./modules/settings/Settings");
//this.DTMF = require("./modules/DTMF/DTMF");
this.members = require("./modules/members/MemberList");
this.configFetch = require("./modules/config/HttpConfigFetch");
}
import 'aui';
import 'aui-experimental';
import 'aui-css';
import 'aui-experimental-css';
window.toastr = require("toastr");
import UI from "./modules/UI/UI";
import settings from "./modules/settings/Settings";
import conference from './conference';
import API from './modules/API/API';
import translation from "./modules/translation/translation";
import remoteControl from "./modules/remotecontrol/RemoteControl";
const APP = {
// Used by do_external_connect.js if we receive the attach data after
// connect was already executed. status property can be "initialized",
// "ready" or "connecting". We are interested in "ready" status only which
// means that connect was executed but we have to wait for the attach data.
// In status "ready" handler property will be set to a function that will
// finish the connect process when the attach data or error is received.
connect: {
status: "initialized",
handler: null
},
// Used for automated performance tests
connectionTimes: {
"index.loaded": window.indexLoadedTime
},
UI,
settings,
conference,
translation,
/**
* The log collector which captures JS console logs for this app.
* @type {LogCollector}
*/
logCollector: null,
/**
* Indicates if the log collector has been started (it will not be started
* if the welcome page is displayed).
*/
logCollectorStarted : false,
/**
* After the APP has been initialized provides utility methods for dealing
* with the conference room URL(address).
* @type ConferenceUrl
*/
ConferenceUrl : null,
connection: null,
API,
remoteControl
};
function init() {
APP.desktopsharing.init();
APP.RTC.start();
APP.xmpp.start();
APP.statistics.start();
APP.connectionquality.init();
APP.keyboardshortcut.init();
APP.members.start();
}
/**
* If we have HTTP endpoint for getting confgi.json configured we're going to
* read it and override properties from config.js and interfaceConfig.js.
* If there is no endpoint we'll just continue with initialization.
* Keep in mind that if the endpoint has been configured and we fail to obtain
* the config for any reason then the conference won't start and error message
* will be displayed to the user.
*/
function obtainConfigAndInit() {
if (config.configLocation) {
APP.configFetch.obtainConfig(
config.configLocation, APP.UI.getRoomNode(),
// Get config result callback
function(success, error) {
if (success) {
console.log("(TIME) configuration fetched:\t",
window.performance.now());
init();
} else {
// Show obtain config error,
// pass the error object for report
APP.UI.messageHandler.openReportDialog(
null, "dialog.connectError", error);
}
});
} else {
init();
}
}
$(document).ready(function () {
console.log("(TIME) document ready:\t", window.performance.now());
var URLProcessor = require("./modules/config/URLProcessor");
URLProcessor.setConfigParametersFromUrl();
APP.init();
APP.translation.init();
if(APP.API.isEnabled())
APP.API.init();
APP.UI.start(obtainConfigAndInit);
});
$(window).bind('beforeunload', function () {
if(APP.API.isEnabled())
APP.API.dispose();
});
// TODO The execution of the mobile app starts from react/index.native.js.
// Similarly, the execution of the Web app should start from react/index.web.js
// for the sake of consistency and ease of understanding. Temporarily though
// because we are at the beginning of introducing React into the Web app, allow
// the execution of the Web app to start from app.js in order to reduce the
// complexity of the beginning step.
require('./react');
module.exports = APP;

9
authError.html Normal file
View File

@@ -0,0 +1,9 @@
<html>
<head>
<link rel="stylesheet" href="css/all.css"/>
<!--#include virtual="title.html" -->
</head>
<body>
<div class="redirectPageMessage">Sorry! You are not allowed to be here :(</div>
</body>
</html>

22
close.html Normal file
View File

@@ -0,0 +1,22 @@
<html>
<head>
<link rel="stylesheet" href="css/all.css"/>
<!--#include virtual="title.html" -->
<script><!--#include virtual="/interface_config.js" --></script>
<script src="close.js"></script>
</head>
<body>
<div class="redirectPageMessage">
<div class="thanks-msg">
<p>Thank you for your feedback!</p>
</div>
<div class="hint-msg">
<p>
<span id="hintQuestion">Did you know?</span>
<span class="hint-msg__holder" id="hintMessage"></span>
</p>
<div class="happy-software"></div>
</div>
</div>
</body>
</html>

59
close.js Normal file
View File

@@ -0,0 +1,59 @@
/* global interfaceConfig */
//list of tips
var hints = [
"You can pin participants by clicking on their thumbnails.",// jshint ignore:line
"You can tell others you have something to say by using the \"Raise Hand\" feature",// jshint ignore:line
"You can learn about key shortcuts by pressing Shift+?",// jshint ignore:line
"You can learn more about the state of everyone's connection by hovering on the bars in their thumbnail",// jshint ignore:line
"You can hide all thumbnails by using the button in the bottom right corner"// jshint ignore:line
];
/**
* Get a random hint meessage from hint array.
*
* @return {string} the hint message.
*/
function getHint(){
var l = hints.length - 1;
var n = Math.round(Math.random() * l);
return hints[n];
}
/**
* Inserts text message
* into DOM element
*
* @param id {string} element identificator
* @param msg {string} text message
*/
// eslint-disable-next-line no-unused-vars
function insertTextMsg(id, msg){
var el = document.getElementById(id);
if (el)
el.innerHTML = msg;
}
/**
* Sets the hint and thanks messages. Will be executed on load event.
*/
function onLoad() {
//Works only for close2.html because close.html doesn't have this element.
insertTextMsg('thanksMessage',
'Thank you for using ' + interfaceConfig.APP_NAME);
// If there is a setting show a special message only for the guests
if (interfaceConfig.CLOSE_PAGE_GUEST_HINT) {
if ( window.sessionStorage.getItem('guest') === 'true' ) {
var element = document.getElementById('hintQuestion');
element.classList.add('hide');
insertTextMsg('hintMessage', interfaceConfig.CLOSE_PAGE_GUEST_HINT);
return;
}
}
insertTextMsg('hintMessage', getHint());
}
window.onload = onLoad;

22
close2.html Normal file
View File

@@ -0,0 +1,22 @@
<html>
<head>
<link rel="stylesheet" href="css/all.css"/>
<!--#include virtual="title.html" -->
<script><!--#include virtual="/interface_config.js" --></script>
<script src="close.js"></script>
</head>
<body>
<div class="redirectPageMessage">
<div class="thanks-msg">
<p id="thanksMessage"></p>
</div>
<div class="hint-msg">
<p>
<span id="hintQuestion">Did you know?</span>
<span class="hint-msg__holder" id="hintMessage"></span>
</p>
<div class="happy-software"></div>
</div>
</div>
</body>
</html>

1900
conference.js Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -1,14 +1,15 @@
/* jshint -W101 */
var config = {
/* jshint maxlen:false */
var config = { // eslint-disable-line no-unused-vars
// configLocation: './config.json', // see ./modules/HttpConfigFetch.js
hosts: {
domain: 'jitsi-meet.example.com',
//anonymousdomain: 'guest.example.com',
//authdomain: 'jitsi-meet.example.com', // defaults to <domain>
muc: 'conference.jitsi-meet.example.com', // FIXME: use XEP-0030
bridge: 'jitsi-videobridge.jitsi-meet.example.com', // FIXME: use XEP-0030
//jirecon: 'jirecon.jitsi-meet.example.com',
//call_control: 'callcontrol.jitsi-meet.example.com',
//focus: 'focus.jitsi-meet.example.com' - defaults to 'focus.jitsi-meet.example.com'
//focus: 'focus.jitsi-meet.example.com', // defaults to 'focus.jitsi-meet.example.com'
},
// getroomnode: function (path) { return 'someprefixpossiblybasedonpath'; },
// useStunTurn: true, // use XEP-0215 to fetch STUN and TURN server
@@ -19,13 +20,13 @@ var config = {
//focusUserJid: 'focus@auth.jitsi-meet.example.com', // The real JID of focus participant - can be overridden here
//defaultSipNumber: '', // Default SIP number
// Desktop sharing method. Can be set to 'ext', 'webrtc' or false to disable.
desktopSharingChromeMethod: 'ext',
// The ID of the jidesha extension for Chrome.
desktopSharingChromeExtId: 'diibjkoicjeejcmhdnailmkgecihlobk',
desktopSharingChromeExtId: null,
// Whether desktop sharing should be disabled on Chrome.
desktopSharingChromeDisabled: true,
// The media sources to use when using screen sharing with the Chrome
// extension.
desktopSharingChromeSources: ['screen', 'window'],
desktopSharingChromeSources: ['screen', 'window', 'tab'],
// Required version of Chrome extension
desktopSharingChromeMinExtVersion: '0.1',
@@ -53,19 +54,31 @@ var config = {
disableAudioLevels: false,
channelLastN: -1, // The default value of the channel attribute last-n.
adaptiveLastN: false,
adaptiveSimulcast: false,
//disableAdaptiveSimulcast: false,
enableRecording: false,
enableWelcomePage: true,
enableSimulcast: false, // blocks FF support
//enableClosePage: false, // enabling the close page will ignore the welcome
// page redirection when call is hangup
disableSimulcast: false,
logStats: false, // Enable logging of PeerConnection stats via the focus
// requireDisplayName: true,//Forces the participants that doesn't have display name to enter it when they enter the room.
// startAudioMuted: 10, //every participant after the Nth will start audio muted
// startVideoMuted: 10, //every participant after the Nth will start video muted
// requireDisplayName: true, // Forces the participants that doesn't have display name to enter it when they enter the room.
// startAudioMuted: 10, // every participant after the Nth will start audio muted
// startVideoMuted: 10, // every participant after the Nth will start video muted
// defaultLanguage: "en",
// To enable sending statistics to callstats.io you should provide Applicaiton ID and Secret.
// callStatsID: "",//Application ID for callstats.io API
// callStatsSecret: ""//Secret for callstats.io API
// callStatsID: "", // Application ID for callstats.io API
// callStatsSecret: "", // Secret for callstats.io API
/*noticeMessage: 'Service update is scheduled for 16th March 2015. ' +
'During that time service will not be available. ' +
'Apologise for inconvenience.'*/
'Apologise for inconvenience.',*/
disableThirdPartyRequests: false,
minHDHeight: 540,
// If true - all users without token will be considered guests and all users
// with token will be considered non-guests. Only guests will be allowed to
// edit their profile.
enableUserRolesBasedOnToken: false,
// Suspending video might cause problems with audio playback. Disabling until these are fixed.
disableSuspendVideo: true,
// disables or enables RTX (RFC 4588).
disableRtx: true
};

141
connection.js Normal file
View File

@@ -0,0 +1,141 @@
/* global APP, JitsiMeetJS, config */
const logger = require("jitsi-meet-logger").getLogger(__filename);
import AuthHandler from './modules/UI/authentication/AuthHandler';
import jitsiLocalStorage from './modules/util/JitsiLocalStorage';
const ConnectionEvents = JitsiMeetJS.events.connection;
const ConnectionErrors = JitsiMeetJS.errors.connection;
/**
* Checks if we have data to use attach instead of connect. If we have the data
* executes attach otherwise check if we have to wait for the data. If we have
* to wait for the attach data we are setting handler to APP.connect.handler
* which is going to be called when the attach data is received otherwise
* executes connect.
*
* @param {string} [id] user id
* @param {string} [password] password
* @param {string} [roomName] the name of the conference.
*/
function checkForAttachParametersAndConnect(id, password, connection) {
if(window.XMPPAttachInfo){
APP.connect.status = "connecting";
// When connection optimization is not deployed or enabled the default
// value will be window.XMPPAttachInfo.status = "error"
// If the connection optimization is deployed and enabled and there is
// a failure the value will be window.XMPPAttachInfo.status = "error"
if(window.XMPPAttachInfo.status === "error") {
connection.connect({id, password});
return;
}
var attachOptions = window.XMPPAttachInfo.data;
if(attachOptions) {
connection.attach(attachOptions);
delete window.XMPPAttachInfo.data;
} else {
connection.connect({id, password});
}
} else {
APP.connect.status = "ready";
APP.connect.handler = checkForAttachParametersAndConnect.bind(null,
id, password, connection);
}
}
/**
* Try to open connection using provided credentials.
* @param {string} [id]
* @param {string} [password]
* @param {string} [roomName]
* @returns {Promise<JitsiConnection>} connection if
* everything is ok, else error.
*/
function connect(id, password, roomName) {
let connectionConfig = Object.assign({}, config);
connectionConfig.bosh += '?room=' + roomName;
let connection
= new JitsiMeetJS.JitsiConnection(null, config.token, connectionConfig);
return new Promise(function (resolve, reject) {
connection.addEventListener(
ConnectionEvents.CONNECTION_ESTABLISHED, handleConnectionEstablished
);
connection.addEventListener(
ConnectionEvents.CONNECTION_FAILED, handleConnectionFailed
);
function unsubscribe() {
connection.removeEventListener(
ConnectionEvents.CONNECTION_ESTABLISHED,
handleConnectionEstablished
);
connection.removeEventListener(
ConnectionEvents.CONNECTION_FAILED,
handleConnectionFailed
);
}
function handleConnectionEstablished() {
unsubscribe();
resolve(connection);
}
function handleConnectionFailed(err) {
unsubscribe();
logger.error("CONNECTION FAILED:", err);
reject(err);
}
checkForAttachParametersAndConnect(id, password, connection);
});
}
/**
* Open JitsiConnection using provided credentials.
* If retry option is true it will show auth dialog on PASSWORD_REQUIRED error.
*
* @param {object} options
* @param {string} [options.id]
* @param {string} [options.password]
* @param {string} [options.roomName]
* @param {boolean} [retry] if we should show auth dialog
* on PASSWORD_REQUIRED error.
*
* @returns {Promise<JitsiConnection>}
*/
export function openConnection({id, password, retry, roomName}) {
let usernameOverride
= jitsiLocalStorage.getItem("xmpp_username_override");
let passwordOverride
= jitsiLocalStorage.getItem("xmpp_password_override");
if (usernameOverride && usernameOverride.length > 0) {
id = usernameOverride;
}
if (passwordOverride && passwordOverride.length > 0) {
password = passwordOverride;
}
return connect(id, password, roomName).catch(function (err) {
if (!retry) {
throw err;
}
if (err === ConnectionErrors.PASSWORD_REQUIRED) {
// do not retry if token is not valid
if (config.token) {
throw err;
} else {
return AuthHandler.requestAuth(roomName, connect);
}
} else {
throw err;
}
});
}

View File

@@ -0,0 +1,75 @@
/* global config, getRoomName, getConfigParamsFromUrl */
/* global createConnectionExternally */
/**
* Implements extrnal connect using createConnectionExtenally function defined
* in external_connect.js for Jitsi Meet. Parses the room name and token from
* the url and executes createConnectionExtenally.
*
* NOTE: If you are using lib-jitsi-meet without Jitsi Meet you should use this
* file as reference only because the implementation is Jitsi Meet specific.
*
* NOTE: For optimal results this file should be included right after
* exrnal_connect.js.
*/
/**
* Executes createConnectionExternally function.
*/
(function () {
var hashParams = getConfigParamsFromUrl("hash", true);
var searchParams = getConfigParamsFromUrl("search", true);
//Url params have higher proirity than config params
var url = config.externalConnectUrl;
if(hashParams.hasOwnProperty('config.externalConnectUrl'))
url = hashParams["config.externalConnectUrl"];
/**
* Check if connect from connection.js was executed and executes the handler
* that is going to finish the connect work.
*/
function checkForConnectHandlerAndConnect() {
if(window.APP && window.APP.connect.status === "ready") {
window.APP.connect.handler();
}
}
function error_callback(error){
if(error) //error=undefined if external connect is disabled.
console.warn(error);
// Sets that global variable to be used later by connect method in
// connection.js
window.XMPPAttachInfo = {
status: "error"
};
checkForConnectHandlerAndConnect();
}
if(!url || !window.createConnectionExternally) {
error_callback();
return;
}
var room_name = getRoomName();
if(!room_name) {
error_callback();
return;
}
url += "?room=" + room_name;
var token = hashParams["config.token"] || config.token ||
searchParams.jwt;
if(token)
url += "&token=" + token;
createConnectionExternally(url, function(connectionInfo) {
// Sets that global variable to be used later by connect method in
// connection.js
window.XMPPAttachInfo = {
status: "success",
data: connectionInfo
};
checkForConnectHandlerAndConnect();
}, error_callback);
})();

14
css/404.scss Normal file
View File

@@ -0,0 +1,14 @@
.error_page {
width: 60%;
margin: 20% auto;
text-align: center;
h2 {
font-size: 36px;
}
&__message {
font-size: 24px;
margin-top: 20px;
}
}

83
css/_animations.scss Normal file
View File

@@ -0,0 +1,83 @@
/**
* Project animations
**/
/**
* Slide in animation for extended toolbar.
*/
@include keyframes(slideInX) {
0% { transform: translateX(-100%); }
100% { transform: translateX(0%); }
}
@include keyframes(slideOutX) {
0% { transform: translateX(0%); }
100% { transform: translateX(-100%); }
}
@include keyframes(slideInExtX) {
0% { transform: translateX(-500%); }
100% { transform: translateX(0%); }
}
@include keyframes(slideOutExtX) {
0% { transform: translateX(0%); }
100% { transform: translateX(-500%); }
}
/**
* Slide in / out animation for main toolbar.
*/
@include keyframes(slideInY) {
100% { transform: translateY(0%); }
}
@include keyframes(slideOutY) {
0% { transform: translateY(0%); }
100% { transform: translateY(-100%); }
}
/**
* Slide in animation for extended toolbar (inner) panel.
*/
// FIX: Can't use percentage because of breaking animation when width is changed
// (100% of 0 is also zero) Extracted this to config variable.
@include keyframes(slideInExt) {
from { left: -$sidebarWidth; }
to { left: 0; }
}
@include keyframes(slideOutExt) {
from { left: 0; }
to { left: -$sidebarWidth; }
}
/**
* Slide in animation for extended toolbar container
**/
@include keyframes(slideOutExtContainer) {
from { width: $sidebarWidth; }
to { width: 0; }
}
@include keyframes(slideInExtContainer) {
from { width: 0; }
to { width: $sidebarWidth; }
}
/**
* Fade in / out animations
**/
@include keyframes(fadeIn) {
from { opacity: 0; }
to { opacity: 1; }
}
@include keyframes(fadeOut) {
from { opacity: 1; }
to { opacity: 0; }
}

142
css/_base.scss Normal file
View File

@@ -0,0 +1,142 @@
* {
-webkit-user-select: none;
user-select: none;
}
html, body{
margin:0px;
height:100%;
color: $defaultColor;
font-size: 12px;
font-weight: 400;
background: #000000;
overflow: hidden;
}
p {
margin: 0;
}
html, body, input, textarea, keygen, select, button {
font-family: $baseFontFamily !important;
}
#nowebrtc {
display:none;
}
.no-fa-video-camera, .fa-microphone-slash {
color: #636363;
}
button, input, select, textarea {
margin: 0;
vertical-align: baseline;
color: $inputColor;
font-size: 1em;
}
button, select, input[type="button"],
input[type="reset"], input[type="submit"] {
height: 32px;
line-height: 32px;
padding-left: 4px;
padding-right: 4px;
cursor: pointer;
}
textarea {
overflow: hidden;
word-wrap: break-word;
resize: none;
line-height: 1.5em;
}
input[type='text'], input[type='password'], textarea {
outline: none; /* removes the default outline */
resize: none; /* prevents the user-resizing, adjust to taste */
}
button {
color: #FFF;
background-color: $buttonBackground;
border-radius: $borderRadius;
&.no-icon {
padding: 0 1em;
}
}
button,
form {
display: block;
}
.watermark {
display: block;
position: absolute;
top: 15;
width: 186px;
height: 74px;
background-size: contain;
background-repeat: no-repeat;
z-index: 2;
}
.leftwatermark {
left: $defaultToolbarSize;
margin-left: 10px;
background-image: url($defaultWatermarkLink);
background-position: center left;
}
.rightwatermark {
right: 15;
background-position: center right;
}
.poweredby {
position: absolute;
left: 25;
bottom: 7;
font-size: 11pt;
color: rgba(255,255,255,.50);
text-decoration: none;
z-index: 100;
}
.connected {
color: #21B9FC;
font-size: 12px;
}
.lastN, .disconnected {
color: #a3a3a3;
font-size: 12px;
}
/**
* Tooltips
**/
.tipsy {
z-index: $tooltipsZ;
&-inner {
background-color: $tooltipBg;
}
&-arrow {
border-color: $tooltipBg;
}
}
/**
* Dialogs fade
*/
.aui-blanket {
visibility: visible;
}
#inviteLinkRef {
-webkit-user-select: text;
user-select: text;
}

View File

@@ -1,9 +1,4 @@
#chatspace {
background-color: black;
border-left: 1px solid #424242;
}
#chatspace * {
#chat_container * {
-webkit-user-select: text;
user-select: text;
}
@@ -18,9 +13,28 @@
font-size: 10pt;
width: 100%;
height: 90%;
overflow-y: scroll;
overflow-x: hidden;
overflow: auto;
word-wrap: break-word;
a:link {
color: rgb(184, 184, 184);
}
a:visited {
color: white;
}
a:hover {
color: rgb(213, 213, 213);
}
a:active {
color: black;
}
}
#chat_container.is-conversation-mode #chatconversation {
visibility: visible;
}
.localuser {
@@ -61,6 +75,10 @@
box-shadow: none;
}
#chat_container.is-conversation-mode #usermsg {
visibility: visible;
}
#nickname {
position: absolute;
text-align: center;
@@ -72,6 +90,10 @@
width: 95%;
}
#chat_container.is-conversation-mode #nickname {
visibility: hidden;
}
#nickinput {
margin-top: 20px;
font-size: 14px;
@@ -81,33 +103,23 @@
color: #a7a7a7;
}
#unreadMessages {
font-size: 8px;
position: absolute;
left: 46%;
top: 27%
}
#bottomUnreadMessages {
top: 5px;
left: 10px;
position: absolute;
font-size: 8px;
}
#chatspace .username {
#chat_container .username {
float: left;
padding-left: 5px;
font-weight: bold;
white-space: nowrap;
text-overflow: ellipsis;
width: 95%;
overflow: hidden;
}
#chatspace .timestamp {
#chat_container .timestamp {
float: right;
padding-right: 5px;
font-size: 11px;
}
#chatspace .usermessage {
#chat_container .usermessage {
padding-top: 20px;
padding-left: 5px;
}
@@ -121,7 +133,7 @@
.chatmessage {
background: #3a3a3a;
width: 93%;
margin-left: 5%;
margin-left: 9px;
margin-right: auto;
border-radius: 5px;
border-top-left-radius: 0px;
@@ -168,6 +180,10 @@
visibility: hidden;
}
#chat_container.is-conversation-mode #smileysarea {
visibility: visible;
}
#smileysContainer {
display: none;
position: absolute;
@@ -221,19 +237,3 @@
#usermsg::-webkit-scrollbar-track-piece {
background: #3a3a3a;
}
a:link {
color: rgb(184, 184, 184);
}
a:visited {
color: white;
}
a:hover {
color: rgb(213, 213, 213);
}
a:active {
color: black;
}

43
css/_connection-info.scss Normal file
View File

@@ -0,0 +1,43 @@
%connection-info {
text-align: left;
font-size: 12px;
font-weight: 400;
color: $popoverFontColor;
td {
padding: 2px 0;
}
}
.connection-info
{
float: left;
padding: 5px;
padding-left: 0;
@extend %connection-info;
> table {
white-space: nowrap;
@extend %connection-info;
}
td:nth-child(n-1) {
padding-left: 5px;
}
&__icon {
margin-right: 2px;
}
&__download
{
@extend .connection-info__icon;
color: $downloadConnectionIconColor;
}
&__upload
{
@extend .connection-info__icon;
color: $uploadConnectionIconColor;
}
}

61
css/_contact_list.scss Normal file
View File

@@ -0,0 +1,61 @@
#contacts_container {
cursor: default;
> ul#contacts {
font-size: 12px;
bottom: 0px;
margin: 0;
margin-top: 12px;
padding: 0px;
width: 100%;
}
.clickable {
cursor: pointer;
}
.icon-security,
.icon-security-locked {
font-size: 16px;
}
}
#contacts {
>li {
display: block;
list-style-type: none;
text-align: left;
white-space: nowrap;
color: $baseLight;
font-size: 16px;
padding: 0 10%;
height: 27px;
&:hover,
&:active {
background: $toolbarSelectBackground;
}
> p {
display: inline-block;
vertical-align: middle;
margin: 0px;
width: 100%;
line-height: 1.5em;
text-overflow: ellipsis;
overflow: hidden;
}
}
}
.avatar {
padding: 0px;
margin-right: 10px;
vertical-align: middle;
font-size: 22pt;
border-radius: 20px;
max-height: 30px;
max-width: 30px;
}

View File

@@ -0,0 +1,31 @@
.settingsContent {
display: flex;
display: -webkit-flex;
#localVideoPreview {
width: 50%;
align-self: baseline;
}
.deviceSelection {
display: flex;
display: -webkit-flex;
-webkit-flex: 1;
flex: 1;
flex-direction: column;
flex-wrap: nowrap;
justify-content: flex-start;
align-items: left;
margin-left: 10px;
.device {
display: flex;
margin-bottom: 5px;
select {
flex: 1;
margin_right: 5px;
}
}
}
}

124
css/_filmstrip.scss Normal file
View File

@@ -0,0 +1,124 @@
%align-right {
@include flex();
flex-direction: row-reverse;
flex-wrap: nowrap;
justify-content: flex-start;
}
.filmstrip {
position: absolute;
bottom: 0;
right: 0;
padding: 10px 5px;
@extend %align-right;
&__toolbar {
@include flex();
flex-direction: column-reverse;
flex-wrap: nowrap;
position: relative;
z-index: 1; // Set z-index to make element visible
width: $hideFilmstripButtonWidth;
button {
font-size: 14px;
line-height: 1.2;
text-align: center;
background: transparent;
opacity: 0.7;
height: auto;
width: 100%;
padding: 0;
margin: 0;
border: none;
outline: none;
-webkit-appearance: none;
&:hover {
opacity: 1;
}
i {
cursor: pointer;
}
}
}
&__videos {
@extend %align-right;
position:relative;
height:196px;
padding: 0;
/*The filmstrip should not be covered by the left toolbar*/
padding-left: $defaultToolbarSize + 5;
bottom: 0;
width:auto;
border: $thumbnailsBorder solid transparent;
z-index: 5;
transition: bottom 2s;
overflow: visible !important;
/*!!!Removes the gap between the local video container and the remote
videos.*/
font-size: 0pt;
&.hidden {
bottom: -196px;
}
.videocontainer {
display: none;
position: relative;
background-size: contain;
border: $thumbnailVideoBorder solid transparent;
border-radius: $borderRadius;
margin: 0 $thumbnailVideoMargin;
&.videoContainerFocused, &:hover {
cursor: hand;
}
/**
* Focused video thumbnail.
*/
&.videoContainerFocused {
transition-duration: 0.5s;
-webkit-transition-duration: 0.5s;
-webkit-animation-name: greyPulse;
-webkit-animation-duration: 2s;
-webkit-animation-iteration-count: 1;
border: $thumbnailVideoBorder solid $videoThumbnailSelected !important;
box-shadow: inset 0 0 3px $videoThumbnailSelected,
0 0 3px $videoThumbnailSelected !important;
}
.remotevideomenu > .icon-menu {
display: none;
}
/**
* Hovered video thumbnail.
*/
&:hover {
cursor: hand;
border: $thumbnailVideoBorder solid $videoThumbnailHovered;
box-shadow: inset 0 0 3px $videoThumbnailHovered,
0 0 3px $videoThumbnailHovered;
.remotevideomenu > .icon-menu {
display: inline-block;
}
}
/* With TemasysWebRTC plugin <object/> element is used
instead of <video/> */
& > video,
& > object {
cursor: hand;
border-radius: $borderRadius;
object-fit: cover;
overflow: hidden;
}
}
}
}

View File

@@ -255,9 +255,6 @@
.fa-road:before {
content: "\f018";
}
.fa-download:before {
content: "\f019";
}
.fa-arrow-circle-o-down:before {
content: "\f01a";
}
@@ -842,9 +839,6 @@
.fa-exchange:before {
content: "\f0ec";
}
.fa-cloud-download:before {
content: "\f0ed";
}
.fa-cloud-upload:before {
content: "\f0ee";
}

View File

@@ -16,111 +16,126 @@
font-weight: normal;
font-variant: normal;
text-transform: none;
line-height: 0.75em;
line-height: 1.22em;
font-size: 1.22em;
cursor: default;
/* Better Font Rendering =========== */
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.icon-contactList:before {
content: "\e615";
.icon-mic-camera-combined:before {
content: "\e903";
}
.icon-feedback:before {
content: "\e91d";
}
.icon-toggle-filmstrip:before {
content: "\e91c";
}
.icon-avatar:before {
content: "\e616";
content: "\e901";
}
.icon-callRetro:before {
content: "\e611";
}
.icon-callModern:before {
content: "\e612";
}
.icon-recDisable:before {
content: "\e613";
}
.icon-recEnable:before {
content: "\e614";
}
.icon-authenticate:before {
content: "\e1ae";
}
.icon-kick1:before {
content: "\e60f";
}
.icon-kick:before {
content: "\e610";
}
.icon-share-desktop:before {
content: "\e602";
}
.icon-chat-simple:before {
content: "\e606";
}
.icon-full-screen:before {
content: "\e60d";
}
.icon-exit-full-screen:before {
content: "\e60e";
}
.icon-prezi:before {
content: "\e60c";
}
.icon-link:before {
content: "\e600";
.icon-hangup:before {
content: "\e905";
}
.icon-chat:before {
content: "\e601";
content: "\e906";
}
.icon-presentation:before {
content: "\e603";
.icon-download:before {
content: "\e902";
}
.icon-security:before {
content: "\e604";
.icon-edit:before {
content: "\e907";
}
.icon-share-doc:before {
content: "\e605";
content: "\e908";
}
.icon-telephone:before {
content: "\e611";
content: "\e909";
}
.icon-kick:before {
content: "\e904";
}
.icon-menu-up:before {
content: "\e91f";
}
.icon-menu-down:before {
content: "\e920";
}
.icon-full-screen:before {
content: "\e90b";
}
.icon-exit-full-screen:before {
content: "\e90c";
}
.icon-star-full:before {
content: "\e90a";
}
.icon-security:before {
content: "\e90d";
}
.icon-security-locked:before {
content: "\e607";
content: "\e90e";
}
.icon-camera:before {
content: "\e608";
}
.icon-camera-disabled:before {
content: "\e609";
}
.icon-mic-disabled:before {
content: "\e60a";
.icon-reload:before {
content: "\e90f";
}
.icon-microphone:before {
content: "\e60b";
content: "\e910";
}
.icon-hangup:before {
content: "\e617";
.icon-mic-empty:before {
content: "\e911";
}
.icon-reload:before {
content: "\e618";
.icon-mic-disabled:before {
content: "\e912";
}
.icon-filmstrip:before {
content: "\e619";
.icon-raised-hand:before {
content: "\e91e";
}
.icon-connection:before {
line-height: normal;
content: "\e61a";
.icon-contactList:before {
content: "\e91b";
}
.icon-link:before {
content: "\e913";
}
.icon-shared-video:before {
content: "\e914";
}
.icon-settings:before {
content: "\e61b";
content: "\e915";
}
.icon-dialPad:before {
content: "\e61c";
.icon-star:before {
content: "\e916";
}
.icon-switch-camera:before {
content: "\e921";
}
.icon-share-desktop:before {
content: "\e917";
}
.icon-camera:before {
content: "\e918";
}
.icon-camera-disabled:before {
content: "\e919";
}
.icon-volume:before {
content: "\e91a";
}
.icon-connection-lost:before {
content: "\e900";
}
.icon-connection:before {
content: "\e61a";
}
.icon-recDisable:before {
content: "\e613";
}
.icon-recEnable:before {
content: "\e614";
}
.icon-presentation:before {
content: "\e603";
}

6
css/_functions.scss Normal file
View File

@@ -0,0 +1,6 @@
/* Functions */
/* Pixels to Ems function */
@function em($value, $base: 16) {
@return #{$value / $base}em;
}

33
css/_inlay.scss Normal file
View File

@@ -0,0 +1,33 @@
.inlay {
margin-top: 14%;
@include border-radius(4px);
padding: 40px 38px 44px;
color: #fff;
background: $inlayColorBg;
text-align: center;
&__title {
margin: 17px 0;
padding-bottom: 17px;
color: $popoverFontColor;
font-size: 21px;
letter-spacing: 0.3px;
border-bottom: 1px solid $inlayBorderColor;
}
&__text {
color: $popoverFontColor;
display: block;
margin-top: 22px;
font-size: 16px;
}
&__icon {
margin: 0 10px;
font-size: 50px;
}
&__button {
float: none !important;
}
}

47
css/_jitsi_popover.scss Normal file
View File

@@ -0,0 +1,47 @@
.jitsipopover {
position: absolute;
top: 0;
left: 0;
z-index: 1010;
display: none;
max-width: 300px;
min-width: 100px;
text-align: left;
color: $popoverFontColor;
background-color: $popoverBg;
background-clip: padding-box;
border-radius: $borderRadius;
/*-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);*/
/*box-shadow: 0 5px 10px rgba(0, 0, 0, 0.4);*/
white-space: normal;
margin-top: -$popoverMenuPadding;
&__menu-padding {
height: $popoverMenuPadding;
width: 100px;
position: absolute;
bottom: -$popoverMenuPadding;
}
&__showmore {
display: block;
text-align: center;
width: 90px;
margin: 10px auto;
}
> .arrow {
position: absolute;
display: block;
left: 50%;
bottom: -5px;
margin-left: -5px;
width: 0;
height: 0;
border-color: transparent;
border-top-color: $popoverBg;
border-style: solid;
border-width: 5px;
border-bottom-width: 0;
}
}

View File

@@ -9,7 +9,8 @@
}
div.jqi{
width: 400px;
position: absolute;
position: absolute;
color: #3a3a3a;
background-color: #ffffff;
font-size: 11px;
text-align: left;
@@ -55,7 +56,7 @@ div.jqi .jqibuttons{
div.jqi .jqibuttons button{
margin: 0;
padding: 5px 20px;
background-color: transparent;
background-color: transparent !important;
font-weight: normal;
border: none;
border-left: solid 1px #e4e4e4;

View File

@@ -0,0 +1,206 @@
@charset "UTF-8";
/*!
* jQuery contextMenu - Plugin for simple contextMenu handling
*
* Version: v2.1.1
*
* Authors: Björn Brala (SWIS.nl), Rodney Rehm, Addy Osmani (patches for FF)
* Web: http://swisnl.github.io/jQuery-contextMenu/
*
* Copyright (c) 2011-2016 SWIS BV and contributors
*
* Licensed under
* MIT License http://www.opensource.org/licenses/mit-license
*
* Date: 2016-02-28T09:53:18.890Z
*/
@font-face {
font-family: "context-menu-icons";
font-style: normal;
font-weight: normal;
src: url("font/context-menu-icons.eot?2qmzf");
src: url("font/context-menu-icons.eot?2qmzf#iefix") format("embedded-opentype"), url("font/context-menu-icons.woff2?2qmzf") format("woff2"), url("font/context-menu-icons.woff?2qmzf") format("woff"), url("font/context-menu-icons.ttf?2qmzf") format("truetype");
}
.context-menu-icon:before {
position: absolute;
top: 50%;
left: 0;
width: 28px;
font-family: "context-menu-icons";
font-size: 16px;
font-style: normal;
font-weight: normal;
line-height: 1;
color: #2980b9;
text-align: center;
-webkit-transform: translateY(-50%);
-ms-transform: translateY(-50%);
-o-transform: translateY(-50%);
transform: translateY(-50%);
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.context-menu-icon-add:before {
content: "";
}
.context-menu-icon-copy:before {
content: "";
}
.context-menu-icon-cut:before {
content: "";
}
.context-menu-icon-delete:before {
content: "";
}
.context-menu-icon-edit:before {
content: "";
}
.context-menu-icon-paste:before {
content: "";
}
.context-menu-icon-quit:before {
content: "";
}
.context-menu-icon.context-menu-hover:before {
color: #fff;
}
.context-menu-list {
position: absolute;
display: inline-block;
min-width: 180px;
max-width: 360px;
padding: 4px 0;
margin: 5px;
font-family: inherit;
font-size: inherit;
list-style-type: none;
background: #fff;
border: 1px solid #bebebe;
border-radius: $borderRadius;
-webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, .5);
box-shadow: 0 2px 5px rgba(0, 0, 0, .5);
}
.context-menu-item {
position: relative;
padding: 3px 28px;
color: #2f2f2f;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
background-color: #fff;
}
.context-menu-separator {
padding: 0;
margin: 5px 0;
border-bottom: 1px solid #e6e6e6;
}
.context-menu-item > label > input,
.context-menu-item > label > textarea {
-webkit-user-select: text;
-moz-user-select: text;
-ms-user-select: text;
user-select: text;
}
.context-menu-item.context-menu-hover {
color: #fff;
cursor: pointer;
background-color: #2980b9;
}
.context-menu-item.context-menu-disabled {
color: #626262;
background-color: #fff;
}
.context-menu-item.context-menu-disabled {
color: #626262;
}
.context-menu-input.context-menu-hover,
.context-menu-item.context-menu-disabled.context-menu-hover {
cursor: default;
background-color: #eee;
}
.context-menu-submenu:after {
position: absolute;
top: 50%;
right: 8px;
z-index: 1;
width: 0;
height: 0;
content: '';
border-color: transparent transparent transparent #2f2f2f;
border-style: solid;
border-width: 4px 0 4px 4px;
-webkit-transform: translateY(-50%);
-ms-transform: translateY(-50%);
-o-transform: translateY(-50%);
transform: translateY(-50%);
}
/**
* Inputs
*/
.context-menu-item.context-menu-input {
padding: 5px 10px;
}
/* vertically align inside labels */
.context-menu-input > label > * {
vertical-align: top;
}
/* position checkboxes and radios as icons */
.context-menu-input > label > input[type="checkbox"],
.context-menu-input > label > input[type="radio"] {
position: relative;
top: 3px;
}
.context-menu-input > label,
.context-menu-input > label > input[type="text"],
.context-menu-input > label > textarea,
.context-menu-input > label > select {
display: block;
width: 100%;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
.context-menu-input > label > textarea {
height: 100px;
}
.context-menu-item > .context-menu-list {
top: 5px;
/* re-positioned by js */
right: -5px;
display: none;
}
.context-menu-item.context-menu-visible > .context-menu-list {
display: block;
}
.context-menu-accesskey {
text-decoration: underline;
}

View File

@@ -0,0 +1,25 @@
#keyboard-shortcuts {
display: none;
position: absolute;
bottom: 20px;
left: $defaultToolbarSize;
overflow: hidden;
padding: 20px;
margin-left: 10px;
z-index: 10;
border-radius: $borderRadius;
background-attachment: scroll;
background-size: auto auto;
color: rgba(255, 255, 255, .8);
background-color: rgba(0, 0, 0, .8);
}
#keyboard-shortcuts .item-action {
color: #209EFF;
font-size: 14pt;
padding-right: 5px;
}
#keyboard-shortcuts-list {
list-style-type: none;
}

View File

@@ -1,5 +1,7 @@
/*Initialize*/
ul.loginmenu {
font-family: $baseFontFamily;
line-height: normal;
display:none;
position: absolute;
margin: 0;
@@ -15,12 +17,10 @@ ul.loginmenu {
ul.loginmenu li {
list-style-type: none;
padding: 7px;
}
ul.loginmenu li.identity {
color: #fff;
font-size: 11pt;
cursor: default;
white-space: pre;
}
ul.loginmenu:after {
@@ -31,22 +31,6 @@ ul.loginmenu:after {
left: 18px;
}
li a.authButton{
background-color: #06a5df;
padding-top: 3px;
padding-bottom: 3px;
padding-left: 29px;
padding-right: 29px;
border-radius: 4px;
color: #fff;
font-size: 11pt;
cursor: pointer;
}
span.authentication:hover ul.loginmenu, ul.loginmenu:hover {
display:block !important;
}
a.disabled {
color: gray !important;
pointer-events: none;
@@ -58,4 +42,17 @@ a.disabled {
position: absolute;
top: -30px;
left: 0px;
}
.loginmenu.extendedToolbarPopup {
left: 55px;
top: 0px;
}
ul.loginmenu.extendedToolbarPopup:after {
content: url('../images/leftDropdownPointer.png');
display: block;
position: absolute;
top: 18px;
left: -7px;
}

161
css/_mixins.scss Normal file
View File

@@ -0,0 +1,161 @@
/**
* Animation mixin.
*/
@mixin animation($animate...) {
$max: length($animate);
$animations: '';
@for $i from 1 through $max {
$animations: #{$animations + nth($animate, $i)};
@if $i < $max {
$animations: #{$animations + ", "};
}
}
-webkit-animation: $animations;
-moz-animation: $animations;
-o-animation: $animations;
animation: $animations;
}
@mixin flex() {
display: -webkit-box;
display: -moz-box;
display: -ms-flexbox;
display: -webkit-flex;
display: flex;
}
/**
* Keyframes mixin.
*/
@mixin keyframes($animationName) {
@-webkit-keyframes #{$animationName} {
@content;
}
@-moz-keyframes #{$animationName} {
@content;
}
@-o-keyframes #{$animationName} {
@content;
}
@keyframes #{$animationName} {
@content;
}
}
@mixin circle($diameter) {
width: $diameter;
height: $diameter;
border-radius: 50%;
}
/**
* Absolute position the element at the top left corner
**/
@mixin topLeft() {
position: absolute;
top: 0;
left: 0;
}
@mixin absoluteAligning() {
top: 50%;
left: 50%;
position: absolute;
@include transform(translate(-50%, -50%));
}
/**
* Defines the maximum width and height
**/
@mixin maxSize($value) {
max-width: $value;
max-height: $value;
}
@mixin transform($func) {
-moz-transform: $func;
-ms-transform: $func;
-webkit-transform: $func;
-o-transform: $func;
transform: $func;
}
@mixin transition($transition...) {
-moz-transition: $transition;
-o-transition: $transition;
-webkit-transition: $transition;
transition: $transition;
}
/**
* Mixin styling placeholder
**/
@mixin placeholder() {
$selectors: (
"::-webkit-input-placeholder",
"::-moz-placeholder",
":-moz-placeholder",
":-ms-input-placeholder"
);
@each $selector in $selectors {
#{$selector} {
@content;
}
}
}
@mixin box-shadow($h, $y, $blur, $color, $inset: false) {
@if $inset {
-webkit-box-shadow: inset $h $y $blur $color;
-moz-box-shadow: inset $h $y $blur $color;
box-shadow: inset $h $y $blur $color;
} @else {
-webkit-box-shadow: $h $y $blur $color;
-moz-box-shadow: $h $y $blur $color;
box-shadow: $h $y $blur $color;
}
}
@mixin no-box-shadow {
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}
@mixin box-sizing($box-model) {
-webkit-box-sizing: $box-model; // Safari <= 5
-moz-box-sizing: $box-model; // Firefox <= 19
box-sizing: $box-model;
}
@mixin border-radius($radius) {
-webkit-border-radius: $radius;
border-radius: $radius;
/* stops bg color from leaking outside the border: */
background-clip: padding-box;
}
@mixin opacity($opacity) {
opacity: $opacity;
$opacity-ie: $opacity * 100;
-ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=$opacity-ie);
filter: alpha(opacity=$opacity-ie); //IE8
}
@mixin text-truncate {
display: block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
/**
* Creates a semi-transparent background with the given color and alpha
* (opacity) value.
*/
@mixin transparentBg($color, $alpha) {
background-color: rgba(red($color), green($color), blue($color), $alpha);
}

View File

@@ -19,11 +19,6 @@
width: 100%;
}
.jqibuttons button {
margin-right: 5px;
float:right;
}
button.jqidefaultbutton #inviteLinkRef {
color: #2c8ad2;
}

15
css/_policy.scss Normal file
View File

@@ -0,0 +1,15 @@
.policy {
&__logo {
display: block;
width: 200px;
height: 50px;
margin: 30px auto 0;
}
&__text {
text-align: center;
font-size: 14px;
line-height: 21px;
font-weight: 300;
}
}

View File

@@ -2,7 +2,7 @@
position: absolute;
top: 0;
left: 0;
z-index: 1010;
z-index: 1015;
display: none;
max-width: 300px;
min-width: 100px;
@@ -121,4 +121,4 @@
border-right-width: 0;
border-left-color: #ffffff;
bottom: -10px;
}
}

73
css/_popup_menu.scss Normal file
View File

@@ -0,0 +1,73 @@
/**
* Initialize
**/
.popupmenu {
padding: 0;
margin: 2px 0;
bottom: 0;
height: auto;
&:first-child {
margin-top: 2px;
}
&__item {
list-style-type: none;
text-align: left;
height: 35px;
&:hover {
background-color: $popupMenuSelectedItemBackground;
}
}
// Link Appearance
&__link {
display: block;
box-sizing: border-box;
text-decoration: none;
color: #fff;
padding: 5px;
height: 100%;
font-size: 9pt;
width: 100%;
cursor: hand;
&.disabled {
color: gray !important;
pointer-events: none;
}
}
&__text {
display: inline-block;
vertical-align: middle;
}
&__icon {
vertical-align: middle;
position: relative;
display: inline-block;
width: 20px;
height: 100%;
text-align: center;
> * {
@include absoluteAligning();
}
}
.icon-kick {
font-size: 8pt;
}
}
span.remotevideomenu:hover ul.popupmenu, ul.popupmenu:hover {
display:block !important;
}
.remote-control-spinner {
top: 6px;
left: 2px;
}

4
css/_recording.scss Normal file
View File

@@ -0,0 +1,4 @@
.recordingSpinner {
display: none;
vertical-align: top;
}

41
css/_redirect_page.scss Normal file
View File

@@ -0,0 +1,41 @@
html, body {
width: 100%;
height:100%;
color: $defaultColor;
background: $defaultBackground;
}
.redirectPageMessage {
width: 30%;
margin: 20% auto;
text-align: center;
font-size: 24px;
.thanks-msg {
border-bottom: 1px solid $selectBg;
padding-left: 30px;
padding-right: 30px;
p {
margin: 30px auto;
font-size: 24px;
line-height: 24px;
}
}
.hint-msg{
p {
margin: 26px auto;
font-weight: 600;
font-size: 16px;
line-height: 18px;
.hint-msg__holder{
font-weight: 200;
}
}
.happy-software{
width: 120px;
height: 86px;
margin: 0 auto;
background: $happySoftwareBackground;
}
}
}

View File

@@ -0,0 +1,140 @@
/**
* Toolbar side panel main container element.
*/
#sideToolbarContainer {
background-color: rgba(0,0,0,0.8);
height: 100%;
left: $defaultToolbarSize;
max-width: $sidebarWidth;
overflow: hidden;
position: absolute;
top: 0;
width: 0;
z-index: 800;
/**
* Labels inside the side panel.
*/
label {
color: $baseLight;
}
/**
* Form elements and blocks.
*/
input, select, a,
.sideToolbarBlock, .form-control, .button-control {
display: block;
margin-top: 15px;
margin-left: 10%;
width: 80%;
}
/**
* Specify styling of elements inside a block.
*/
.sideToolbarBlock {
input, button, a, select {
margin-left: 0;
margin-top: 5px;
width: 100%;
}
input[type='checkbox'] {
display: inline;
width: auto !important;
> label {
margin-top: 5px;
width: 80%;
}
}
}
/**
* Inner container, for example contact list, settings or profile.
*/
.sideToolbarContainer__inner {
display: none;
height: 100%;
width: $sidebarWidth;
position: absolute;
box-sizing: border-box;
color: #FFF;
.input-control {
border: 0;
}
/**
* Titles and subtitles of inner containers.
*/
div.title, div.subTitle {
margin: 24px 0 11px;
}
/**
* Main title size.
*/
div.title {
color: $toolbarTitleColor;
text-align: center;
font-size: $toolbarTitleFontSize;
}
/**
* Subtitle specific properties.
*/
div.subTitle {
color: $defaultSideBarFontColor !important;
font-size: 11px;
font-weight: 500;
margin-left: 10%;
text-align: left;
}
/**
* First element after a title.
*/
.first {
margin-top: 0 !important;
}
/**
* Buttons in the side toolbar container.
*/
.button-control {
margin: 9px 0;
width: 100%;
}
}
}
#device_settings {
width : auto !important;
text-align: center;
}
/**
* Profile
*/
.auth_container {
ul {
padding: 0;
li {
list-style-type: none;
a.authButton {
width: 160px;
margin: 10px 20px;
padding: 3px 29px;
box-sizing: border-box;
background-color: #06a5df;
border-radius: 4px;
cursor: pointer;
color: $defaultColor;
text-decoration: none;
text-align: center;
}
}
}
}

107
css/_toastr.scss Normal file
View File

@@ -0,0 +1,107 @@
/*
* Toastr
* Copyright 2012-2014 John Papa and Hans Fjällemark.
* All Rights Reserved.
* Use, reproduction, distribution, and modification of this code is subject to the terms and
* conditions of the MIT license, available at http://www.opensource.org/licenses/mit-license.php
*
* Author: John Papa and Hans Fjällemark
* Project: https://github.com/CodeSeven/toastr
*
* Last updated: October 13, 2016
*/
.toast-title,
.toast-message .nickname {
font-weight: bold;
margin: 0 0 3px;
@include text-truncate;
}
.toast-message {
-ms-word-wrap: break-word;
word-wrap: break-word;
}
.toast-message a,
.toast-message label,
.toast-message .connected,
.toast-message .disconnected {
color: $notificationLinkColor;
text-decoration: none;
}
.toast-message a:hover {
text-decoration: underline;
}
.toast-message br {
display: none;
}
// close button
.toast-close-button {
color: $notificationColor;
background: transparent;
font-size: 15px;
line-height: 1.2;
height: 20px;
width: 20px;
padding: 0;
border: 0;
margin: -6px -10px 0 0;
float: right;
cursor: pointer;
@include opacity(0.4);
/* Additional properties for button version
iOS requires the button element instead of an anchor tag.
If you want the anchor version, it requires `href="#"`. */
-webkit-appearance: none;
}
.toast-close-button:hover,
.toast-close-button:focus {
@include opacity(1);
}
.toast {
color: $notificationColor;
background-color: $notificationBackground;
font-size: $notificationFontSize;
padding: $notificationPadding;
border: 1px solid lighten($notificationBackground, 10%);
@include border-radius($notificationBorderRadius);
@include box-shadow(1px, 1px, 2px, rgba(0,0,0,0.3));
@include opacity($notificationOpacity);
}
.toast:hover {
@include opacity(1);
}
#toast-container {
position: fixed;
z-index: $notificationZ;
}
#toast-container.notification-bottom-right {
$videoOffset: 2 * ($thumbnailVideoMargin + $thumbnailsBorder) + $thumbnailVideoBorder;
bottom: 135px;
right: $hideFilmstripButtonWidth + $videoOffset;
}
#toast-container * {
@include box-sizing(border-box);
}
#toast-container .toast {
width: $notificationWidth;
margin: 0 0 8px;
}

280
css/_toolbars.scss Normal file
View File

@@ -0,0 +1,280 @@
.toolbar {
background-color: $toolbarBackground;
position: relative;
z-index: $toolbarZ;
height: 100%;
pointer-events: auto;
/**
* Splitter button in the toolbar.
*/
&__splitter {
display: inline-block;
vertical-align: middle;
width: 1px;
height: 50%;
margin: 0 $splitterToolbarButtonMargin;
background: $splitterColor;
}
}
#mainToolbarContainer{
display: block;
position: absolute;
text-align: center;
top:0;
left:0;
right:0;
z-index: $toolbarZ;
pointer-events: none;
min-height: 100px;
opacity: 0;
}
#subject {
position: relative;
z-index: 3;
width: auto;
padding: 5px;
margin-left: 40%;
margin-right: 40%;
text-align: center;
background: linear-gradient(to bottom, rgba(255,255,255,.85) , rgba(255,255,255,.35));
box-shadow: 0 0 2px #000000, 0 0 10px #000000;
border-bottom-left-radius: 12px;
border-bottom-right-radius: 12px;
}
#mainToolbar {
height: $defaultToolbarSize;
display: inline-block;
position: relative;
top: 30px;
margin-left: auto;
margin-right: auto;
width: auto;
border-radius: 3px;
.button:first-child {
border-bottom-left-radius: 3px;
border-top-left-radius: 3px;
}
.button:last-child {
border-bottom-right-radius: 3px;
border-top-right-radius: 3px;
}
}
#extendedToolbar {
display: -moz-box;
display: -ms-flexbox;
display: -webkit-box;
display: -webkit-flex;
display: flex;
width: $defaultToolbarSize;
height: 100%;
top: 0;
left: 0;
padding-top: 10px;
box-sizing: border-box;
flex-direction: column;
flex-wrap: nowrap;
justify-content: flex-start;
align-items: center;
transform: translateX(-100%);
-webkit-transform: translateX(-100%);
}
#toolbar_button_hangup {
color: #BF2117;
font-size: $hangupFontSize !important;
}
#toolbar_button_etherpad {
display: none;
}
#mainToolbar a.button:last-child::after {
content: none;
}
.button {
display: inline-block;
position: relative;
color: #FFFFFF;
top:0px;
width: 50px;
height: 50px;
cursor: pointer;
text-align: center;
z-index: 1;
font-size: $toolbarFontSize !important;
line-height: 50px !important;
vertical-align: middle;
}
.button[disabled] {
opacity: 0.5;
}
.button.unclickable {
cursor: default;
}
.button.toggled {
background: $toolbarToggleBackground !important;
}
a.button.unclickable:hover,
a.button.unclickable:active,
a.button.unclickable.selected{
cursor: default;
background: none;
}
a.button:hover,
a.button:active,
a.button.selected {
cursor: pointer;
text-decoration: none;
// sum opacity with background layer should give us 0.8
background: $toolbarSelectBackground;
}
a.button>#avatar {
width: 30px;
border-radius: 50%;
padding-top: 10px;
padding-bottom: 10px;
}
#feedbackButton {
margin-top: auto;
}
/**
* Round badge.
*/
.badge-round {
background-color: $toolbarBadgeBackground;
color: $toolbarBadgeColor;
font-size: 9px;
line-height: 13px;
font-weight: 700;
text-align: center;
border-radius: 50%;
min-width: 13px;
overflow: hidden;
text-overflow: ellipsis;
box-sizing: border-box;
vertical-align: middle;
// Do not inherit the font-family from the toolbar button, because it's an
// icon style.
font-family: $baseFontFamily;
}
/**
* Toolbar specific round badge.
*/
.toolbar .badge-round {
position: absolute;
right: 9px;
bottom: 9px;
}
/**
* START of slide in animation for extended toolbar.
*/
@include keyframes(slideInX) {
0% { transform: translateX(-100%); }
100% { transform: translateX(0%); }
}
.slideInX {
@include animation('slideInX .5s forwards');
}
@include keyframes(slideOutX) {
0% { transform: translateX(0%); }
100% { transform: translateX(-100%); }
}
.slideOutX {
@include animation('slideOutX .5s forwards');
}
@include keyframes(slideInExtX) {
0% { transform: translateX(-500%); }
100% { transform: translateX(0%); }
}
.slideInExtX {
@include animation('slideInExtX .5s forwards');
}
@include keyframes(slideOutExtX) {
0% { transform: translateX(0%); }
100% { transform: translateX(-500%); }
}
.slideOutExtX {
@include animation('slideOutExtX .5s forwards');
}
/**
* END of slide out animation for extended toolbar.
*/
/**
* START of slide in / out animation for main toolbar.
*/
@include keyframes(slideInY) {
100% { transform: translateY(0%); }
}
.slideInY {
@include animation('slideInY .5s forwards');
}
@include keyframes(slideOutY) {
0% { transform: translateY(0%); }
100% { transform: translateY(-100%); }
}
.slideOutY {
@include animation('slideOutY .5s forwards');
}
/**
* END of slide in / out animation for main toolbar.
*/
/**
* START of slide in animation for extended toolbar panel.
*/
@include keyframes(slideInExt) {
from { width: 0px; }
to { width: $sidebarWidth; } // TO FIX: Make this value a percentage.
}
.slideInExt {
@include animation("slideInExt .5s forwards");
}
@include keyframes(slideOutExt) {
from { width: $sidebarWidth; } // TO FIX: Make this value a percentage.
to { width: 0px; }
}
.slideOutExt {
@include animation("slideOutExt .5s forwards");
}
/**
* START of fade in animation for main toolbar
*/
.fadeIn {
@include animation('fadeIn .3s linear .2s forwards');
}
.fadeOut {
@include animation('fadeOut .5s linear forwards');
}

38
css/_utils.scss Normal file
View File

@@ -0,0 +1,38 @@
/**
* Hides an element.
*/
.hide {
display: none !important;
}
/**
* Shows an element.
*/
.show {
display: block !important;
}
/**
* Shows an inline element.
*/
.show-inline {
display: inline-block !important;
}
/**
* Shows as a list item
**/
.show-list-item {
display: list-item !important;
}
/**
* Shows a flex element.
*/
.show-flex {
display: -webkit-box !important;
display: -moz-box !important;
display: -ms-flexbox !important;
display: -webkit-flex !important;
display: flex !important;
}

136
css/_variables.scss Normal file
View File

@@ -0,0 +1,136 @@
@import "themes/light";
/**
* Style variables
*/
$baseFontFamily: 'open_sanslight', 'Helvetica Neue', Helvetica, Arial, sans-serif;
$toolbarFontSize: 1.9em;
$hangupFontSize: 2em;
/**
* Size variables.
*/
$defaultToolbarSize: 50px;
// Video layout.
$thumbnailToolbarHeight: 22px;
$thumbnailIndicatorBorder: 2px;
$thumbnailIndicatorSize: $thumbnailToolbarHeight;
$thumbnailVideoMargin: 5px;
$thumbnailsBorder: 2px;
$thumbnailVideoBorder: 2px;
$hideFilmstripButtonWidth: 17px;
/**
* Color variables.
*/
$defaultColor: #F1F1F1;
$defaultSideBarFontColor: #44A5FF;
$defaultSemiDarkColor: #ACACAC;
$defaultDarkColor: #2b3d5c;
$tooltipBg: rgba(0,0,0, 0.7);
/**
* Toolbar
*/
$toolbarTitleColor: #FFFFFF;
$toolbarTitleFontSize: 19px;
$toolbarBackground: rgba(0, 0, 0, 0.5);
$toolbarSelectBackground: rgba(0, 0, 0, .6);
$toolbarBadgeBackground: #165ECC;
$toolbarBadgeColor: #FFFFFF;
$toolbarToggleBackground: #12499C;
$splitterToolbarButtonMargin: 18px;
/**
* Main controls
* TODO: looks like we don't use it
*/
$inputSemiBackground: rgba(132, 132, 132, .8);
$inputLightBackground: #EBEBEB;
/**
* Video layout
*/
$videoThumbnailHovered: rgba(22, 94, 204, .4);
$videoThumbnailSelected: #165ECC;
$participantNameColor: #fff;
$thumbnailPictogramColor: #fff;
$dominantSpeakerBg: #165ecc;
$raiseHandBg: #D6D61E;
$audioLevelBg: #44A5FF;
$connectionIndicatorBg: #165ecc;
$audioLevelShadow: rgba(9, 36, 77, 0.9);
$videoStateIndicatorColor: $defaultColor;
$videoStateIndicatorBackground: $toolbarBackground;
/**
* Feedback Modal
*/
$feedbackContentBg: #fff;
$feedbackInputBg: #fff;
$feedbackTextColor: #000;
$feedbackInputTextColor: #333;
$feedbackInputPlaceholderColor: #777;
$rateStarLabelColor: #333;
$rateStarDefault: #ccc;
$rateStarActivity: #165ecc;
$rateStarSize: 34px;
/**
* Notifications
*/
$notificationFontSize: 13px;
$notificationColor: #FFFFFF;
$notificationBackground: $tooltipBg;
$notificationTitleColor: $notificationColor;
$notificationMessageColor: $notificationColor;
$notificationLinkColor: $notificationColor;
$notificationOpacity: 0.9;
$notificationPadding: 15px 20px;
$notificationBorderRadius: 4px;
$notificationWidth: 215px;
/**
* Misc.
*/
$borderRadius: 4px;
$defaultWatermarkLink: '../images/watermark.png';
$sidebarWidth: 220px;
$popoverMenuPadding: 13px;
$happySoftwareBackground: transparent;
/**
* Z-indexes. TODO: Replace this by a function.
*/
$tooltipsZ: 901;
$toolbarZ: 900;
$overlayZ: 902;
$notificationZ: 1012;
$ringingZ: 800;
$dropdownZ: 901;
$dropdownMaskZ: 900;
/**
* Font Colors
*/
$defaultFontColor: #777;
$defaultLightFontColor: #F1F1F1;
$defaultDarkFontColor: #000;
/**
* Forms
*/
//inputs
$inputControlEmColor: #f29424;
//buttons
$linkFontColor: #489afe;
$linkHoverFontColor: #287ade;
/**
* Landing
*/
$primaryUnsupportedBrowserButtonBgColor: #17a0db;
$unsupportedBrowserButtonBgColor: #ff9a00;
$unsupportedBrowserTextColor: #4a4a4a;

View File

@@ -0,0 +1,531 @@
#videoconference_page {
min-height: 100%;
}
#videospace {
display: block;
min-height: 100%;
position: absolute;
top: 0px;
left: 0px;
right: 0px;
overflow: hidden;
}
.videocontainer {
position: relative;
text-align: center;
&__background {
@include topLeft();
background-color: black;
border-radius: $borderRadius;
width: 100%;
height: 100%;
}
/**
* The toolbar of the video thumbnail.
*/
&__toolbar,
&__toptoolbar {
position: absolute;
left: 0;
z-index: 3;
width: 100%;
box-sizing: border-box; // Includes the padding in the 100% width.
}
&__toolbar {
bottom: 0;
padding: 0 5px 0 5px;
height: $thumbnailToolbarHeight;
}
&__toptoolbar {
$toolbarPadding: 5px;
top: 0;
padding: $toolbarPadding;
padding-bottom: 0;
span.indicator {
position: relative;
font-size: 8px;
text-align: center;
line-height: $thumbnailIndicatorSize;
display: none;
padding: 0;
margin-right: em(5, 8);
float: left;
@include circle($thumbnailIndicatorSize);
box-sizing: border-box;
z-index: 3;
background: $dominantSpeakerBg;
color: $thumbnailPictogramColor;
border: $thumbnailIndicatorBorder solid $thumbnailPictogramColor;
&:last-child {
margin-right: 0;
}
.indicatoricon {
@include absoluteAligning();
}
.connection {
position: relative;
display: inline-block;
margin: 0 auto;
left: 0;
@include transform(translate(0, -50%));
&_empty
{
color: #8B8B8B;/*#FFFFFF*/
overflow: hidden;
}
&_lost
{
color: #8B8B8B;
overflow: visible;
}
&_full
{
@include topLeft();
color: #FFFFFF;/*#15A1ED*/
overflow: hidden;
}
}
.icon-connection,
.icon-connection-lost {
font-size: 1em;
}
}
}
&__hoverOverlay {
background: rgba(0,0,0,.6);
border-radius: $borderRadius;
position: relative;
width: 100%;
height: 100%;
visibility: hidden;
z-index: 2;
}
}
#localVideoWrapper {
display:inline-block;
}
.flipVideoX {
transform: scale(-1, 1);
-moz-transform: scale(-1, 1);
-webkit-transform: scale(-1, 1);
-o-transform: scale(-1, 1);
}
#localVideoWrapper>video,
#localVideoWrapper>object {
border-radius: $borderRadius !important;
cursor: hand;
object-fit: cover;
}
#largeVideo,
#largeVideoWrapper,
#largeVideoContainer {
overflow: hidden;
text-align: center;
}
#largeVideo,
#largeVideoWrapper
{
object-fit: cover;
}
#sharedVideo,
#etherpad,
#localVideoWrapper>video,
#localVideoWrapper>object,
#localVideoWrapper,
#largeVideoWrapper,
#largeVideoWrapper>video,
#largeVideoWrapper>object,
.videocontainer>video,
.videocontainer>object {
position: absolute;
left: 0;
top: 0;
z-index: 1;
width: 100%;
height: 100%;
}
#etherpad {
text-align: center;
}
#etherpad {
z-index: 0;
}
/**
* Positions video thumbnail display name and editor.
*/
.videocontainer .displayname,
.videocontainer .editdisplayname {
display: inline-block;
position: absolute;
left: 10%;
width: 80%;
top: 50%;
@include transform(translateY(-40%));
color: $participantNameColor;
text-align: center;
text-overflow: ellipsis;
font-size: 12px;
font-weight: 100;
overflow: hidden;
white-space: nowrap;
line-height: $thumbnailToolbarHeight;
z-index: 2;
}
/**
* Positions video thumbnail display name editor.
*/
.videocontainer .editdisplayname {
outline: none;
border: none;
background: none;
box-shadow: none;
padding: 0;
}
#localVideoContainer .displayname:hover {
cursor: text;
}
.videocontainer .displayname {
pointer-events: none;
padding: 0 3px 0 3px;
}
.videocontainer .editdisplayname {
height: auto;
}
#localDisplayName {
pointer-events: auto !important;
}
.videocontainer>a.displayname {
display: inline-block;
position: absolute;
color: #FFFFFF;
bottom: 0;
right: 0;
padding: 3px 5px;
font-size: 9pt;
cursor: pointer;
z-index: 2;
}
/**
* Video thumbnail toolbar icon.
*/
.videocontainer .toolbar-icon {
font-size: 8pt;
text-align: center;
text-shadow: 0px 1px 0px rgba(255,255,255,.3), 0px -1px 0px rgba(0,0,0,.7);
color: #FFFFFF;
width: 12px;
line-height: $thumbnailToolbarHeight;
height: $thumbnailToolbarHeight;
padding: 0;
border: 0;
margin: 0px 5px 0px 0px;
float: left;
}
/**
* Toolbar icon internal i elements (font icons).
*/
.toolbar-icon>i {
line-height: $thumbnailToolbarHeight;
}
/**
* Toolbar icons positioned on the right.
*/
.toolbar-icon.right {
float: right;
margin: 0px 0px 0px 5px;
}
#raisehandindicator {
background: $raiseHandBg;
}
#connectionindicator {
background: $connectionIndicatorBg;
}
.remotevideomenu
{
display: inline-block;
position: absolute;
top: 0px;
right: 0;
margin: 7px;
z-index: 3;
width: 18px;
height: 13px;
color: #FFF;
font-size: 8pt;
}
/**
* Audio indicator on video thumbnails.
*/
.videocontainer>span.audioindicator {
position: absolute;
display: inline-block;
left: 6px;
top: 50%;
margin-top: -17px;
width: 6px;
height: 35px;
z-index: 2;
border: none;
.audiodot-top,
.audiodot-bottom,
.audiodot-middle {
opacity: 0;
display: inline-block;
@include circle(5px);
background: $audioLevelShadow;
margin: 1px 0 1px 0;
transition: opacity .25s ease-in-out;
-moz-transition: opacity .25s ease-in-out;
}
span.audiodot-top::after,
span.audiodot-bottom::after,
span.audiodot-middle::after {
content: "";
display: inline-block;
width: 5px;
height: 5px;
border-radius: 50%;
-webkit-filter: blur(0.5px);
filter: blur(0.5px);
background: $audioLevelBg;
}
}
#reloadPresentation {
display: none;
position: absolute;
color: #FFFFFF;
top: 0;
right:0;
padding: 10px 10px;
font-size: 11pt;
cursor: pointer;
background: rgba(0, 0, 0, 0.3);
border-radius: 5px;
background-clip: padding-box;
-webkit-border-radius: 5px;
-webkit-background-clip: padding-box;
z-index: 20; /*The reload button should appear on top of the header!*/
}
.audiolevel {
display: inline-block;
position: absolute;
z-index: 0;
border-radius:1px;
pointer-events: none;
}
#dominantSpeaker {
visibility: hidden;
width: 300px;
height: 300px;
margin: auto;
position: relative;
}
#mixedstream {
display:none !important;
}
#dominantSpeakerAvatar,
.dynamic-shadow {
width: 200px;
height: 200px;
}
#dominantSpeakerAvatar {
top: 50px;
margin: auto;
position: relative;
border-radius: 100px;
visibility: inherit;
background-color: #000000;
}
.dynamic-shadow {
border-radius: 50%;
position: absolute;
top: 50%;
left: 50%;
margin: -100px 0 0 -100px;
transition: box-shadow 0.3s ease;
}
.userAvatar {
@include maxSize(60px);
@include absoluteAligning();
border-radius: 50%;
height: 50%;
width: auto;
}
.sharedVideoAvatar {
height: 100%;
width: 100%;
object-fit: cover;
}
.noMic {
position: absolute;
border-radius: 8px;
z-index: 1;
width: 100%;
height: 100%;
background-image: url("../images/noMic.png");
background-color: #000;
background-repeat: no-repeat;
background-position: center;
}
.noVideo {
position: absolute;
border-radius: 8px;
z-index: 1;
width: 100%;
height: 100%;
background-image: url("../images/noVideo.png");
background-color: #000;
background-repeat: no-repeat;
background-position: center;
}
.videoMessageFilter {
-webkit-filter: grayscale(.5) opacity(0.8);
filter: grayscale(.5) opacity(0.8);
}
.remoteVideoProblemFilter {
-webkit-filter: grayscale(100%);
filter: grayscale(100%);
}
.videoProblemFilter {
-webkit-filter: blur(10px) grayscale(.5) opacity(0.8);
filter: blur(10px) grayscale(.5) opacity(0.8);
}
.videoThumbnailProblemFilter {
-webkit-filter: grayscale(100%);
filter: grayscale(100%);
}
#remoteConnectionMessage {
display: none;
position: absolute;
width: auto;
z-index: 2;
font-weight: 600;
font-size: 14px;
text-align: center;
color: #FFF;
opacity: .80;
text-shadow: 0px 0px 1px rgba(0,0,0,0.3),
0px 1px 1px rgba(0,0,0,0.3),
1px 0px 1px rgba(0,0,0,0.3),
0px 0px 1px rgba(0,0,0,0.3);
background: rgba(0,0,0,.5);
border-radius: 5px;
padding: 5px;
padding-left: 10px;
padding-right: 10px;
}
#localConnectionMessage {
display: none;
position: absolute;
left: 0;
width: 100%;
top:50%;
z-index: 2;
font-weight: 600;
font-size: 14px;
text-align: center;
color: #FFF;
opacity: .80;
text-shadow: 0px 0px 1px rgba(0,0,0,0.3),
0px 1px 1px rgba(0,0,0,0.3),
1px 0px 1px rgba(0,0,0,0.3),
0px 0px 1px rgba(0,0,0,0.3);
}
.video-state-indicator {
background: $videoStateIndicatorBackground;
color: $videoStateIndicatorColor;
font-size: 13px;
line-height: 20px;
text-align: center;
min-width: 40px;
height: 40px;
padding: 10px 5px;
border-radius: 50%;
position: absolute;
box-sizing: border-box;
}
#videoResolutionLabel,
.centeredVideoLabel {
display: none;
z-index: 1011;
}
.centeredVideoLabel {
bottom: 45%;
border-radius: 2px;
-webkit-transition: all 2s 2s linear;
transition: all 2s 2s linear;
&.moveToCorner {
bottom: auto;
}
}
.moveToCorner {
position: absolute;
top: 30px;
right: 30px;
}
.moveToCorner + .moveToCorner {
right: 80px;
}

View File

@@ -1,4 +1,3 @@
#disable_welcome {
display:none;
}
@@ -21,7 +20,6 @@
-moz-user-select: none;
background-repeat: no-repeat;
font-weight: 500;
font-family: Helvetica;
font-size: 16px;
color: #acacac;
z-index: 2;
@@ -35,66 +33,79 @@
-moz-user-select: none;
background-repeat: no-repeat;
font-weight: 500;
font-family: Helvetica;
font-size: 16px;
color: #acacac;
z-index: 2;
}
#enter_room_form {
border-radius: 10px;
border-radius: 1px;
background-color: #FFFFFF;
border: none;
-moz-border-radius: 10px;
-webkit-border-radius: 10px;
-moz-border-radius: 1px;
-webkit-border-radius: 1px;
-webkit-appearance: none;
height: 55px;
box-shadow: none;
float: left;
}
#domain_name
.domain-name
{
float: left;
padding: 20px 0px 10px 20px;
height: 55px;
line-height: 55px;
font-size: 18px;
font-weight: 500;
font-family: Helvetica;
padding-left: 20px;
color: $defaultDarkColor;
}
#enter_room_field {
font-size: 15px;
padding: 15px 0px 10px 10px;
border: none;
-webkit-appearance: none;
width: 228px;
height: 55px;
font-weight: 500;
font-family: Helvetica;
box-shadow: none;
float: left;
background-color: #FFFFFF;
position: relative;
z-index: 2;
}
.enter-room {
&__field {
font-size: 15px;
border: none;
-webkit-appearance: none;
width: 228px;
height: 55px;
line-height: 55px;
font-weight: 500;
box-shadow: none;
float: left;
background-color: #FFFFFF;
position: relative;
z-index: 2;
}
#enter_room_button {
width: 73px;
height: 45px;
background-color: #16a8fe;
moz-border-radius: 10px;
-webkit-border-radius: 10px;
color: #ffffff;
font-weight: 600;
border: none;
margin-top: 5px;
font-size: 19px;
font-family: Helvetica;
padding-top: 6px;
outline: none;
float:left;
position: relative;
z-index: 2;
&__reload {
display: block;
width: 30px;
color: #acacac;
font-size: 1.9em;
line-height: 55px;
z-index: 3;
float: left;
cursor: pointer;
text-align: center;
}
&__button {
width: 73px;
height: 45px;
background-color: #21B9FC;
moz-border-radius: 1px;
-webkit-border-radius: 1px;
color: #ffffff;
font-weight: 600;
border: none;
margin-top: 5px;
font-size: 19px;
padding-top: 6px;
outline: none;
float:left;
position: relative;
z-index: 2;
}
}
#enter_room_container {
@@ -136,7 +147,6 @@
width: 885px;
height: 100px;
color: #ffffff;
font-family: Helvetica;
font-size: 24px;
text-align: center;
margin: 0px auto 0px auto;
@@ -171,7 +181,6 @@
background-repeat: no-repeat;
width: 169px;
height: 169px;
font-family: Helvetica;
color: #ffffff;
font-size: 22px;
/*font-weight: bold;*/
@@ -183,23 +192,9 @@
.feature_description
{
width: 190px;
font-family: Helvetica;
color: #ffffff;
font-size: 16px;
padding-top: 30px;
line-height: 22px;
font-weight: 200;
}
#reload_roomname
{
width: 30px;
height: 19px;
color: #acacac;
margin-top: 22px;
z-index: 3;
float: left;
cursor: pointer;
text-align: center;
display: none;
}

View File

@@ -0,0 +1,68 @@
.select2-container.aui-select2-container {
background-color: transparent !important;
margin-top: 2px;
a.select2-choice {
height: 28px !important;
line-height: 18px !important;
width: 100% !important;
background-color: $selectBg !important;
border-color: $selectBg !important;
color: $selectFontColor !important;
text-shadow: none !important;
font-size: 12px !important;
margin: 0 auto !important;
&:after {
border-top-color: $selectFontColor;
}
}
&.select2-dropdown-open{
a.select2-choice {
background-color: $selectActiveBg !important;
border-color: $selectActiveBg !important;
}
}
}
.select2-drop.aui-select2-drop.aui-style-default {
z-index: $dropdownZ;
background-color: $selectActiveBg;
border-color: $selectActiveBg;
.select2-results{
background-color: $selectActiveBg;
border-color: $selectActiveBg;
&::-webkit-scrollbar {
background-color: transparent;
}
&::-webkit-scrollbar-track {
background-color: transparent;
}
&::-webkit-scrollbar-track-piece {
background-color: transparent;
}
&::-webkit-scrollbar-thumb {
background-color: $selectActiveItemBg;
}
.select2-result{
&.select2-highlighted{
background-color: $selectActiveItemBg;
}
.select2-result-label{
font-size: 12px;
color: $selectFontColor !important;
line-height: 20px;
}
}
}
}
.select2-drop-mask {
z-index: $dropdownMaskZ;
}

View File

@@ -0,0 +1,89 @@
.button-control {
box-sizing: border-box;
display: inline-block;
border: 1px solid $buttonBorder;
vertical-align: baseline;
height: 30px;
min-width: 60px;
padding: 4px 10px;
margin: 0;
line-height: 1.5em;
outline: none;
background-color: transparent;
float: right;
font-size: 14px;
margin-left: 10px;
color: $buttonColor;
font-weight: $buttonFontWeight;
@include transition(background-color .1s ease-out);
&[disabled] {
color: #666;
cursor: default;
}
&_full-width {
margin: 0;
width: 100%;
}
&:hover {
border: 1px solid $buttonHoverBorder;
background-color: $buttonHoverBackground;
@include transition(background-color .1s ease-in);
}
&:active {
@include box-shadow(0, 0, 1px, $buttonShadowColor, true);
}
&_light {
color: $defaultDarkColor;
background-color: $buttonLightBackground;
border: 1px solid $buttonLightBorder;
&:hover {
border: 1px solid $buttonLightHoverBorder;
background-color: $buttonLightHoverBackground;
}
}
&_link {
color: $buttonLinkColor;
background-color: $buttonLinkBackground;
&:hover {
background-color: $buttonLinkBackground;
}
}
&_primary {
background-color: $primaryButtonBackground;
border: 1px solid $primaryButtonBackground;
color: $primaryButtonColor !important;
font-weight: $primaryButtonFontWeight;
&:hover {
border: 1px solid $primaryButtonHoverBackground;
background-color: $primaryButtonHoverBackground;
}
&[disabled] {
color: $primaryButtonColor;
}
}
&_close {
color: $defaultFontColor;
}
&_submit {
color: $linkFontColor;
&:hover {
color: $linkHoverFontColor;
}
}
&_center {
float: none !important;
}
}

View File

@@ -0,0 +1,62 @@
.form-control {
padding: 16px 0;
&:first-child {
padding-top: 0;
}
&:last-child {
padding-bottom: 0;
}
&__text {
margin: 8px 0;
font-size: 1em
}
&__label {
font-size: 1em;
font-weight: $labelFontWeight;
}
&__em {
color: $inputControlEmColor;
}
&__hint {
margin-top: 0;
font-size: $hintFontSize;
span {
vertical-align: middle;
}
&_error {
color: $errorColor;
}
}
&__container {
position: relative;
width: 100%;
margin-top: 5px;
margin-bottom: 5px;
@include flex();
.button-control {
margin: 1px 0 1px 10px;
}
}
&__right {
position: absolute;
right: 0;
}
}
/**
* Set a specific color for read only style.
*/
input:read-only {
color: $readOnlyInputColor;
}

View File

@@ -0,0 +1,32 @@
.input-control {
@include transition(all .2s ease-in);
display: inline-block;
width: 100%;
padding: 5px 7px;
color: $inputColor;
border-radius: $borderRadius;
line-height: 32px;
height: 32px;
text-align: left;
border:1px solid $inputBorderColor;
background-color: $inputBackground;
margin-bottom: 8px;
&:last-child {
margin-bottom: inherit;
}
&::selection {
background-color: $defaultDarkSelectionColor;
}
&.error {
color: $errorColor;
border-color: $errorColor;
}
}
@include placeholder {
color: $placeHolderColor;
}

11
css/components/_link.scss Normal file
View File

@@ -0,0 +1,11 @@
.link {
cursor: pointer;
color: $linkFontColor;
@include transition(color .1s ease-out);
&:hover {
color: $linkHoverFontColor;
text-decoration: underline;
@include transition(color .1s ease-in);
}
}

View File

@@ -1,51 +0,0 @@
#contactlist {
background-color: black;
cursor: default;
}
#contactlist>div.title {
text-align: left;
padding: 7px 10px;
margin: 2px;
color: #00ccff;
font-size: 11pt;
border-bottom: 1px solid #676767;
}
#contactlist>ul#contacts {
position: absolute;
top: 31px;
bottom: 0px;
width: 100%;
margin: 0px;
padding: 0px;
overflow-y: scroll;
overflow-x: hidden;
}
#contacts>li {
list-style-type: none;
text-align: left;
color: #FFF;
font-size: 10pt;
padding: 7px 10px;
margin: 2px;
}
#contacts>li>p {
display: inline-block;
vertical-align: middle;
margin: 0px;
}
.avatar {
padding: 0px;
margin-right: 10px;
vertical-align: middle;
font-size: 22pt;
border-radius: 20px;
}
#contactlist .clickable {
cursor: pointer;
}

View File

@@ -1,105 +0,0 @@
.jitsipopover {
position: absolute;
top: 0;
left: 0;
z-index: 1010;
display: none;
max-width: 300px;
min-width: 100px;
padding: 1px;
text-align: left;
color: #333333;
background-color: #ffffff;
background-clip: padding-box;
border: 1px solid #cccccc;
border: 1px solid rgba(0, 0, 0, 0.2);
border-radius: 6px;
/*-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);*/
/*box-shadow: 0 5px 10px rgba(0, 0, 0, 0.4);*/
white-space: normal;
margin-top: -10px;
margin-bottom: 35px;
}
.jitsipopover.black
{
background-color: rgba(0,0,0,0.8);
color: #ffffff;
}
.jitsipopover-content {
padding: 9px 14px;
font-size: 10pt;
white-space:pre-wrap;
text-align: center;
}
.jitsipopover > .arrow,
.jitsipopover > .arrow:after {
position: absolute;
display: block;
width: 0;
height: 0;
border-color: transparent;
border-style: solid;
}
.jitsipopover > .arrow {
border-width: 11px;
left: 50%;
margin-left: -11px;
border-bottom-width: 0;
border-top-color: #999999;
border-top-color: rgba(0, 0, 0, 0.25);
bottom: -11px;
}
.jitsipopover > .arrow:after {
border-width: 10px;
content: " ";
bottom: 1px;
margin-left: -10px;
border-bottom-width: 0;
border-top-color: #ffffff;
}
.jitsipopover.black > .arrow:after
{
border-top-color: rgba(0, 0, 0, 0.8);
}
.jitsiPopupmenuPadding {
height: 35px;
width: 100px;
position: absolute;
bottom: -35;
}
.jitsipopover_green
{
color: #4abd04;
}
.jitsipopover_orange
{
color: #ffa800;
}
.jitsipopover_blue
{
color: #06a5df;
}
.jitsipopover_showmore
{
background-color: #06a5df;
color: #ffffff;
cursor: pointer;
border-radius: 3px;
text-align: center;
width: 90px;
height: 16px;
padding-top: 4px;
padding-left: 10px;
padding-right: 10px;
margin: 15px auto 0px auto;
}

View File

@@ -1,377 +0,0 @@
* {
-webkit-user-select: none;
user-select: none;
}
html, body{
margin:0px;
height:100%;
color: #424242;
font-family:'Helvetica Neue', Helvetica, sans-serif;
font-weight: 400;
background: #000000;
overflow-x: hidden;
}
.right-panel {
display:none;
position:absolute;
float: right;
top: 0px;
bottom: 0px;
right: 0px;
width: 20%;
max-width: 200px;
overflow: hidden;
/* background-color:#dfebf1;*/
background-color:#FFFFFF;
border-left:1px solid #424242;
z-index: 5;
}
#nowebrtc {
display:none;
}
.toolbar_span {
display: inline-block;
position: relative;
}
#toolbar a.button::after {
content: '';
display: inline-block;
position: absolute;
left: 40px;
width: 1px;
height: 20px;
background: #373737;
}
#toolbar a.button:last-child::after {
content: none;
}
.button {
display: inline-block;
position: relative;
color: #FFFFFF;
top: 0;
padding: 10px 0;
width: 38px;
cursor: pointer;
text-align: center;
text-shadow: 0 1px 0 rgba(255,255,255,.3), 0 -1px 0 rgba(0,0,0,.6);
z-index: 1;
}
.toolbar_span>span {
display: inline-block;
position: absolute;
font-size: 7pt;
color: #ffffff;
text-align:center;
cursor: pointer;
}
#toolbar_button_chat, #chatBottomButton, #contactListButton, #numberOfParticipants {
-webkit-transition: all .5s ease-in-out;
-moz-transition: all .5s ease-in-out;
transition: all .5s ease-in-out;
}
/*#ffde00*/
#toolbar_button_chat.active, #contactListButton.glowing, #chatBottomButton.glowing {
-webkit-text-shadow: -1px 0 10px #00ccff,
0 1px 10px #00ccff,
1px 0 10px #00ccff,
0 -1px 10px #00ccff;
-moz-text-shadow: 1px 0 10px #00ccff,
0 1px 10px #00ccff,
1px 0 10px #00ccff,
0 -1px 10px #00ccff;
text-shadow: -1px 0 10px #00ccff,
0 1px 10px #00ccff,
1px 0 10px #00ccff,
0 -1px 10px #00ccff;
}
#toolbar_button_hangup {
color: #ff0000;
font-size: 1.4em;
}
#numberOfParticipants {
position: absolute;
top: 0px;
right: -1;
color: white;
width: 13px;
height: 13px;
line-height: 13px;
font-weight: bold;
border-radius: 2px;
font-size: 11px;
text-shadow: -1px 0 black, 0 1px black, 1px 0 black, 0 -1px black;
}
#contactListButton.active #numberOfParticipants {
color: #00ccff;
}
#toolbar_button_record {
-webkit-transition: all .5s ease-in-out;
-moz-transition: all .5s ease-in-out;
transition: all .5s ease-in-out;
}
/*#ffde00*/
#toolbar_button_record.active {
-webkit-text-shadow: -1px 0 10px #00ccff,
0 1px 10px #00ccff,
1px 0 10px #00ccff,
0 -1px 10px #00ccff;
-moz-text-shadow: 1px 0 10px #00ccff,
0 1px 10px #00ccff,
1px 0 10px #00ccff,
0 -1px 10px #00ccff;
text-shadow: -1px 0 10px #00ccff,
0 1px 10px #00ccff,
1px 0 10px #00ccff,
0 -1px 10px #00ccff;
}
a.button:hover,
a.bottomToolbarButton:hover {
top: 0px;
cursor: pointer;
background: rgba(255, 255, 255, 0.1);
border-radius: 6px;
background-clip: padding-box;
-webkit-border-radius: 6px;
-webkit-background-clip: padding-box;
}
.no-fa-video-camera, .fa-microphone-slash {
color: #636363;
}
.header_button_separator {
display: inline-block;
position:relative;
top: 5;
width: 1px;
height: 20px;
background: #373737;
}
.bottom_button_separator {
display: inline-block;
position: relative;
left: 5;
width: 20px;
height: 1px;
background: #373737;
}
input[type='text'], input[type='password'], textarea {
-webkit-user-select: text;
user-select: text;
display: inline-block;
font-size: 14px;
padding: 5px;
background: #f3f3f3;
border-radius: 3px;
font-weight: 100;
line-height: 20px;
height: 40px;
color: #333;
text-align: left;
border:1px solid #ACD8F0;
outline: none; /* removes the default outline */
resize: none; /* prevents the user-resizing, adjust to taste */
}
input[type='text'], input[type='password'], textarea:focus {
box-shadow: inset 0 0 3px 2px #ACD8F0; /* provides a more style-able
replacement to the outline */
}
textarea {
overflow: hidden;
word-wrap: break-word;
resize: horizontal;
}
button.no-icon {
padding: 0 1em;
}
button {
border: none;
height: 35px;
padding: 0 1em 0 2em;
position: relative;
border-radius: 3px;
font-weight: bold;
color: #fff;
line-height: 35px;
background: #2c8ad2;
}
button, input, select, textarea {
margin: 0;
vertical-align: baseline;
}
button, input[type="button"], input[type="reset"], input[type="submit"] {
cursor: pointer;
-webkit-appearance: button;
}
form {
display: block;
}
#downloadlog {
position: absolute;
bottom: 5;
left: 5;
overflow: visible;
z-index: 100;
color: rgba(255,255,255,.50);
}
#bottomToolbar {
display:block;
position: absolute;
right: 0;
margin-right: 5px;
bottom: 40px;
width: 29px;
border-radius: 6px;
color: #FFF;
border: 1px solid rgba(256, 256, 256, 0.2);
background: rgba(0,0,0,0.8);
z-index: 6; /*+1 from #remoteVideos*/
}
.bottomToolbarButton {
display: inline-block;
position: relative;
color: #FFFFFF;
top: 0;
padding-top: 6px;
margin: 2px;
width: 25px;
height: 20px;
cursor: pointer;
font-size: 10pt;
text-align: center;
text-shadow: 0px 1px 0px rgba(255,255,255,.3), 0px -1px 0px rgba(0,0,0,.7);
z-index: 1;
}
.active {
color: #00ccff;
}
.bottomToolbar_span>span {
display: inline-block;
position: absolute;
font-size: 7pt;
color: #ffffff;
text-align: center;
cursor: pointer;
}
.glow
{
text-shadow: 0px 0px 30px #06a5df, 0px 0px 10px #06a5df, 0px 0px 5px #06a5df,0px 0px 3px #06a5df;
}
.watermark {
display: block;
position: absolute;
top: 15;
width: 186px;
height: 74px;
background-size: contain;
background-repeat: no-repeat;
z-index: 2;
}
.leftwatermark {
display: none;
left: 15;
background-image:url(../images/watermark.png);
background-position: center left;
}
.rightwatermark {
display: none;
right: 15;
background-position: center right;
}
.poweredby {
display: none;
position: absolute;
left: 25;
bottom: 7;
font-size: 11pt;
color: rgba(255,255,255,.50);
text-decoration: none;
z-index: 100;
}
#toast-container.notification-bottom-right {
bottom: 120px;
right: 5px;
}
#toast-container.notification-bottom-right-center {
right: 205px;
}
#toast-container .toast-info {
-webkit-box-shadow: none;
box-shadow: none;
}
.toast-close-button {
right: -7px;
top: -19px;
}
#toast-container .toast-info {
background-color: black;
border: 1px solid #3a3a3a;
width: 220px;
padding: 10px 10px 10px 50px;
}
.connected {
color: forestgreen;
font-size: 12px;
}
.disconnected {
color: darkred;
font-size: 12px;
}
.lastN {
color: #a3a3a3;
font-size: 12px;
}
.toast-close-button:hover,
.toast-close-button:focus {
color: #ffffff;
opacity: 1;
-ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=100);
filter: alpha(opacity=100);
}
.toast-message .nickname {
font-weight: bold;
}

73
css/main.scss Normal file
View File

@@ -0,0 +1,73 @@
/* Functions BEGIN */
@import 'functions';
/* Functions END */
/* Variables BEGIN */
@import 'variables';
/* Variables END */
/* Mixins BEGIN */
@import "mixins";
/* Mixins END */
/* Animations BEGIN */
@import "animations";
/* Animations END */
/* Fonts BEGIN */
@import 'font';
@import 'font-awesome';
/* Fonts END */
/* Modules BEGIN */
@import 'toastr';
@import 'base';
@import 'utils';
@import 'overlay/overlay';
@import 'inlay';
@import 'reload_overlay/reload_overlay';
@import 'modals/dialog';
@import 'modals/feedback/feedback';
@import 'videolayout_default';
@import 'notice';
@import 'popup_menu';
@import 'recording';
@import 'login_menu';
@import 'popover';
@import 'jitsi_popover';
@import 'contact_list';
@import 'chat';
@import 'ringing/ringing';
@import 'welcome_page';
@import 'toolbars';
@import 'side_toolbar_container';
@import 'device_settings_dialog';
@import 'jquery.contextMenu';
@import 'keyboard-shortcuts';
@import 'redirect_page';
@import 'components/form-control';
@import 'components/link';
@import 'shortcuts/main';
@import 'components/button-control';
@import 'components/_input-control.scss';
@import "modals/invite/invite";
@import "connection-info";
@import 'aui-components/dropdown';
@import '404';
@import 'policy';
@import 'filmstrip';
@import 'unsupported-browser/unsupported-desktop-browser';
@import 'unsupported-browser/unsupported-mobile-browser';
/* Modules END */

78
css/modals/_dialog.scss Normal file
View File

@@ -0,0 +1,78 @@
.dialog {
visibility: visible;
height: auto;
h1, h2, h3, h4, h5, h6 {
color: $auiDialogColor;
}
.aui {
&-icon {
color: $auiDialogColor;
&-small {
width: 14px;
height: 14px;
}
}
&-iconfont-close-dialog {
cursor: pointer;
right: 20px;
position: absolute;
top: -49px;
}
&-dialog2 {
&-header, &-footer {
background-color: $auiDialogBg;
border: none;
}
&-header {
height: em(58, 12);
border-bottom: 1px solid $auiBorderColor;
h2 {
font-size: em(20, 12);
font-weight: $dialogTitleFontWeight;
color: $auiDialogColor;
}
&-main {
padding-right: 0;
}
}
&-footer {
border-top: 1px solid $auiBorderColor;
}
&-content {
font-size: em(14, 12);
min-height: 0;
background-color: $auiDialogContentBg;
color: $auiDialogColor;
p,span, h3 {
font-weight: $labelFontWeight;
}
&:last-child {
border-bottom-right-radius: 5px;
border-bottom-left-radius: 5px;
}
&:first-child {
border-top-right-radius: 5px;
border-top-left-radius: 5px;
}
}
}
}
.form-control:not(:last-child) {
border-bottom: 1px solid $auiBorderColor;
}
}

View File

@@ -0,0 +1,127 @@
@-webkit-keyframes shake-rotate {
0% {
-webkit-transform:scale(1) rotate(0deg);
transform:scale(1) rotate(0deg)
}
50% {
-webkit-transform:scale(.8) rotate(-5deg);
transform:scale(.8) rotate(-5deg)
}
to {
-webkit-transform:scale(1) rotate(3deg);
transform:scale(1) rotate(3deg)
}
}
@keyframes shake-rotate {
0% {
-webkit-transform:scale(1) rotate(0deg);
transform:scale(1) rotate(0deg)
}
50% {
-webkit-transform:scale(.8) rotate(-5deg);
transform:scale(.8) rotate(-5deg)
}
to {
-webkit-transform:scale(1) rotate(3deg);
transform:scale(1) rotate(3deg)
}
}
.shake-rotate {
display: inline-block;
-webkit-animation-duration: .4s;
animation-duration: .4s;
-webkit-animation-iteration-count: infinite;
animation-iteration-count: infinite;
-webkit-animation-name: shake-rotate;
animation-name: shake-rotate;
-webkit-animation-timing-function: ease-in-out;
animation-timing-function: ease-in-out
}
.feedback.aui-dialog2{
.aui-dialog2{
&-header {
background-color: $feedbackContentBg;
border-bottom-color: transparent;
padding-top: 30px;
h2 {
color: $feedbackTextColor;
text-align: center;
}
}
&-content {
background-color: $feedbackContentBg;
text-align: center;
padding: 10px 40px 20px 40px;
.input-control {
background-color: $feedbackInputBg;
color: $feedbackInputTextColor;
&::-webkit-input-placeholder {
color: $feedbackInputPlaceholderColor;
}
&::-moz-placeholder { /* Firefox 19+ */
color: $feedbackInputPlaceholderColor;
}
&:-ms-input-placeholder {
color: $feedbackInputPlaceholderColor;
}
}
.rating {
line-height: 1.2;
text-align: center;
margin-top: 10px;
.star-label {
height: 16px;
font-size: 14px;
color: $rateStarLabelColor;
}
.star-btn {
display: inline-block;
color: $rateStarDefault;
font-size: $rateStarSize;
position: relative;
cursor: pointer;
outline: none;
text-decoration: none;
@include transition(all .2s ease);
&.starHover,
&.active,
&:hover {
color: $rateStarActivity;
};
}
}
.details {
padding-left: 60px;
padding-right: 60px;
margin-top: 20px;
textarea {
min-height: 100px;
}
}
}
&-footer {
background-color: $feedbackContentBg;
border-top-color: transparent;
.button-control {
color: $feedbackCancelFontColor;
}
}
}
}

View File

@@ -0,0 +1,7 @@
/*
* Sets the default cursor the remove password link. The link doesn't use
* the href attribute, so we need to set the cursor manually.
*/
#inviteDialogRemovePassword {
cursor: hand;
}

36
css/overlay/_overlay.scss Normal file
View File

@@ -0,0 +1,36 @@
.overlay {
&__container,
&__container-light {
top: 0;
left: 0;
width: 100%;
height: 100%;
position: fixed;
z-index: $overlayZ;
background: $defaultBackground;
}
&__container-light {
@include transparentBg($defaultBackground, 0.7);
}
&__content {
position: absolute;
margin: 0 auto;
height: 100%;
width: 56%;
left: 50%;
@include transform(translateX(-50%));
&_bottom {
position: absolute;
bottom: 0;
}
}
&__policy {
position: absolute;
bottom: 24px;
width: 100%;
}
}

View File

@@ -1,72 +0,0 @@
/*Initialize*/
ul.popupmenu {
display:none;
position: absolute;
padding:10px;
margin: 0;
bottom: 0;
margin-bottom: 35px;
padding-bottom: 10px;
padding-top: 10px;
right: 10px;
left: -5px;
width: 100px;
background-color: rgba(0,0,0,0.9);
border: 1px solid rgba(256, 256, 256, 0.2);
border-radius:8px;
}
ul.popupmenu:after {
content: url('../images/popupPointer.png');
display: block;
position: absolute;
bottom: -8px;
left: 11px;
}
ul.popupmenu li {
list-style-type: none;
text-align: left;
}
ul.popupmenu li:hover {
background-color: rgba(256, 256, 256, .2);
border-radius:6px;
}
/*Link Appearance*/
ul.popupmenu li a {
text-decoration: none;
color: #fff;
padding: 5px;
display: inline-block;
font-size: 9pt;
}
ul.popupmenu li a i.icon-kick {
font-size: 8pt;
}
ul.popupmenu li a span {
display: inline-block;
width: 20px;
height: 16px;
text-align: center;
}
span.remotevideomenu:hover ul.popupmenu, ul.popupmenu:hover {
display:block !important;
}
a.disabled {
color: gray !important;
pointer-events: none;
}
.popupmenuPadding {
height: 35px;
width: 100px;
position: absolute;
bottom: -35;
left: 0px;
}

View File

@@ -0,0 +1,16 @@
.reload_overlay_title {
display: block;
font-size: 16px;
line-height: 20px;
}
.reload_overlay_msg {
display: block;
font-size: 12px;
line-height: 30px;
}
#reloadProgressBar {
width: 180px;
margin: 5px auto;
}

41
css/ringing/_ringing.scss Normal file
View File

@@ -0,0 +1,41 @@
.ringing {
display: block;
left: 0;
top: 0;
width: 100%;
height: 100%;
position: fixed;
z-index: $ringingZ;
background: linear-gradient(transparent, #000);
opacity: 0.8;
&.solidBG {
background: $defaultBackground;
opacity: 1;
}
&__content {
position: absolute;
width: 400px;
height: 250px;
left: 50%;
top: 50%;
margin-left: -200px;
margin-top: -125px;
font-weight: 400;
font-size: 14px;
text-align: center;
}
&__avatar {
width: 100px;
height: 100px;
border-radius: 50%;
}
&__caller-info {
.mention {
color: #333;
}
}
}

Some files were not shown because too many files have changed in this diff Show More