Commit graph

7253 commits

Author SHA1 Message Date
Matthew Hodgson
b3a7d25ef8 lint hell 2017-11-01 15:31:44 +00:00
Matthew Hodgson
64d8c81897 Merge branch 'develop' into matthew/status 2017-11-01 15:24:30 +00:00
Matthew Hodgson
1ae9103d78 evil evil hack to temporarily hide avatar changes in status autojoin rooms 2017-11-01 15:24:02 +00:00
Luke Barnard
44aea85792
Merge pull request #1562 from matrix-org/luke/redact-group-ids
Redact group IDs from analytics
2017-11-01 11:44:27 +00:00
Luke Barnard
047bf6e4dd Redact group IDs from analytics 2017-11-01 11:30:25 +00:00
David Baker
273aae207a
Merge pull request #1560 from matrix-org/luke/groups-expose-ready-state
Display whether the group summary/room list is loading
2017-10-31 17:29:36 +00:00
Luke Barnard
16dca08b77 Use constants instead of string literals 2017-10-31 16:13:13 +00:00
Luke Barnard
5bfed67463 Merge branch 'luke/groups-expose-ready-state' of github.com:matrix-org/matrix-react-sdk into luke/groups-expose-ready-state 2017-10-31 14:25:10 +00:00
Luke Barnard
d6cbc44e0f If groupRoomsLoading, replace RoomDetailList entirely with Spinner 2017-10-31 14:21:00 +00:00
David Baker
f24c64f071
Merge pull request #1558 from matrix-org/luke/fix-client-side-validation-group-id
Change client-side validation of group IDs to match synapse
2017-10-31 13:27:38 +00:00
Luke Barnard
45e15fd865
Merge branch 'develop' into luke/groups-expose-ready-state 2017-10-31 11:50:12 +00:00
Luke Barnard
302bd6c3e9 Escape dash in regex 2017-10-31 11:48:56 +00:00
Luke Barnard
a7170ef73c
Merge pull request #1559 from matrix-org/luke/fix-block-group-settings-if-non-member
Prevent non-members from opening group settings
2017-10-31 11:47:18 +00:00
Luke Barnard
775468e71a Display whether the group summary/room list is loading
This uses a `ready` flag assigned to each fetching API used by the GroupServer. I've avoided making this generic for now for want of not doing so early.
2017-10-31 11:42:09 +00:00
Luke Barnard
20bf69c3c2 Prevent non-members from opening group settings 2017-10-31 10:54:44 +00:00
Luke Barnard
f53a12d904 Generate en_EN translations 2017-10-31 10:25:48 +00:00
Luke Barnard
53938f7998 Change client-side validation of group IDs to match synapse 2017-10-31 10:25:06 +00:00
David Baker
deebd4cbcf
Merge pull request #1556 from matrix-org/luke/groups-disinvite
Alter UI for disinviting a group member
2017-10-30 18:23:11 +00:00
Luke Barnard
4e234cfc3b Alter UI for disinviting a group member
The same API as kicking is used for disinviting, so only cosmetic changes needed here.
2017-10-30 18:17:35 +00:00
Luke Barnard
19b798be10
Merge pull request #1555 from matrix-org/luke/groups-fix-admin-tools
Only show admin tools to privileged users
2017-10-30 18:03:24 +00:00
Luke Barnard
c655e82867
Merge pull request #1550 from matrix-org/dbkr/try_lowercase_username
Try lowercase username on login
2017-10-30 17:28:00 +00:00
David Baker
5ea19e2751 Log errors from other login attempts 2017-10-30 17:15:27 +00:00
David Baker
6874f313e3 log login errors 2017-10-30 17:04:21 +00:00
Luke Barnard
3e64333ada Only show admin tools to privileged users 2017-10-30 16:45:45 +00:00
David Baker
dfa782280c
Merge pull request #1554 from matrix-org/dbkr/pw_change_prevent_default
Don't refresh page on password change prompt
2017-10-30 16:35:32 +00:00
David Baker
57d516f042 Don't refresh page on password change prompt
It's on the form submit but missing a preventDefault
2017-10-30 16:28:27 +00:00
David Baker
9dd77af5ef
Merge pull request #1553 from matrix-org/luke/groups-fix-initial-avatar
Fix initial in GroupAvatar in GroupView
2017-10-30 15:12:19 +00:00
Luke Barnard
14d600a69f Fix initial in GroupAvatar in GroupView 2017-10-30 15:04:12 +00:00
Matthew Hodgson
672fbb2873 hopefully fix NPE on toLowerCase 2017-10-28 18:33:38 +01:00
David Baker
063ab7e9b7 Merge branch 'dbkr/try_lowercase_username' into matthew/status 2017-10-27 19:09:31 +01:00
David Baker
858c3a2548 Merge remote-tracking branch 'origin/develop' into matthew/status 2017-10-27 18:59:57 +01:00
David Baker
b437a2559d PR feedback 2017-10-27 18:59:13 +01:00
David Baker
580d8dce19
Merge pull request #1549 from matrix-org/luke/groups-fix-mygroups-avatar-scale-method
Use "crop" method to scale group avatars in MyGroups
2017-10-27 18:40:19 +01:00
David Baker
5312a869e4 Try lowercase username on login
Fixes https://github.com/vector-im/riot-web/issues/5446
2017-10-27 18:36:59 +01:00
Luke Barnard
5209f29a5c Use "crop" method to scale group avatars in MyGroups 2017-10-27 18:27:54 +01:00
Luke Barnard
27083df0f9
Merge pull request #1547 from matrix-org/dbkr/username_to_lower
Lowercase all usernames
2017-10-27 18:01:32 +01:00
David Baker
4eb8fe3e6a Lowercase all usernames
As synapse doesn't accept usernames with capitals in them now

