Commit Graph

454 Commits

Author SHA1 Message Date
Philipp Hancke 75b8c5b962 Merge branch 'master' into tracking
Conflicts:
	index.html
2014-09-12 13:18:54 +02:00
Philipp Hancke 1a1aea4669 Merge branch 'master' into tracking
Conflicts:
	index.html
2014-09-12 13:13:28 +02:00
George Politis ffaa9a62b8 Adds simulcast support in meet. 2014-09-11 14:26:46 +02:00
bgrozev 233f18cb78 Fix a log message. 2014-09-11 11:48:55 +03:00
bgrozev 312b7db6a0 Merge pull request #127 from fouksf/keyboard-shortcuts
Makes keyboard shortcuts active when chat is opened but not focused.
2014-09-10 18:25:54 +03:00
fo 58aeee750f Makes shortcuts active when chat is opened but not focused. 2014-09-10 16:54:01 +03:00
bgrozev a3a7bb2df0 Merge pull request #126 from fouksf/keyboard-shortcuts
Makes the keyboard shortcut class more readable.
2014-09-10 11:44:39 +03:00
fo 60ef0f033b Makes the keyboard shortcut class more readable. 2014-09-10 11:43:00 +03:00
hristoterezov 682ecf5874 Fixes version indexes of the scripts. 2014-09-09 15:49:53 +03:00
hristoterezov f01ea39ec8 Merge pull request #125 from fouksf/keyboard-shortcuts
Adds keyboard shorcuts support for mute/unmute, start/stop camera, toggl...
2014-09-09 15:44:27 +03:00
fo e633fed536 Adds keyboard shorcuts support for mute/unmute, start/stop camera, toggle chat, toggle film strip and push to talk functionality. 2014-09-09 12:52:51 +03:00
hristoterezov 3f00144f13 Moves Strophe.log from strophe.jingle.bundle.js to new file. 2014-09-09 11:35:00 +03:00
paweldomas 801f6fa039 Makes it possible to configure the sources of desktop video stream. 2014-09-09 09:10:22 +02:00
hristoterezov a28c785995 Merge pull request #124 from fouksf/hide-filmstrip
Fixes bug with no audio when film strip is hidden.
2014-09-08 18:58:37 +03:00
fo 7800487553 Fixes bug with no audio when film strip is hidden. 2014-09-08 18:51:50 +03:00
bgrozev ba8606df80 Enables rtcp-mux and bundle by default.
Allows TCP to be used if the bridge supports it.
2014-09-05 19:58:14 +03:00
hristoterezov cc725543fc Fixes the version indexes of the scripts. 2014-09-05 18:15:40 +03:00
hristoterezov 37d28b2d2d Merge pull request #120 from fouksf/chat-bug
Fix bug with chat and bottom toolbar.
2014-09-05 16:13:29 +03:00
Damian Minkov 02d283208b Fixes prosody config extract. 2014-09-05 16:11:53 +03:00
fo c9aebf6c1d Fix bug with chat and bottom toolbar. 2014-09-05 16:08:10 +03:00
Damian Minkov a201ef2823 Removes unused part of config. 2014-09-05 16:01:43 +03:00
Damian Minkov 427d6708ad Fixes prosody config extract. 2014-09-05 15:59:57 +03:00
Damian Minkov c456ef6cb2 Changes changelog with debian ITP bug to be closed. 2014-09-05 15:24:58 +03:00
Damian Minkov ae7403753f Changes default prosody config. 2014-09-05 15:24:58 +03:00
Damian Minkov 0680df56fd Changes default prosody config to be plain file, changes dependencies. 2014-09-05 15:24:58 +03:00
Damian Minkov 8330ba6939 Adds smileys files and use them. 2014-09-05 15:24:58 +03:00
hristoterezov 2436e4231c Merge pull request #118 from fouksf/hide-filmstrip
Hide film strip
2014-09-04 17:48:59 +03:00
fo 32fab4c222 Hide the bottom toolbar with the header toolbar if the film strip is hidden. 2014-09-04 17:32:19 +03:00
bgrozev e6961ef62d Merge pull request #114 from bill-auger/master
fix typos - syntax errors in config.js example
2014-09-04 16:51:20 +03:00
fo b5e066b44b Add a toggle button for the filmstrip in the bottom toolbar. 2014-09-04 16:33:41 +03:00
Damian Minkov e1f61ad1a5 Adds lintian-overrides. 2014-09-04 14:35:30 +03:00
Damian Minkov bd543c4b75 Fixes errors in postinst, not using our template and error about grep test. 2014-09-04 12:00:12 +03:00
Damian Minkov a03f43a881 Fixes errors in postinst. 2014-09-04 10:46:05 +03:00
bgrozev 18e7aa50ab Minor: remove hard-coded array length, simplify. 2014-09-03 20:40:47 +03:00
Damian Minkov a37a1dc750 Fixes lintian errors, template needs to be updated, remove executable bit from non executable files. 2014-09-03 18:26:51 +03:00
Damian Minkov 7765b9fe5e Fixes lintian errors. 2014-09-03 18:00:24 +03:00
Damian Minkov 086dfe9278 Removes unused files. 2014-09-03 16:49:36 +03:00
Damian Minkov cfa6ae33ee Adds check to skip generate certs if they already exists on update. 2014-09-03 12:52:08 +03:00
turint c5edb4b5a3 Fixes SSL debconf questions. 2014-09-03 12:52:08 +03:00
turint f0a237d537 Fixes debconf questions for SSL. 2014-09-03 12:52:08 +03:00
turint e994916b25 Fixes a typo. 2014-09-03 12:52:08 +03:00
turint eeb9df55d5 Adds missing templates. 2014-09-03 12:52:08 +03:00
turint d0b58b6d53 Adds certificate choices to debconf. 2014-09-03 12:52:08 +03:00
turint c5adfac561 Fixes jitsi-meet-prosody install dirs and jitsi-meet rules. 2014-09-03 12:52:07 +03:00
bill auger 55d4cfb66d fix typos - syntax errors in config.js example
* in the example code for config.js in INSTALL.md
  contains three key-value-pairs not present in the example file
  'config.js.example' - these were appended without inserting a comma
  and the last two of these were commented out without removing
  the trailing comma - the example file 'config.js.example' is correct
  but using the INSTALL.md version causes the page render to halt prematurely
  making login impossible
2014-09-03 00:51:44 +00:00
Philipp Hancke df9ac36aa0 retain localAudio + localVideo when re-establishing a connection. fixes a bug report by markus kilas 2014-09-02 21:11:54 +02:00
yanas ca0f006b4e Merge pull request #112 from fouksf/tooltips-fix
Fix bottom toolbar tooltips going out of the window. #106
2014-09-02 14:47:56 +02:00
hristoterezov 7f3332a82b Fixes the font size of the input field of the welcome page. 2014-09-02 15:10:31 +03:00
hristoterezov b82786947a Fixes some welcome page minor issues. 2014-09-02 13:42:35 +03:00
fo e956acf1fa Add fix to the tooltip library so tooltips never go out of the window. #106 2014-09-02 13:25:49 +03:00