Matthew Hodgson
3b1726657f
Merge pull request #1586 from turt2live/travis/message-pinning-fix1
...
Default to no read pins if there is no applicable account data
2017-11-07 18:24:21 +00:00
Weblate
343ffa6b97
Merge remote-tracking branch 'origin/develop' into develop
2017-11-07 18:16:04 +00:00
David Baker
49a935881f
Merge pull request #1584 from matrix-org/dbkr/udd_devices_from_sdk
...
UnknownDeviceDialog: get devices from SDK
2017-11-07 18:15:59 +00:00
Travis Ralston
e0ddd88ec9
Default to no read pins if there is no applicable account data
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-07 11:14:27 -07:00
Weblate
ffd83f1faf
Merge remote-tracking branch 'origin/develop' into develop
2017-11-07 17:56:17 +00:00
Andrey
002086de69
Translated using Weblate (Russian)
...
Currently translated at 98.7% (914 of 926 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-11-07 17:56:16 +00:00
Matthew Hodgson
e14e0bf200
Merge pull request #1486 from turt2live/travis/pinned-notice
...
Add a small indicator for when a new event is pinned
2017-11-07 17:56:12 +00:00
David Baker
10f15dfc56
Unmounted guard
2017-11-07 17:10:40 +00:00
Luke Barnard
80d4873542
Disable RoomDetailList in GroupView when editing
...
Otherwise the rooms can be clicked on.
2017-11-07 16:54:28 +00:00
Luke Barnard
ed709f52d1
Use the getProfileInfo API for group inviter profile
2017-11-07 16:42:43 +00:00
David Baker
ec560345c7
UnknownDeviceDialog: get devices from SDK
...
rather than having to have the error message passed in.
This is in preparation for not having the dialog pop up straight
away when a message isn't sent so we don't have to keep the error
object knocking around somewhere.
2017-11-07 16:37:43 +00:00
Travis Ralston
142d23a099
Cap the read pin event IDs to 10
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-07 09:16:19 -07:00
Kévin C
2c096f45c2
Translated using Weblate (French)
...
Currently translated at 100.0% (926 of 926 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-11-07 15:34:05 +00:00
Krombel
ed34c1cc63
Translated using Weblate (German)
...
Currently translated at 100.0% (926 of 926 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-07 15:24:45 +00:00
Weblate
397d7724e5
Merge remote-tracking branch 'origin/develop' into develop
2017-11-07 15:22:40 +00:00
Andrey
a8ff8973f8
Translated using Weblate (Russian)
...
Currently translated at 98.4% (911 of 925 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-11-07 15:22:39 +00:00
Luke Barnard
4d9f946388
Merge pull request #1582 from matrix-org/luke/group-rooms-tooltip
...
Implement tooltip for group rooms
2017-11-07 15:22:35 +00:00
Luke Barnard
646cabf324
Add missing whitespace
2017-11-07 15:15:10 +00:00
Luke Barnard
ddc1ff2f23
Name things in a sane way
2017-11-07 15:13:26 +00:00
Luke Barnard
62305a1ccd
Implement tooltip for group rooms
2017-11-07 14:07:31 +00:00
Krombel
3e29a26766
Translated using Weblate (German)
...
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/de/
2017-11-07 13:33:46 +00:00
Richard Lewis
96de72ab44
Switch to using existing dep "qs" and record in package.json
2017-11-07 12:45:12 +00:00
Richard Lewis
d3784b4925
Fix URL parameter encoding.
2017-11-07 12:33:38 +00:00
Richard Lewis
eb8c15075a
Fix url params parsing.
2017-11-07 11:58:38 +00:00
Luke Barnard
7a09127687
Alter group member api
...
To match https://github.com/matrix-org/synapse/pull/2647
2017-11-07 11:27:42 +00:00
Richard Lewis
70c4100350
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/widgetrendering
2017-11-07 11:04:05 +00:00
Luke Barnard
9019fee49e
Adjust long desc placeholder text
2017-11-07 10:48:56 +00:00
Kévin C
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
Weblate
5e9bb4353a
Merge remote-tracking branch 'origin/develop' into develop
2017-11-07 10:25:54 +00:00
Luke Barnard
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
David Baker
df5c6470e8
get dict syntax right
2017-11-06 22:01:23 +00:00
Luke Barnard
956c5ff343
Use a constant for easy reading of long desc placeholder
2017-11-06 18:52:55 +00:00
Luke Barnard
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
Luke Barnard
137f1311b3
Add useful placeholder for the long description textarea
2017-11-06 18:35:23 +00:00
Luke Barnard
36cd22663a
Open group settings when the group is created
2017-11-06 18:02:50 +00:00
Weblate
afc9c36e4e
Merge remote-tracking branch 'origin/develop' into develop
2017-11-06 18:02:44 +00:00
Matthew Hodgson
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
Luke Barnard
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
Weblate
16771cac4f
Merge remote-tracking branch 'origin/develop' into develop
2017-11-06 17:16:39 +00:00
David Baker
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
David Baker
08d006d112
PR feedback
2017-11-06 17:15:09 +00:00
Luke Barnard
d6a6e59d6c
Indicate admins in the group member list with a sheriff badge
2017-11-06 16:37:16 +00:00
David Baker
41e7496ff1
unused var
2017-11-06 15:25:25 +00:00
David Baker
adc4290451
Pillify room notif pills in composer
2017-11-06 15:11:42 +00:00
Weblate
706981688a
Merge remote-tracking branch 'origin/develop' into develop
2017-11-06 14:29:30 +00:00
Richard Lewis
f1db564506
Merge pull request #1533 from anoadragon453/develop
...
Remember whether widget drawer was hidden per-room
2017-11-06 14:29:25 +00:00
Weblate
0fdde954d4
Merge remote-tracking branch 'origin/develop' into develop
2017-11-06 13:02:51 +00:00
Walter
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
David Baker
48def50fec
Merge pull request #1576 from matrix-org/luke/throw-on-undefined-group
...
Throw an error when trying to create a group store with falsey groupId
2017-11-06 13:02:46 +00:00
Luke Barnard
febeb0429e
Throw an error when trying to create a group store with falsey groupId
2017-11-06 10:18:10 +00:00
