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