Commit Graph

2811 Commits

Author SHA1 Message Date
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