OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
7,996 Commits
214 Branches
562 Tags
496 MiB
Commit Graph

7996 Commits (78af02b29b6ac127573caeb2c4b2897521f41146)

Author SHA1 Message Date
Richard van der Hoff 8be3862e68 Merge branch 'master' into develop 2017-11-28 10:29:40 +00:00
Richard van der Hoff a088e559d1 v0.11.2 2017-11-28 10:25:04 +00:00
Richard van der Hoff 36e663131b Prepare changelog for v0.11.2 2017-11-28 10:25:04 +00:00
Luke Barnard 0d5f7ef246 Avoid NPE 2017-11-28 10:12:46 +00:00
Luke Barnard 3342754a72 Catch and log errors from getting group profile 2017-11-28 10:11:25 +00:00
David Baker 81ae081f15
Merge pull request #1617 from turt2live/travis/granular-theme 
Pull the theme through the default process
 2017-11-27 18:07:09 +00:00
Richard van der Hoff 4a20185d64
Merge pull request #1633 from matrix-org/rav/handle_login_flows_better 
Ignore unrecognised login flows
 2017-11-27 18:05:04 +00:00
lukebarnard 9ed9422af8 Move group publication toggles to UserSettings 2017-11-27 17:24:42 +00:00
Richard van der Hoff 80b8cbb473 Ignore unrecognised login flows 
Update the Login component so that if it sees an unrecognised login flow, it
just ignores it and uses another one, so that riot can still be used with
homeservers supporting custom login types.
 2017-11-27 16:47:49 +00:00
David Baker 7826d0c61a
Merge pull request #1630 from aidalgol/redact-dialog-fix 
Rebase ConfirmRedactDialog on QuestionDialog
 2017-11-27 14:55:04 +00:00
David Baker 9c9e223191
Merge pull request #1629 from pafcu/fix-logging 
Fix logging of missing substitution variables
 2017-11-27 14:52:44 +00:00
David Baker e07c7e404e
Merge pull request #1632 from matrix-org/luke/rename-related-communities 
Rename Related Groups to improve readability
 2017-11-27 14:34:02 +00:00
lukebarnard 3635997090 Rename Related Groups to improve readability 2017-11-27 14:13:44 +00:00
Aidan Gauland 3358fdc906 Address eslint errors 
* Remove space before curly brace.
* Remove unused import.
 2017-11-26 16:04:24 +13:00
Aidan Gauland aaf8106e9e Rebase ConfirmRedactDialog on QuestionDialog 
Rewrite the ConfirmRedactDialog component to derive from the QuestionDialog component.
 2017-11-26 15:46:24 +13:00
Stefan Parviainen df8a8f61e2 Fix logging of missing substitution variables 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-11-23 20:19:38 +01:00
David Baker c002d3ff99
Merge pull request #1616 from pafcu/fix-presence-i18n 
Make PresenceLabel more easily translatable
 2017-11-22 17:17:52 +00:00
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