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
f72e3bf552
Fix TypeError when one of audioTracks or videoTracks was undefined
2016-06-09 12:38:30 +03:00
ef70ff7da0
Defines^2 the document encoding.
2016-06-08 23:51:45 -05:00
61fa2d8ed1
Merge pull request #682 from jitsi/fixes-ff-warnings
...
Defines the document encoding.
2016-06-08 23:49:02 -05:00
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
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
57815cb2fe
Unifrms messageHandler access and adds enable disable
2016-06-08 14:48:45 -05:00
346ff889ea
Merge pull request #679 from damencho/follow-me
...
Fixes follow-me to work without etherpad
2016-06-07 17:01:45 -05:00
165507b83a
Removes printing audio levels by default in debug mode and makes it optional.
2016-06-07 16:40:43 -05:00
955e01a750
Adds comments for processing nextOnStage.
2016-06-07 16:39:08 -05:00
ca62f9bec2
Adds a check to make follow me work without etherpad enabled.
2016-06-07 15:13:28 -05:00
c82bf2a19c
Merge pull request #678 from geekgonecrazy/master
...
Switch to https on iframe creation
2016-06-07 14:50:21 -05:00
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
81437263b4
Allow ssl variable to force https:// on the iframe
2016-06-06 23:06:37 -05:00
f883199f4f
Switch to https on iframe creation
2016-06-06 21:56:07 -05:00
207e6e1b7d
Merge pull request #666 from champtar/source-package
...
Fix missing base.html in source-package
2016-06-06 17:19:45 -05:00
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
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
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
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
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
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
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
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
c1a93afeaf
Log warning instead of error for audio output device change errors
2016-06-03 11:15:07 +03:00
b8d8ef5cfd
Merge pull request #670 from jitsi/handle-recording-errors
...
Handle recording errors
2016-06-02 18:18:42 -05:00
07c2e91ae2
Do not handle the actual error message yet
2016-06-02 17:12:40 -05:00
7e4b13fb44
Remove recorder errors import
2016-06-02 15:41:28 -05:00
69798848c0
Handle recording errors
2016-06-02 13:34:51 -05:00
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
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
ed9fd6c8fd
Adds property for initial jetty ssi configuration.
2016-06-02 12:27:47 -05:00
6c1349c501
Merge pull request #667 from jitsi/history_fix
...
Fixes unhandled error from history.pushState
2016-06-01 17:53:41 -05:00
6e34e33b0d
Fixes unhandled error from history.pushState
2016-06-01 17:47:24 -05:00
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
c29f9921a1
Merge pull request #662 from aaronkvanmeerten/master
...
make the chatArrow image reference relative
2016-05-27 11:03:20 -05:00
f574dbe056
Changes after code review
2016-05-27 18:49:26 +03:00
e6385bb95d
make the chatArrow image reference relative, allows for better base href support
2016-05-27 10:45:38 -05:00
ccdba03888
Minor fixes for error dialogs
2016-05-27 14:01:43 +03:00
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
448fcf36b6
Show dialog for GUM errors
2016-05-26 11:53:02 +03:00
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
7f9c4d6480
Merge pull request #659 from aaronkvanmeerten/master
...
SSI inclusion of config.js
2016-05-24 12:48:07 -05:00
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
0cf291d796
Handle Promise.reject for user cancel case
2016-05-23 16:46:41 -05:00
8418fc97f1
Commit from translate.jitsi.org by user champtar.: 203 of 203 strings translated (0 fuzzy).
2016-05-23 09:13:54 +00:00
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
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
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
hristoterezov
Любомир Маринов
tsareg
George Politis
yanas
damencho
Emil Ivov
Aaron Ogle
Aaron van Meerten
Paweł Domas
Etienne CHAMPETIER
bgrozev