d6688d8f12
Add jsdoc
2017-12-06 19:11:50 +00:00
2a01985076
better proptypes
2017-12-06 19:07:12 +00:00
0deed4bb88
null guard
2017-12-06 19:05:25 +00:00
1a3671d241
remove stray param
2017-12-06 19:04:29 +00:00
5bca5a7a8e
More underscore
2017-12-06 19:02:26 +00:00
e2f5e16fa7
Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show
2017-11-20 10:00:47 +00:00
292b912038
Merge pull request #1622 from turt2live/travis/even-more-granular-bugs
...
Fix granular URL previews
2017-11-18 12:25:12 +00:00
d010329f4a
Make the room-level URL preview notification explicit
...
Fixes https://github.com/vector-im/riot-web/issues/5638
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-17 22:03:06 -07:00
cdf5a6fb8a
Fix typo that prevented URL previews on a room-account level from being saved
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-17 22:02:33 -07:00
1675737e7d
Merge remote-tracking branch 'origin/master' into develop
2017-11-17 17:48:42 +00:00
394e450526
v0.11.1
2017-11-17 16:03:50 +00:00
c32b42886b
Prepare changelog for v0.11.1
2017-11-17 16:03:50 +00:00
8bd040a443
Released js-sdk
2017-11-17 15:58:05 +00:00
89f7357a36
Merge pull request #1621 from matrix-org/dbkr/fix_force_turn
...
Fix the force TURN option
2017-11-17 15:51:09 +00:00
6d23182f5f
Fix the force TURN option
...
The call object is created within the js-sdk for inbound calls, so
we never got the chance to set it.
2017-11-17 14:54:44 +00:00
d222992bef
Merge pull request #1619 from matrix-org/rav/fix_flairstore
...
Flairstore: Fix broken reference
2017-11-17 14:51:00 +00:00
c48994e981
Flairstore: Fix broken reference
2017-11-17 13:56:56 +00:00
65e1d49f37
More sensible buttons in UnknownDeviceDialog
...
Just say 'Send' (or equiv) if you actually verify all the devices,
rather than 'Send Anyway'.
2017-11-16 17:59:42 +00:00
3c8645871f
Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show
2017-11-16 16:47:15 +00:00
eea8a41ef9
Unused import
2017-11-16 16:20:13 +00:00
196eafdc7f
Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show
2017-11-16 15:59:16 +00:00
8ba9d26d4b
Don't set the call state to ended on error
...
This isn't always the case, eg. just because we fail to pick up,
the call is still ringing.
2017-11-16 15:42:46 +00:00
02629d13d9
Merge pull request #1615 from matrix-org/luke/fix-sender-profile-opacity
...
Do something more sensible for sender profile name/aux opacity
2017-11-16 15:35:16 +00:00
7ffb542cb5
Do something more sensible for sender profile name/aux opacity
...
- If no translation is needed, don't do it.
- For now, ignore the fact that this doens't allow us easily to put
Flair into "luke sent an image" but we don't kow where the flair
should go for this anyway.
2017-11-16 15:24:36 +00:00
6f8427a5af
Revert rest of https://github.com/matrix-org/matrix-react-sdk/pull/1584
...
Because apparently the revert did not revert this part
2017-11-16 15:11:47 +00:00
55867688a5
Merge pull request #1614 from matrix-org/luke/linting-keyword-spacing
...
Add eslint rule keyword-spacing
2017-11-16 13:36:16 +00:00
b54e563cb6
Merge branch 'develop' into luke/linting-keyword-spacing
2017-11-16 13:23:42 +00:00
dad797d4a2
Run linting --fix
2017-11-16 13:19:36 +00:00
c429b13b05
Add eslint rule keyword-spacing
...
Because we follow it almost all of the time.
2017-11-16 13:18:58 +00:00
30b8d0e807
Merge pull request #1613 from turt2live/travis/granular_bugs
...
Fix various issues surrounding granular settings to date
2017-11-16 13:13:09 +00:00
52e2c987e8
Merge branch 'develop' into travis/granular_bugs
2017-11-16 13:13:00 +00:00
f62b04c3be
Merge branch 'develop' into travis/granular_bugs
2017-11-16 13:12:03 +00:00
3e13a919ed
remove rogue debug
2017-11-16 13:09:53 +00:00
f99755378a
Merge pull request #1612 from matrix-org/t3chguy/state_events
...
differentiate between state events and message events
2017-11-16 13:06:36 +00:00
a80935e181
JSX does not do comments in a way one might expect
2017-11-16 11:45:40 +00:00
29e6627a75
Merge pull request #1608 from pafcu/simplify-translation
...
Refactor translations
2017-11-16 11:29:03 +00:00
342378f48a
Add space after if
2017-11-16 12:19:56 +01:00
af8ff1b888
Don't blindly hangup on a call error.
...
Not all errors means we want to send a hangup (in fact most don't,
but the most notable being when we fail to answer a call: we should
not then automatically reject it).
2017-11-16 11:07:57 +00:00
d0a0a9ce7f
Fix URL preview string not being translated
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-15 22:33:23 -07:00
fb1f20b7d4
Treat the master push rule as authoritative
...
Previously the push rule was ignored, leading to all kinds of interesting issues regarding notifications. This fixes those issues by giving the master push rule the authority it deserves for reasonable defaults.
Part 2 of the fix for:
* https://github.com/vector-im/riot-web/issues/5603
* https://github.com/vector-im/riot-web/issues/5606
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-15 22:33:23 -07:00
5976fb2eed
Treat null/undefined notification settings as "not set"
...
Otherwise we end up lying and saying notifications are disabled, despite the push rules saying otherwise.
Part 1 of the fix for:
* https://github.com/vector-im/riot-web/issues/5603
* https://github.com/vector-im/riot-web/issues/5606
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-15 22:08:13 -07:00
10a1d9cb29
Language is a local setting
...
Fixes https://github.com/vector-im/riot-web/issues/5611
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-15 21:16:12 -07:00
f141ee1944
Use the correct level order when getting arbitrary settings
...
This shouldn't currently be causing problems, but will in teh future. The bug can be exposed by having a setting where the level order is completely reversed, therefore causing LEVEL_ORDER[0] to actually be the most generic, not the most specific. Instead, we'll pull in the setting's level order and fallback to LEVEL_ORDER, therefore requesting the most specific value.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-15 19:24:32 -07:00
cf8ff6aed3
Validate that URL previews are explicitly enabled/disabled
...
Otherwise `!null` ends up being "true", therefore forcing URL previews on for everyone.
Fixes https://github.com/vector-im/riot-web/issues/5607
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-15 19:22:30 -07:00
022e40a127
Use SettingsStore for default theme
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-15 19:04:49 -07:00
2c1618bc10
Fix conflict and update strings
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-15 20:40:51 +01:00
5104ebfd29
Merge pull request #1611 from matrix-org/rxl881/invertOutlineColour
...
Make TintableSvg links behave like normal image links
2017-11-15 18:34:51 +00:00
b0027525f3
Wire up Unknown Devices popup for outbound calls
2017-11-15 17:21:04 +00:00
c0002e7778
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/state_events
2017-11-15 16:03:07 +00:00
5563b71c47
differentiate between state events and message events
...
so that people can't fake state event types and have them rendered.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-11-15 15:56:54 +00:00
David Baker