Fixes https://github.com/vector-im/riot-web/issues/5445
2017-10-27 17:49:44 +01:00
Luke Barnard
47c395ec06
Merge pull request #1546 from matrix-org/luke/fix-MELS-plural-strings-in-tests
Add sensible missing entry generator for MELS tests
2017-10-27 17:26:08 +01:00
Luke Barnard
8a64123ab8 Add sensible missing entry generator for MELS tests
Fixes vector-im/riot-web#5426 (because we don't test plurals anywhere else)
2017-10-27 16:55:13 +01:00
Luke Barnard
55e8f16ee3
Merge pull request #1545 from matrix-org/dbkr/fix_chat_reuse_prompt
Fix prompt to re-use chat room
2017-10-27 16:42:48 +01:00
David Baker
2f3e0fb049 Lint 2017-10-27 16:29:56 +01:00
David Baker
5d0b9d73b4 Fix prompt to re-use chat room
I managed to lose this when refactoring ChatInviteDialog in
https://github.com/matrix-org/matrix-react-sdk/pull/1300

Fixes https://github.com/vector-im/riot-web/issues/5119
2017-10-27 16:20:17 +01:00
Luke Barnard
b421fd05ef
Merge pull request #1544 from matrix-org/luke/groups-store-add-unregister-api
Add unregiseterListener to GroupStore
2017-10-27 16:10:27 +01:00
Luke Barnard
175fadbb57 Add unregiseterListener to GroupStore 2017-10-27 15:08:38 +01:00
Matthew Hodgson
5d0629ff73 resolve matrix.status.im v. matrix.org confusion 2017-10-27 14:23:16 +01:00
Luke Barnard
a7379db1c2 Merge pull request #1543 from matrix-org/luke/fix-groups-invited-users-err-for-non-members
Fix groups invited users err for non members
2017-10-27 11:48:26 +01:00
Luke Barnard
5d0aa8d7f7 Handle 403 when inspecting invited users as non-member 2017-10-27 11:38:10 +01:00
Luke Barnard
e094c32c62 Simplify GroupStore listener registration 2017-10-27 11:38:10 +01:00
Matthew Hodgson
e3f896c5e0 don't forget login prompt class 2017-10-27 01:35:21 +01:00
Matthew Hodgson
1bf3ef6de4 fix password reset 2017-10-27 01:23:50 +01:00