David Baker
a784abd57f
Comment typo
2017-11-22 17:13:18 +00:00
David Baker
c648b471ed
Merge pull request #1618 from pafcu/fix-substitution
...
Perform substitution on all parts, not just the last one
2017-11-22 17:12:14 +00:00
Richard van der Hoff
dff76f7db1
Merge pull request #1552 from matrix-org/t3chguy/header_access_token
...
Send Access Token in Headers to help prevent it being spit out in errors
2017-11-22 16:44:36 +00:00
Matthew Hodgson
d4feca5dfb
Merge pull request #1628 from pafcu/label-actionbuttons
...
Add aria-labels to ActionButtons
2017-11-21 18:46:07 +00:00
Richard van der Hoff
b2e80a8ee2
Merge pull request #1620 from matrix-org/rav/fix_memberpresence_avatar
...
MemberPresenceAvatar: fix null references
2017-11-21 17:42:13 +00:00
Richard van der Hoff
91dbe956c6
Merge pull request #1623 from turt2live/travis/presence-break
...
Disable presence controls if there's no presence
2017-11-21 17:40:31 +00:00
Travis Ralston
5f3fda2950
Update MemberPresenceAvatar.js
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-21 09:01:56 -07:00
Matthew Hodgson
361e4c81a9
Merge pull request #1627 from krombel/patch-1
...
Fix GroupMemberList search for users without displayname
2017-11-20 16:05:39 +00:00
krombel
7c5f74e18a
Fix GroupMemberList search for users without displayname
...
When there is a user in a group which has no displayname set
the search failed with "Cannot read property 'toLowerCase' of null"
2017-11-20 17:02:20 +01:00
David Baker
89105aed6b
Merge pull request #1626 from matrix-org/luke/remove-flair-store-super-class
...
Remove redundant super class EventEmitter for FlairStore
2017-11-20 13:41:54 +00:00
lukebarnard
2913d396ef
Remove redundant super class EventEmitter for FlairStore
...
, which seemingly is not being used.
2017-11-20 11:34:20 +00:00
David Baker
e2f5e16fa7
Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show
2017-11-20 10:00:47 +00:00
Peter Vágner
093f110199
Make the toggle button on the memberEventListSummary translatable
2017-11-18 17:48:57 +01:00
Peter Vágner
184b29daf8
Revert "Make the disabled PowerSelector element showing custom value translatable. Fixes #5547 "
...
This reverts commit 681f43913a
2017-11-18 16:58:36 +01:00
Matthew Hodgson
292b912038
Merge pull request #1622 from turt2live/travis/even-more-granular-bugs
...
Fix granular URL previews
2017-11-18 12:25:12 +00:00
Travis Ralston
28ff0a4ee7
Disable presence controls if there's no presence
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-17 22:25:15 -07:00
Travis Ralston
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
Travis Ralston
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
David Baker
1675737e7d
Merge remote-tracking branch 'origin/master' into develop
2017-11-17 17:48:42 +00:00
David Baker
394e450526
v0.11.1
2017-11-17 16:03:50 +00:00
David Baker
c32b42886b
Prepare changelog for v0.11.1
2017-11-17 16:03:50 +00:00
David Baker
8bd040a443
Released js-sdk
2017-11-17 15:58:05 +00:00
David Baker
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
David Baker
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
Luke Barnard
d222992bef
Merge pull request #1619 from matrix-org/rav/fix_flairstore
...
Flairstore: Fix broken reference
2017-11-17 14:51:00 +00:00
Richard van der Hoff
4e7fd55fb4
MemberPresenceAvatar: fix null references
...
avoid assuming that `member` has a `user`
2017-11-17 14:35:33 +00:00
Richard van der Hoff
c48994e981
Flairstore: Fix broken reference
2017-11-17 13:56:56 +00:00
Stefan Parviainen
8090aadb0e
Add aria-labels to ActionButtons
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-17 14:33:39 +01:00
Stefan Parviainen
414ee82582
Perform substitution on all parts, not just the last one
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
This way the substitutions don't need to appear in the same order in the
translated string.
2017-11-17 08:47:31 +01:00
Travis Ralston
33a3b07d88
Pull the theme through the default process
...
This is to ensure the `config` level is respected.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-16 20:52:12 -07:00
David Baker
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
Stefan Parviainen
df921438f3
Make PresenceLabel more easily translatable
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-16 18:36:54 +01:00
David Baker
3c8645871f
Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show
2017-11-16 16:47:15 +00:00
David Baker
eea8a41ef9
Unused import
2017-11-16 16:20:13 +00:00
David Baker
196eafdc7f
Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show
2017-11-16 15:59:16 +00:00
David Baker
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
David Baker
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
Luke Barnard
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
David Baker
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
David Baker
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
Luke Barnard
b54e563cb6
Merge branch 'develop' into luke/linting-keyword-spacing
2017-11-16 13:23:42 +00:00
Luke Barnard
dad797d4a2
Run linting --fix
2017-11-16 13:19:36 +00:00
Luke Barnard
c429b13b05
Add eslint rule keyword-spacing
...
Because we follow it almost all of the time.
2017-11-16 13:18:58 +00:00
Matthew Hodgson
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
Matthew Hodgson
52e2c987e8
Merge branch 'develop' into travis/granular_bugs
2017-11-16 13:13:00 +00:00
Matthew Hodgson
f62b04c3be
Merge branch 'develop' into travis/granular_bugs
2017-11-16 13:12:03 +00:00
Matthew Hodgson
3e13a919ed
remove rogue debug
2017-11-16 13:09:53 +00:00
Luke Barnard
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
Luke Barnard
a80935e181
JSX does not do comments in a way one might expect
2017-11-16 11:45:40 +00:00
Luke Barnard
29e6627a75
Merge pull request #1608 from pafcu/simplify-translation
...
Refactor translations
2017-11-16 11:29:03 +00:00
