Commit Graph

1195 Commits

Author SHA1 Message Date
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
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
yanas 084929f875 Merge pull request #1122 from jitsi/thumbnail-calculations
Thumbnail calculations
2016-11-08 17:40:46 -06:00
Дамян Минков 1f75683581 Merge pull request #1055 from BeatC/incorrect-password-hint
Incorrect password hint
2016-11-08 14:29:06 -06:00
yanas bb80bf4144 fix: Use a separate css class for thumbnail menu 2016-11-08 11:47:22 -06:00
Ilya Daynatovich f4e6dceaa4 Return Impormptu api when create dialog 2016-11-08 17:16:00 +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 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 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
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
paweldomas d256bc317a fix(log): log the page reload from one place 2016-11-03 16:18:05 -05:00
yanas c3e0d7ff56 Fix conflicts. 2016-11-03 14:42:23 -05:00
Ilya Daynatovich 8ba7a354e5 Remove duplicate event handler 2016-11-03 20:02:44 +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
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
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
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
Дамян Минков 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 16c70fddba Restyled toolbar splitter 2016-11-02 12:13:30 +02:00