d3784b4925
Fix URL parameter encoding.
2017-11-07 12:33:38 +00:00
eb8c15075a
Fix url params parsing.
2017-11-07 11:58:38 +00:00
7a09127687
Alter group member api
...
To match https://github.com/matrix-org/synapse/pull/2647
2017-11-07 11:27:42 +00:00
70c4100350
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/widgetrendering
2017-11-07 11:04:05 +00:00
9019fee49e
Adjust long desc placeholder text
2017-11-07 10:48:56 +00:00
b92156a1ff
Translated using Weblate (French)
...
Currently translated at 100.0% (925 of 925 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-11-07 10:47:23 +00:00
5e9bb4353a
Merge remote-tracking branch 'origin/develop' into develop
2017-11-07 10:25:54 +00:00
47bf991471
Merge pull request #1577 from matrix-org/dbkr/composer_at_room_pills
...
Room notifs in autocomplete & composer
2017-11-07 10:25:48 +00:00
df5c6470e8
get dict syntax right
2017-11-06 22:01:23 +00:00
956c5ff343
Use a constant for easy reading of long desc placeholder
2017-11-06 18:52:55 +00:00
477051cfa6
Add placeholder for when a long desc hasn't been set
...
this is only visible to group admins.
2017-11-06 18:35:52 +00:00
137f1311b3
Add useful placeholder for the long description textarea
2017-11-06 18:35:23 +00:00
36cd22663a
Open group settings when the group is created
2017-11-06 18:02:50 +00:00
afc9c36e4e
Merge remote-tracking branch 'origin/develop' into develop
2017-11-06 18:02:44 +00:00
17ae37bd3b
Merge pull request #1579 from matrix-org/luke/fix-img-no-src-bug
...
Ignore img tags in HTML if src is not specified
2017-11-06 18:02:38 +00:00
d14f943629
Ignore img tags in HTML if src is not specified
...
This applies to HTML messages and group summaries.
2017-11-06 17:52:46 +00:00
16771cac4f
Merge remote-tracking branch 'origin/develop' into develop
2017-11-06 17:16:39 +00:00
029853d379
Merge pull request #1578 from matrix-org/luke/groups-admin-badges
...
Indicate admins in the group member list with a sheriff badge
2017-11-06 17:16:34 +00:00
08d006d112
PR feedback
2017-11-06 17:15:09 +00:00
d6a6e59d6c
Indicate admins in the group member list with a sheriff badge
2017-11-06 16:37:16 +00:00
41e7496ff1
unused var
2017-11-06 15:25:25 +00:00
adc4290451
Pillify room notif pills in composer
2017-11-06 15:11:42 +00:00
706981688a
Merge remote-tracking branch 'origin/develop' into develop
2017-11-06 14:29:30 +00:00
f1db564506
Merge pull request #1533 from anoadragon453/develop
...
Remember whether widget drawer was hidden per-room
2017-11-06 14:29:25 +00:00
0fdde954d4
Merge remote-tracking branch 'origin/develop' into develop
2017-11-06 13:02:51 +00:00
cb7b1268fe
Translated using Weblate (Ukrainian)
...
Currently translated at 10.6% (98 of 923 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
2017-11-06 13:02:51 +00:00
febeb0429e
Throw an error when trying to create a group store with falsey groupId
2017-11-06 10:18:10 +00:00
ae844a048f
Merge remote-tracking branch 'origin/develop' into develop
2017-11-04 15:42:03 +00:00
3fd5937687
Merge pull request #1571 from matrix-org/t3chguy/class-warning-thing
...
Fixes React warning
2017-11-04 15:41:57 +00:00
de6fc32a87
Show an indicator when there are any pins in the room
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-03 20:00:48 -06:00
a2b7f6d30e
Merge remote-tracking branch 'matrix-org/develop' into travis/pinned-notice
2017-11-03 19:57:39 -06:00
5c37155730
Don't assume we have a valid event.
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-03 18:18:09 -06:00
3656fdb571
Store read pinned events as an array to avoid racing saves.
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-03 18:12:57 -06:00
107f83f84f
Merge remote-tracking branch 'origin/develop' into develop
2017-11-03 22:44:22 +00:00
d4adff3d25
Merge pull request #1575 from matrix-org/luke/fix-flair-store-again
...
Fix Flair not appearing due to missing this._usersInFlight
2017-11-03 22:44:16 +00:00
6ddbaebb65
Translated using Weblate (French)
...
Currently translated at 100.0% (923 of 923 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-11-03 19:54:40 +00:00
da23afdec2
Better comment on FlairStore _usersInFlight
2017-11-03 18:48:15 +00:00
295bdae075
Merge remote-tracking branch 'origin/develop' into develop
2017-11-03 18:47:03 +00:00
ed586bedbc
Translated using Weblate (Czech)
...
Currently translated at 70.0% (647 of 923 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2017-11-03 18:47:02 +00:00
4d8f18742b
Check against non-existant promise to resolve a user's groups
2017-11-03 18:43:43 +00:00
d64fc4c842
Fix Flair not appearing due to missing this._usersInFlight
2017-11-03 18:19:10 +00:00
58f1757f0c
Handle rooms with no aliases or canonical alias
2017-11-03 17:52:36 +00:00
98312a4647
Use, if possible, a room's canonical or first alias when viewing the room
...
(Only affects rooms the user has never joined)
2017-11-03 17:37:13 +00:00
dad5023728
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (923 of 923 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-11-03 16:51:41 +00:00
6796b5b70c
Merge remote-tracking branch 'origin/develop' into develop
2017-11-03 16:15:06 +00:00
04614de139
Translated using Weblate (German)
...
Currently translated at 100.0% (923 of 923 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-03 16:15:05 +00:00
abff4ee6b5
Merge pull request #1573 from matrix-org/luke/groups-add-style-to-create-group-dialog
...
Add CSS classes to group ID input in CreateGroupDialog
2017-11-03 16:14:59 +00:00
b88c13d527
Use prefixed class names to avoid collisions with other libraries
2017-11-03 16:02:41 +00:00
e84e4ed5f5
Add CSS classes to group ID input in CreateGroupDialog
2017-11-03 15:38:12 +00:00
f96c0d8533
Translated using Weblate (German)
...
Currently translated at 100.0% (923 of 923 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-03 15:35:45 +00:00
49ee78dab1
Merge remote-tracking branch 'origin/develop' into dbkr/composer_at_room_pills
2017-11-03 14:39:52 +00:00
6a5162b047
Merge remote-tracking branch 'origin/develop' into develop
2017-11-03 14:30:06 +00:00
43a23d7e89
Merge pull request #1568 from matrix-org/dbkr/autocomplete_provider_room
...
Give autocomplete providers the room they're in
2017-11-03 14:29:59 +00:00
ec8afd185f
Merge remote-tracking branch 'origin/develop' into develop
2017-11-03 14:24:37 +00:00
2c9a93a8ac
Merge pull request #1572 from matrix-org/dbkr/fix_multiple_pills
...
Fix multiple pills on one line
2017-11-03 14:24:33 +00:00
802ab16746
Fix multiple pills on one line
2017-11-03 14:06:59 +00:00
1cc65044d4
Merge remote-tracking branch 'origin/develop' into develop
2017-11-03 13:54:04 +00:00
d0b3368445
Merge pull request #1570 from matrix-org/luke/fix-groups-invites-appearance
...
Fix group invites such that they look similar to room invites
2017-11-03 13:53:58 +00:00
b2cd65e182
Fixes React warning
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-11-03 12:30:58 +00:00
151f9917b1
Fix group invites such that they look similar to room invites
...
- Change GroupInviteTile to use RoomTile CSS
- Give group invites their own sub list, with heading "Community Invites"
2017-11-03 12:19:37 +00:00
41cd3f0412
Merge remote-tracking branch 'origin/develop' into develop
2017-11-03 12:03:18 +00:00
fefe157c56
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (922 of 922 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-11-03 12:03:17 +00:00
d43481d555
Translated using Weblate (German)
...
Currently translated at 99.8% (921 of 922 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-03 12:03:17 +00:00
71c59eff2c
Add a GeminiScrollbar to Your Communities
2017-11-03 11:19:29 +00:00
b559e123d7
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (922 of 922 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-11-02 21:41:04 +00:00
d4668d6c11
Translated using Weblate (French)
...
Currently translated at 100.0% (922 of 922 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-11-02 19:12:48 +00:00
112c74a255
Add NotifProvider to offer @room as a completion
2017-11-02 18:54:25 +00:00
853ada027d
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/widgetrendering
2017-11-02 18:34:46 +00:00
0e854ee356
Fix loading and initialisation spinners.
2017-11-02 18:33:11 +00:00
843d797ded
Better type checking
2017-11-02 18:17:57 +00:00
7f9967389d
Pass room into Autocompleter
2017-11-02 18:15:26 +00:00
6ad4bb80dd
==
2017-11-02 18:14:46 +00:00
3b58f0ca2a
Ignore removed events
2017-11-02 18:14:21 +00:00
ee43c635d1
phrasing
2017-11-02 18:11:18 +00:00
42589281d1
comment stub method
2017-11-02 18:10:13 +00:00
f7201e8dee
Revert unintentional changes
2017-11-02 18:08:24 +00:00
498b117d5a
copyrights
2017-11-02 18:01:28 +00:00
4953d4de4d
Give autocomplete providers the room they're in
...
Removes the gut-wrenching that RoomView does to jam the user list
into the user autocomplete provider.
2017-11-02 17:51:08 +00:00
a52bb9d603
Pass URL to check.
2017-11-02 17:27:59 +00:00
322cd6a2f8
Translated using Weblate (German)
...
Currently translated at 100.0% (922 of 922 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-02 16:35:11 +00:00
7bbae89235
Merge remote-tracking branch 'origin/develop' into develop
2017-11-02 16:09:12 +00:00
8800081cb9
Merge pull request #1567 from matrix-org/luke/fix-flair-store
...
Fix multiple requests for publicised groups of given user
2017-11-02 16:09:07 +00:00
21e09840dc
Fix multiple requests for publicised groups of given user
...
Previously, a single user could end up in multiple batches, which would have been fine if the logic didn't assume otherwise. If a request took longer than 200ms, multiple batches would occur with intersecting sets of users, deleting promises that were then assumed to exist.
The logic now takes all "in flight" users to also not be "pending". Pending now means that the user will be processed in the next batch. "In flight" means the user is part of an ongoing batch.
2017-11-02 15:59:26 +00:00
ff3a555802
Merge remote-tracking branch 'origin/develop' into develop
2017-11-02 15:38:08 +00:00
7c17ad8509
Merge pull request #1566 from matrix-org/luke/groups-room-publicity
...
Add toggle to alter visibility of a room-group association
2017-11-02 15:38:03 +00:00
982e87e01c
Communities are communities, wrap div for label alignment
2017-11-02 15:04:40 +00:00
b13bff77cb
Merge remote-tracking branch 'origin/develop' into develop
2017-11-02 14:23:05 +00:00
d698f9f8fd
Translated using Weblate (German)
...
Currently translated at 99.8% (918 of 919 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-02 14:23:04 +00:00
8895ab7e5b
Merge pull request #1564 from matrix-org/dbkr/pillify_at_room
...
Pillify room notifs in the timeline
2017-11-02 14:22:58 +00:00
bf77b51b5e
Merge branch 'develop' into luke/groups-room-publicity
2017-11-02 13:39:33 +00:00
790db94fd7
Add toggle to alter the visibility of a room-group association
2017-11-02 13:31:11 +00:00
8387fe7326
Merge remote-tracking branch 'origin/develop' into develop
2017-11-02 11:10:50 +00:00
d9f19726a3
Translated using Weblate (German)
...
Currently translated at 99.8% (918 of 919 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-02 11:10:49 +00:00
e909d859ab
Merge branch 'develop' into luke/groups-room-info
2017-11-02 10:56:33 +00:00
7ff50d01b8
Merge remote-tracking branch 'origin/develop' into develop
2017-11-01 22:18:10 +00:00
e68ab44596
Translated using Weblate (Russian)
...
Currently translated at 98.6% (907 of 919 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-11-01 22:18:10 +00:00
9b5fd76dc7
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (919 of 919 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-11-01 22:18:10 +00:00
b2ccf3fdf7
Translated using Weblate (German)
...
Currently translated at 96.5% (887 of 919 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-01 22:18:09 +00:00
815b42f0ac
Merge pull request #1565 from matrix-org/matthew/group-promise-npe
...
turn NPE on flair resolution errors into a logged error
2017-11-01 22:18:05 +00:00
7d7cd30e46
turn NPE on flair resolution errors into a logged error
2017-11-01 22:10:03 +00:00
6586a6ff36
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (919 of 919 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-11-01 20:44:43 +00:00
44e408ca91
Translated using Weblate (French)
...
Currently translated at 100.0% (919 of 919 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-11-01 19:59:55 +00:00
4f8d6d8fbe
Pillify room notifs in the timeline
...
This scans text nodes in the DOM for room notifications and turns
them into pills. Changes the pillification code around a bit so it
works with text nodes. Uses the push processor directly to test
the event against the room notifiation rule so we know whether
this event would actually trigger a room notification (needs to
hook into push at a lower level because otherwise our own room
notifications would not pillify since our own events never
generate notifications).
Requires https://github.com/matrix-org/matrix-js-sdk/pull/565
2017-11-01 19:42:47 +00:00
80f79e6b84
Generate translations
2017-11-01 17:58:45 +00:00
fe495db6e2
Merge remote-tracking branch 'origin/develop' into develop
2017-11-01 17:44:09 +00:00
64a369216a
Implement simple GroupRoomInfo
...
which replaces the "X" on the GroupRoomTile with "Remove from community" under Admin Tools.
2017-11-01 17:27:35 +00:00
0dcd52d88f
Fix some react warnings firing
2017-11-01 17:12:22 +00:00
e1e4fc2dac
Make eslint happy
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-01 16:18:48 +01:00
15bafd6818
Convert from weblate to counterpart at runtime to make tests happy
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-01 15:55:58 +01:00
d6f1e12bee
Fix merge conflict
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-01 15:50:45 +01:00
ccf4150b43
Merge remote-tracking branch 'origin/develop' into develop
2017-11-01 11:44:33 +00:00
ec260fb70c
Translated using Weblate (German)
...
Currently translated at 100.0% (913 of 913 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-01 11:44:32 +00:00
047bf6e4dd
Redact group IDs from analytics
2017-11-01 11:30:25 +00:00
9ee7a2ea70
Translated using Weblate (German)
...
Currently translated at 100.0% (913 of 913 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-31 23:44:18 +00:00
1faf6770b7
Translated using Weblate (Russian)
...
Currently translated at 100.0% (913 of 913 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-10-31 19:12:38 +00:00
8cace59088
Merge remote-tracking branch 'origin/develop' into develop
2017-10-31 17:29:42 +00:00
33cffdae7a
Translated using Weblate (French)
...
Currently translated at 91.3% (834 of 913 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-10-31 17:29:41 +00:00
f4d277fbd0
Translated using Weblate (Czech)
...
Currently translated at 70.0% (640 of 913 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2017-10-31 17:29:41 +00:00
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
17c0405862
Restructure to pass props from componentWillRecieveProps.
2017-10-31 16:31:46 +00:00
16dca08b77
Use constants instead of string literals
2017-10-31 16:13:13 +00:00
73f3aa8680
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (913 of 913 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-10-31 16:02:50 +00:00
f1ac0f5c75
Translated using Weblate (French)
...
Currently translated at 89.5% (818 of 913 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-10-31 14:49:52 +00:00
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
d6cbc44e0f
If groupRoomsLoading, replace RoomDetailList entirely with Spinner
2017-10-31 14:21:00 +00:00
13d418fd8e
Merge remote-tracking branch 'origin/develop' into develop
2017-10-31 13:27:43 +00:00
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
45e15fd865
Merge branch 'develop' into luke/groups-expose-ready-state
2017-10-31 11:50:12 +00:00
302bd6c3e9
Escape dash in regex
2017-10-31 11:48:56 +00:00
465b95defe
Merge remote-tracking branch 'origin/develop' into develop
2017-10-31 11:47:23 +00:00
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
20bf69c3c2
Prevent non-members from opening group settings
2017-10-31 10:54:44 +00:00
758df29b23
Fix onLoad on wrong element.
2017-10-31 10:43:17 +00:00
35b33263ea
Use querystring lib
2017-10-31 10:37:40 +00:00
f53a12d904
Generate en_EN translations
2017-10-31 10:25:48 +00:00
53938f7998
Change client-side validation of group IDs to match synapse
2017-10-31 10:25:06 +00:00
1cb878bb57
Formatting
2017-10-31 10:04:37 +00:00
648b295971
Removed comment
2017-10-31 10:04:02 +00:00
c8b5a0068c
Merge remote-tracking branch 'origin/develop' into develop
2017-10-30 18:23:15 +00:00
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
1c71b72ff8
Merge remote-tracking branch 'origin/develop' into develop
2017-10-30 18:03:28 +00:00
27558b7d4b
Translated using Weblate (German)
...
Currently translated at 100.0% (912 of 912 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-30 18:03:27 +00:00
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
839d0dd5d5
Merge remote-tracking branch 'origin/develop' into develop
2017-10-30 17:28:06 +00:00
36d5c58426
Translated using Weblate (German)
...
Currently translated at 100.0% (912 of 912 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-30 17:28:06 +00:00
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
5ea19e2751
Log errors from other login attempts
2017-10-30 17:15:27 +00:00
6874f313e3
log login errors
2017-10-30 17:04:21 +00:00
3e64333ada
Only show admin tools to privileged users
2017-10-30 16:45:45 +00:00
3be7dc854e
Merge remote-tracking branch 'origin/develop' into develop
2017-10-30 16:35:38 +00:00
Richard Lewis