Commit Graph

62531 Commits

Author SHA1 Message Date
Szimszon 4e717f38d7 Translated using Weblate (Hungarian)
Currently translated at 100.0% (928 of 928 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-11-07 19:41:02 +00:00
Weblate 17e7dc8eed Merge remote-tracking branch 'origin/develop' into develop 2017-11-07 18:55:38 +00:00
Luke Barnard 8fbe50a1cf Merge pull request #1580 from matrix-org/luke/groups-new-group-settings
Improve group creation UX
2017-11-07 18:55:34 +00:00
Weblate 51ec12bfe9 Merge remote-tracking branch 'origin/develop' into develop 2017-11-07 18:53:08 +00:00
Luke Barnard d777e370f2 Merge pull request #1583 from matrix-org/luke/groups-disable-rooms-whilst-editing
Disable RoomDetailList in GroupView when editing
2017-11-07 18:53:04 +00:00
Weblate 38b5b27aa9 Merge remote-tracking branch 'origin/develop' into develop 2017-11-07 18:52:43 +00:00
Matthew Hodgson c7dba61d92 Merge pull request #5511 from turt2live/travis/more-pinned-css
CSS for pinned indicators
2017-11-07 18:52:39 +00:00
Luke Barnard edc744067f Add checkbox to GroupAddressPicker for determining visibility of group rooms 2017-11-07 18:51:41 +00:00
Luke Barnard 26d9677bbe CSS for adding rooms to a group with visibility
Also, make chat invite error looks slightly more normal
2017-11-07 18:49:28 +00:00
Weblate 85ea67494c Merge remote-tracking branch 'origin/develop' into develop 2017-11-07 18:24:25 +00:00
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
Travis Ralston beddf3a2cb Get rid of accidental merge stuff
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-07 11:05:29 -07:00
Travis Ralston 144cbd144e Merge branch 'develop' into travis/more-pinned-css 2017-11-07 11:04:22 -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 1bdc666197 Adjust CSS for GroupView
Part of showing the group inviter profile: https://github.com/matrix-org/matrix-react-sdk/pull/1585
2017-11-07 16:43:02 +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
Weblate a72cc77e24 Merge remote-tracking branch 'origin/develop' into develop 2017-11-07 15:54:51 +00:00
Krombel 4c22f9a549 Translated using Weblate (German)
Currently translated at 100.0% (217 of 217 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2017-11-07 15:54:50 +00:00
Luke Barnard f280fe3c66 Merge pull request #5540 from vector-im/luke/group-rooms-tooltip
Implement general-purpose tooltip "(?)"-style
2017-11-07 15:54:46 +00: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 4c0e956cc1 Name things in a sane way 2017-11-07 15:13:17 +00:00
Luke Barnard e1d16acddb Implement general-purpose tooltip "(?)"-style 2017-11-07 14:09:04 +00:00
Luke Barnard 62305a1ccd Implement tooltip for group rooms 2017-11-07 14:07:31 +00:00
Krombel a45ae588e5 Translated using Weblate (German)
Currently translated at 100.0% (217 of 217 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2017-11-07 13:34:54 +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 c8edaf1ba9 Merge remote-tracking branch 'origin/develop' into develop 2017-11-07 10:44:07 +00:00
Matthew Hodgson 9ff1fe8a72 Merge pull request #5535 from vector-im/luke/groups-new-group-settings
CSS for improving group creation UX, namely setting long description
2017-11-07 10:43:59 +00:00
Weblate 5e9bb4353a Merge remote-tracking branch 'origin/develop' into develop 2017-11-07 10:25:54 +00:00