Commit Graph

7195 Commits (23c0daa83ab2789b996f14cf20172d1656dfd9b5)

Author SHA1 Message Date
Luke Barnard 991ea4ebe5 Fix a few bugs with TagOrderStore:
- Have TagOrderStore listen for MatrixSync actions so that it can initialise
   tag ordering state.
 - Expose an empty list until the client has done its first sync and has
   fetched list of joined groups
2017-12-11 17:17:05 +00:00
Weblate 7938766877 Merge remote-tracking branch 'origin/develop' into develop 2017-12-11 13:19:40 +00:00
Andrey 85c272ba82 Translated using Weblate (Russian)
Currently translated at 99.3% (952 of 958 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-12-11 13:19:40 +00:00
GuyOfThePery 11d2a88d13 Translated using Weblate (Hebrew)
Currently translated at 5.8% (56 of 958 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/he/
2017-12-11 13:19:39 +00:00
EternalElectron 1131e18368 Translated using Weblate (German)
Currently translated at 99.6% (955 of 958 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-12-11 13:19:39 +00:00
Tirifto a3f74d14a0 Translated using Weblate (Esperanto)
Currently translated at 29.7% (285 of 958 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2017-12-11 13:19:39 +00:00
Richard Lewis c93266b6af Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/titleBar 2017-12-11 13:08:49 +00:00
Michael Telatynski b6182f7e6c
Tidy Quote class, removing comments etc
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-10 12:54:19 +00:00
Michael Telatynski 0f85391587
Implement Rich Quoting/Replies
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-10 12:50:41 +00:00
Stefan Parviainen 713230e082 Add option to also output original string
This is useful for debugging and testing

Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-12-09 21:21:31 +01:00
Kévin C f9d4af155b Translated using Weblate (French)
Currently translated at 100.0% (958 of 958 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-12-09 18:07:00 +00:00
Richard Lewis 24db57bfb6 Fix api prefix. 2017-12-08 18:47:00 +00:00
Weblate 614bd703cc Merge remote-tracking branch 'origin/develop' into develop 2017-12-08 18:18:49 +00:00
Matthew Hodgson f2d68e4601
Merge pull request #1649 from matrix-org/rxl881/titleBar
Add maximize / minimize apps drawer icons.
2017-12-08 19:18:45 +01:00
Szimszon 509fbd4331 Translated using Weblate (Hungarian)
Currently translated at 100.0% (958 of 958 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-12-08 18:07:54 +00:00
Weblate 9e76ec6203 Merge remote-tracking branch 'origin/develop' into develop 2017-12-08 16:52:10 +00:00
David Baker bb9376098a
Merge pull request #1654 from matrix-org/dbkr/crypto_store_migrate_warning
Warn when migrating e2e data to indexeddb
2017-12-08 16:52:05 +00:00
Luke Barnard df88b71dbb Comment typo 2017-12-08 16:47:52 +00:00
David Baker ab2fcfb388 re-run the fun^w^wnpm run i18n 2017-12-08 16:36:30 +00:00
Weblate 07cd3d8b2e Merge remote-tracking branch 'origin/develop' into develop 2017-12-08 16:33:30 +00:00
David Baker 0d38e7510d
Merge pull request #1600 from matrix-org/dbkr/udd_no_auto_show
Don't Auto-show UnknownDeviceDialog
2017-12-08 16:33:25 +00:00
David Baker 21f9549c78 Oops, missed some params 2017-12-08 15:33:03 +00:00
Richard Lewis a9ae4be74c Fix page title variable name. 2017-12-08 15:27:14 +00:00
Luke Barnard 196e1a4f66 Fix one variant of a scroll jump that occurs when decrypting an m.text 2017-12-08 15:25:14 +00:00
David Baker 49002c87bc More doc 2017-12-08 15:19:30 +00:00
Richard Lewis 20917e1a07 Set page title from widget data, if available. 2017-12-08 15:12:48 +00:00
Luke Barnard 8f0774496f Remove redundant MatrixChat 2017-12-08 11:29:21 +00:00
Luke Barnard 53e7232a97 Linting 2017-12-08 11:08:57 +00:00
Luke Barnard 31a52c15bd Fix bug with removing matrix listeners 2017-12-08 10:55:29 +00:00
Luke Barnard 72550961e5 Move 'commit_tags' to action creator 2017-12-08 10:52:20 +00:00
Luke Barnard 12515441cd Handle accountData events from TagOrderStore
This introduces a generic way to register certain events emitted by
the js-sdk as those that should be propagated through as dispatched
actions.

This allows the store to treat the js-sdk as the "Server" in the
Flux data flow model. It also allows for stores to not be aware
specifically of the matrix client if they are only reading from it.
2017-12-08 10:05:18 +00:00
Kévin C 2b74dcc6b7 Translated using Weblate (French)
Currently translated at 100.0% (944 of 944 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-12-07 21:17:18 +00:00
Weblate 54afadf12c Merge remote-tracking branch 'origin/develop' into develop 2017-12-07 15:56:15 +00:00
giapelle ae61b66f10 Translated using Weblate (Italian)
Currently translated at 8.7% (83 of 944 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2017-12-07 15:56:14 +00:00
Richard Lewis b20667a5a8
Merge pull request #1655 from matrix-org/rxl881/cmc
Remove logging.
2017-12-07 15:56:10 +00:00
Szimszon 47c444f91d Translated using Weblate (Hungarian)
Currently translated at 100.0% (944 of 944 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-12-07 15:45:01 +00:00
Luke Barnard ee6df105fe Introduce action creators
These can be used to dispatch actions immediately, or after some asynchronous
work has been done. Also, create GroupActions.fetchJoinedGroups as an example.

The concept of async action creators can be used in the following cases:
 - stores or views that do async work, dispatching based on the results
 - actions that have complicated payloads, would make more sense as functions
   with documentation that dispatch created actions.
2017-12-07 14:17:32 +00:00
Weblate bd8eaf6868 Merge remote-tracking branch 'origin/develop' into develop 2017-12-07 10:00:55 +00:00
David Baker 8e7c4c2018
Merge pull request #1648 from matrix-org/rxl881/encWarning
Add messaging endpoint for room encryption status.
2017-12-07 10:00:51 +00:00
Richard Lewis df438924a7 Remove logging. 2017-12-07 09:57:53 +00:00
Weblate 34774fed8f Merge remote-tracking branch 'origin/develop' into develop 2017-12-07 09:41:44 +00:00
Luke Barnard 4603d593de
Merge pull request #1588 from pvagner/develop
Add some missing translatable strings
2017-12-07 09:41:39 +00:00
Weblate c3d6ff1e3b Merge remote-tracking branch 'origin/develop' into develop 2017-12-06 22:54:43 +00:00
Krombel 2c95055aaa Translated using Weblate (German)
Currently translated at 99.8% (940 of 941 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-12-06 22:54:42 +00:00
Richard Lewis ed675fe791 Allow bypass of widget loading screen on hide / show. 2017-12-06 22:54:32 +00:00
jfkimmes 178cf2d301 Translated using Weblate (German)
Currently translated at 99.8% (940 of 941 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-12-06 22:04:10 +00:00
Krombel b22ec73b5d Translated using Weblate (German)
Currently translated at 99.6% (938 of 941 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-12-06 22:03:39 +00:00
jfkimmes 80de90edb7 Translated using Weblate (German)
Currently translated at 99.6% (938 of 941 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-12-06 22:03:13 +00:00
Krombel 58f7647e8a Translated using Weblate (German)
Currently translated at 99.4% (936 of 941 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-12-06 22:02:53 +00:00
jfkimmes 0941789b7f Translated using Weblate (German)
Currently translated at 99.4% (936 of 941 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-12-06 22:02:47 +00:00
David Baker d6688d8f12 Add jsdoc 2017-12-06 19:11:50 +00:00
David Baker 2a01985076 better proptypes 2017-12-06 19:07:12 +00:00
David Baker 0deed4bb88 null guard 2017-12-06 19:05:25 +00:00
David Baker 1a3671d241 remove stray param 2017-12-06 19:04:29 +00:00
David Baker 5bca5a7a8e More underscore 2017-12-06 19:02:26 +00:00
David Baker aa99b898ce Add that it might not work now either
also a comma
2017-12-06 18:57:48 +00:00
Luke Barnard 65d88334a9 Fix linting
React DnD specifies functions with upper-case first letters
2017-12-06 16:48:18 +00:00
Weblate fe01539e17 Merge remote-tracking branch 'origin/develop' into develop 2017-12-06 16:44:52 +00:00
vricci 3e1888b6d8 Translated using Weblate (Italian)
Currently translated at 8.6% (81 of 941 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2017-12-06 16:44:51 +00:00
Richard Lewis e20db416f2 Add field to bypass riot widget loading screen. 2017-12-06 16:44:41 +00:00
David Baker 4462694438 lint 2017-12-06 16:06:33 +00:00
David Baker 65c210cdde Warn when migrating e2e data to indexeddb 2017-12-06 15:28:20 +00:00
Luke Barnard 7e1f1cdbd9 Move DragDropContext to wrap LoggedInView
Becuase the tests rely on being able to inspect the state of MatrixChat
2017-12-06 15:01:16 +00:00
Luke Barnard 8f88995b3d Add analytics to TagOrderStore 2017-12-06 14:22:11 +00:00
Luke Barnard a9cc8eba33 Remove redundant TagOrderStore.orderedTags setting 2017-12-06 14:20:16 +00:00
Luke Barnard 35a108eecc Simplify render of TagPanel - remove sorting 2017-12-06 14:17:26 +00:00
Luke Barnard 4af7def20e Use AccountData im.vector.web.tag_ordering
Also, make defaults sensible
2017-12-06 14:13:08 +00:00
Luke Barnard 7aa5dcef69 Move DragDropContext to wrap entire app 2017-12-06 13:10:58 +00:00
Luke Barnard a8a650c24a Move TagTile to separate file, and make it dragable 2017-12-06 11:25:46 +00:00
Luke Barnard 82a95f0793 Simplify order_tag in TagOrderStore
such that:
 - it takes a targetTag to be replaced instead the previous tag to insert after
 - it optionally displaces the targetTag before or after the inserted tag
2017-12-06 11:22:06 +00:00
Peter Vágner 802abe7091 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop 2017-12-06 11:07:01 +01:00
Richard Lewis 3206527d73 Remove logging. 2017-12-05 21:59:44 +00:00
Richard Lewis d62520482a fix typo. 2017-12-05 21:57:28 +00:00
Richard Lewis fc3287c49f Fix error message. 2017-12-05 21:56:35 +00:00
Richard Lewis 7f86ed35a3 Only show custom title if different from app name. 2017-12-05 21:49:11 +00:00
Richard Lewis 1415a83a61 Merge branch 'rxl881/titleBar' of https://github.com/matrix-org/matrix-react-sdk into rxl881/customTitle 2017-12-05 21:42:47 +00:00
Richard Lewis d5d5397959 Set custom widget title. 2017-12-05 21:41:44 +00:00
Richard Lewis 9fd8deb16d Add maximize / minimize apps drawer icons. 2017-12-05 18:18:51 +00:00
Luke Barnard 8178496457 Implement Store for ordering tags in the tag panel 2017-12-05 14:45:44 +00:00
Weblate bdf1fee64d Merge remote-tracking branch 'origin/develop' into develop 2017-12-05 12:03:02 +00:00
Richard Lewis 9eb334a1d4
Merge pull request #1640 from matrix-org/rxl881/widgetTitle
Add widget -> riot postMessage API
2017-12-05 12:02:57 +00:00
Weblate c9aad51a96 Merge remote-tracking branch 'origin/develop' into develop 2017-12-05 11:59:30 +00:00
jfkimmes 35c7f6e13d Translated using Weblate (German)
Currently translated at 99.1% (933 of 941 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-12-05 11:59:30 +00:00
Richard Lewis 597a71fa9d Add messaging endpoint for room encryption status. 2017-12-05 11:59:02 +00:00
David Baker 87c808a088 semicolon 2017-12-05 11:53:49 +00:00
David Baker fec2e31b41 oops, actual null check 2017-12-05 11:38:25 +00:00
Luke Barnard aac5bcfe80 Attempt to improve TagPanel performance
by only recalculating rooms to show (for a given group) when a group updates.
2017-12-05 11:25:30 +00:00
David Baker c23a3fd7fe Add some null checks 2017-12-05 11:14:55 +00:00
Richard Lewis ac36f93c3f Remove logging. 2017-12-05 11:00:38 +00:00
Richard Lewis 59f9e388d4 Remove logging. 2017-12-05 00:11:01 +00:00
Richard Lewis 49a2985515 Register message endpoints.
Store endpoint origins only.
2017-12-05 00:08:17 +00:00
Richard Lewis 8595053d28 Update API data docs. 2017-12-04 18:06:05 +00:00
Richard Lewis df1fa80ff6 Use global object for listener count and messaging endpoints. 2017-12-04 17:54:00 +00:00
Andrey 648174476c Translated using Weblate (Russian)
Currently translated at 99.3% (935 of 941 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-12-04 11:31:38 +00:00
Tirifto e56584e39a Translated using Weblate (Esperanto)
Currently translated at 19.0% (179 of 941 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2017-12-04 11:31:38 +00:00
Tirifto c0d9f81928 Translated using Weblate (Czech)
Currently translated at 100.0% (941 of 941 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2017-12-04 11:31:38 +00:00
Richard Lewis dd7358cbb4 Use strict equality. 2017-12-01 16:39:07 +00:00
Richard Lewis 9dabf19d1b Improve readability. 2017-12-01 16:35:55 +00:00
Richard Lewis 81f7f805fa Fix check 2017-12-01 16:31:39 +00:00
Richard Lewis 024aefe131 Use ES6 style exports. 2017-12-01 16:17:18 +00:00
Richard Lewis 58616a45ef Add API endpoints to get current widget postMessage API version and supported API versions. 2017-12-01 15:56:30 +00:00
Richard Lewis 5239729e8e Return a response to widget postMessage request (inline with scalarMessaging API). 2017-12-01 14:56:27 +00:00
Richard Lewis 81fdccb109 Add API description comment. 2017-12-01 14:44:14 +00:00
Weblate ef1faff4b2 Merge remote-tracking branch 'origin/develop' into develop 2017-12-01 14:18:22 +00:00
Luke Barnard 641add4964 Fix one kind of scroll jump
by calling onWidgetLoad when the <img> in MImageBody loads
2017-12-01 14:18:13 +00:00
Weblate b8d7881663 Merge remote-tracking branch 'origin/develop' into develop 2017-12-01 12:04:25 +00:00
Luke Barnard b26cf23574
Merge pull request #1641 from matrix-org/luke/tag-panel-shift-click-semantics
Implement shift-click and ctrl-click semantics for TP
2017-12-01 12:04:21 +00:00
Luke Barnard 363fe04a10 isCtrlOrCmdKeyEvent -> isOnlyCtrlOrCmdKeyEvent 2017-12-01 10:44:00 +00:00
Luke Barnard ddd0e161c0 Fix broken imports 2017-12-01 10:41:56 +00:00
Luke Barnard fe81fcb8c6 Factor out isCtrlOrCmdKeyEvent, use that in TagPanel
as opposed to the incorrect ctrl || meta
2017-12-01 10:30:49 +00:00
Milan Korecký 09aaafdf2b Translated using Weblate (Czech)
Currently translated at 100.0% (941 of 941 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2017-11-30 17:52:31 +00:00
Weblate cef6f8088e Merge remote-tracking branch 'origin/develop' into develop 2017-11-30 15:43:29 +00:00
Luke Barnard eaaa9fe747 Don't show group when clicking tag panel 2017-11-30 15:35:40 +00:00
Richard Lewis 5ff5ca4705 Remove logging and broken title fetching functions. 2017-11-30 14:50:30 +00:00
Luke Barnard 3bcb3195c4 Implement shift-click and ctrl-click semantics for TP 2017-11-30 14:48:54 +00:00
Richard Lewis 87eab7573c Handle widget content loaded events. 2017-11-30 12:26:40 +00:00
Richard Lewis be603fecb0 Register and de-register widget postMessage endpoints. 2017-11-30 11:30:30 +00:00
Richard Lewis 2cfbbb000e Refactor messaging listerners. 2017-11-30 10:20:29 +00:00
Szimszon 4be057ee2c Translated using Weblate (Hungarian)
Currently translated at 100.0% (941 of 941 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-11-30 07:51:31 +00:00
Richard Lewis 4f5f44ff38 Add widget postmessage API stub. 2017-11-29 22:16:22 +00:00
Kévin C 6e3c12e754 Translated using Weblate (French)
Currently translated at 100.0% (941 of 941 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-11-29 20:24:01 +00:00
Weblate cd94ba6fb9 Merge remote-tracking branch 'origin/develop' into develop 2017-11-29 18:41:16 +00:00
Luke Barnard 7118f7a38f gen-18n 2017-11-29 18:41:08 +00:00
Weblate fb92be765c Merge remote-tracking branch 'origin/develop' into develop 2017-11-29 18:16:48 +00:00
Kévin C f490adfdd9 Translated using Weblate (French)
Currently translated at 100.0% (941 of 941 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-11-29 18:16:47 +00:00
Richard Lewis b571ab02dc Add widget messaging stub. 2017-11-29 18:11:03 +00:00
Luke Barnard f708250d44 Add feature flag for Tag Panel 2017-11-29 18:00:42 +00:00
Luke Barnard ead30fae9d Use unmounted instead of mounted 2017-11-29 17:07:43 +00:00
Luke Barnard 45bcb6f2ed Implement TagPanel (or LeftLeftPanel) for group filtering
This allows for filtering of the RoomList by group. When a group is selected, the room list will show:
 - Rooms in the group
 - Direct messages with members in the group

A button at the bottom of the TagPanel allows for creating new groups, which will appear in the panel following creation.
2017-11-29 16:53:43 +00:00
Milan Korecký e5d1f2a05b Translated using Weblate (Czech)
Currently translated at 100.0% (941 of 941 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2017-11-29 11:50:58 +00:00
Kévin C 6e55550920 Translated using Weblate (French)
Currently translated at 100.0% (941 of 941 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-11-28 17:51:09 +00:00
Weblate 31680e6f27 Merge remote-tracking branch 'origin/develop' into develop 2017-11-28 16:01:43 +00:00
Luke Barnard ff25c2f329
Merge pull request #1638 from matrix-org/luke/feature-bulk-device-deletion
Implement UI for using bulk device deletion API
2017-11-28 16:01:39 +00:00
Weblate 172070b2ad Merge remote-tracking branch 'origin/develop' into develop 2017-11-28 16:00:53 +00:00
David Baker a5acc2cfc2
Merge pull request #1637 from matrix-org/luke/replace-IRC-with-flair
Replace (IRC) with flair
2017-11-28 16:00:47 +00:00
Luke Barnard 736b8045aa Remove evil auth cache 2017-11-28 15:54:00 +00:00
Luke Barnard 204bbebfca Only calculate displayed groups if flair enabled 2017-11-28 15:49:11 +00:00
Luke Barnard b32e4a57bc Factor out _getDisplayeDGroups 2017-11-28 15:46:23 +00:00
Luke Barnard b748c62880 Renames for clarification 2017-11-28 15:40:36 +00:00
Luke Barnard 1c71983610 Implement UI for using bulk device deletion API 2017-11-28 15:32:40 +00:00
Weblate 85e4634024 Merge remote-tracking branch 'origin/develop' into develop 2017-11-28 14:07:27 +00:00
Luke Barnard 55b5f2b249
Merge branch 'develop' into luke/allow-guest-view-group 2017-11-28 14:06:43 +00:00
Weblate 3ec3c1ac5b Merge remote-tracking branch 'origin/develop' into develop 2017-11-28 14:02:02 +00:00
Andrey 3441a4aa5c Translated using Weblate (Russian)
Currently translated at 99.2% (931 of 938 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-11-28 14:02:02 +00:00
Luke Barnard 3addb924b1 Replace (IRC) with flair
If a user has public groups that are honoured in their flair, remove the (IRC) to give the appearance that the flair replaces it.
2017-11-28 13:50:05 +00:00
Luke Barnard a8594a58e5 Allow guest to see MyGroups, show ILAG when creating a group 2017-11-28 13:32:46 +00:00
Luke Barnard 7ec4010881 Make GroupStore use MatrixClientPeg
To avoid weirdness with using a cached matrix client
2017-11-28 11:54:05 +00:00
Luke Barnard 1a3ad5a342 Allow guests to view individual groups
For homeservers that still disallow guests (running synapse without https://github.com/matrix-org/synapse/pull/2715), start ILAG.
2017-11-28 11:52:46 +00:00
Weblate 950c4c7433 Merge remote-tracking branch 'origin/develop' into develop 2017-11-28 11:02:50 +00:00
David Baker bbaa46f773
Merge pull request #1634 from matrix-org/luke/move-group-flair-toggle-to-user-settings
Move group publication toggles to UserSettings
2017-11-28 11:02:45 +00:00
Luke Barnard d4f5e7e6d7 Deal with errors, lack of groups, loading 2017-11-28 10:46:20 +00:00
Weblate a8ede7f241 Merge remote-tracking branch 'origin/develop' into develop 2017-11-28 10:29:55 +00:00
Richard van der Hoff 8be3862e68 Merge branch 'master' into develop 2017-11-28 10:29:40 +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
Weblate 293f17a710 Merge remote-tracking branch 'origin/develop' into develop 2017-11-27 18:07:14 +00:00
Mateo Castro 88917c77bc Translated using Weblate (Spanish)
Currently translated at 60.2% (564 of 936 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2017-11-27 18:07:14 +00:00
Krombel 246b33bd7e Translated using Weblate (German)
Currently translated at 100.0% (936 of 936 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-27 18:07:13 +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
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
Krombel 2b57747e2e Translated using Weblate (German)
Currently translated at 100.0% (936 of 936 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-27 16:23:07 +00:00
Weblate 1df9226840 Merge remote-tracking branch 'origin/develop' into develop 2017-11-27 14:55:10 +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
Weblate 95af415e98 Merge remote-tracking branch 'origin/develop' into develop 2017-11-27 14:52:48 +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
Weblate 3131608e7f Merge remote-tracking branch 'origin/develop' into develop 2017-11-27 14:34:09 +00:00
Марко М. Костић 71590477b0 Translated using Weblate (Serbian)
Currently translated at 9.5% (89 of 936 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
2017-11-27 14:34:08 +00:00
Andrey d824be602c Translated using Weblate (Russian)
Currently translated at 100.0% (936 of 936 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-11-27 14:34:08 +00:00
xmeta ce4c470c82 Translated using Weblate (Japanese)
Currently translated at 6.1% (58 of 936 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
2017-11-27 14:34:08 +00:00
Tirifto 3d9e7322b4 Translated using Weblate (Esperanto)
Currently translated at 6.3% (59 of 936 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2017-11-27 14:34:07 +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
Vlad 3a94b57e4a Translated using Weblate (Russian)
Currently translated at 100.0% (936 of 936 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-11-26 14:29:53 +00:00
Andrey 56437768c3 Translated using Weblate (Russian)
Currently translated at 99.4% (931 of 936 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-11-26 14:20:29 +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
Марко М. Костић f91812491d Added translation using Weblate (Serbian) 2017-11-24 18:53:04 +00: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
Szimszon 1083df274d Translated using Weblate (Hungarian)
Currently translated at 100.0% (936 of 936 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-11-22 19:20:29 +00:00
Kévin C c3afa907a3 Translated using Weblate (French)
Currently translated at 100.0% (936 of 936 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-11-22 17:49:22 +00:00
Weblate d2061d7fa1 Merge remote-tracking branch 'origin/develop' into develop 2017-11-22 17:17:56 +00: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
Weblate 13c80bab80 Merge remote-tracking branch 'origin/develop' into develop 2017-11-22 17:12:19 +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
Weblate da76d1eb5d Merge remote-tracking branch 'origin/develop' into develop 2017-11-22 16:44:43 +00:00
Bamstam d81d2f17a9 Translated using Weblate (German)
Currently translated at 100.0% (932 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-22 16:44:42 +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
Weblate 7c27e74d81 Merge remote-tracking branch 'origin/develop' into develop 2017-11-21 18:46:12 +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
Weblate 7054f237a5 Merge remote-tracking branch 'origin/develop' into develop 2017-11-21 17:42:18 +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
Travis Ralston 5f3fda2950
Update MemberPresenceAvatar.js
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-21 09:01:56 -07:00
Krombel 7e440e832a Translated using Weblate (German)
Currently translated at 99.8% (932 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-21 14:17:59 +00:00
Bamstam 46f41a0e73 Translated using Weblate (German)
Currently translated at 99.8% (931 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-21 14:17:58 +00:00
Krombel 588e3f910a Translated using Weblate (German)
Currently translated at 99.8% (931 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-21 14:17:31 +00:00
Weblate 9191618a11 Merge remote-tracking branch 'origin/develop' into develop 2017-11-20 16:05:44 +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
Weblate dfec2904f1 Merge remote-tracking branch 'origin/develop' into develop 2017-11-20 13:41:59 +00:00
Andrey e25840e376 Translated using Weblate (Russian)
Currently translated at 99.6% (929 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-11-20 13:41:58 +00:00
Jan Kudrik 230d14bf70 Translated using Weblate (Czech)
Currently translated at 69.4% (647 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2017-11-20 13:41:58 +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
Pavel Kardash f8bb03cbc8 Translated using Weblate (Russian)
Currently translated at 99.6% (929 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-11-20 10:08:13 +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
Michael Telatynski f61f858cf7
Add Analytics Info and add Piwik to SdkConfig.DEFAULTS
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-11-19 15:33:07 +00:00
Michael Telatynski 4d177626b5
init Linkify properly to make tests happy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-11-19 13:24:18 +00:00
Michael Telatynski d943807ad1
remove unused imports
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-11-19 13:18:06 +00:00
Weblate 885afd155a Merge remote-tracking branch 'origin/develop' into develop 2017-11-19 12:53:17 +00:00
dark159123 ff3cef7c7d Translated using Weblate (Danish)
Currently translated at 26.6% (248 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/da/
2017-11-19 12:53:16 +00:00
Michael Telatynski f0752572a7
make RoomDetailRow reusable for the Room Directory
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-11-19 12:49:26 +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
Weblate 85d5d6fbba Merge remote-tracking branch 'origin/develop' into develop 2017-11-18 12:25:17 +00:00
Andrey 4f05ffcc52 Translated using Weblate (Russian)
Currently translated at 99.4% (927 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-11-18 12:25:16 +00:00
grrgui 07be7b6032 Translated using Weblate (French)
Currently translated at 100.0% (932 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-11-18 12:25:16 +00:00
Peter Vágner f033ada5a3 Translated using Weblate (Slovak)
Currently translated at 100.0% (932 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2017-11-18 12:00:13 +00:00
Walter ca5ffb2029 Translated using Weblate (Russian)
Currently translated at 99.4% (927 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-11-18 09:05:40 +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
Weblate 81bdb9c8ff Merge remote-tracking branch 'origin/develop' into develop 2017-11-17 17:48:52 +00:00
David Baker 1675737e7d Merge remote-tracking branch 'origin/master' into develop 2017-11-17 17:48:42 +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
Weblate ef2f13e45c Merge remote-tracking branch 'origin/develop' into develop 2017-11-17 14:51:07 +00:00
Andrey 1c8b306151 Translated using Weblate (Russian)
Currently translated at 98.8% (921 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-11-17 14:51:07 +00:00
Brenno Martins 979d1194db Translated using Weblate (Portuguese (Brazil))
Currently translated at 71.3% (665 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
2017-11-17 14:51:07 +00:00
Bamstam c60c4c3463 Translated using Weblate (German)
Currently translated at 99.6% (929 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-17 14:51:06 +00:00
Kévin C ee5d43385c Translated using Weblate (French)
Currently translated at 100.0% (932 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-11-17 14:51:06 +00:00
Stefan Parviainen 4de4b5206b Translated using Weblate (Finnish)
Currently translated at 89.0% (830 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2017-11-17 14:51:06 +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
Walter 99bb64915f Translated using Weblate (Russian)
Currently translated at 98.8% (921 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-11-17 09:03:26 +00: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
Stefan Parviainen bceb11cde9 Translated using Weblate (Finnish)
Currently translated at 89.0% (830 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2017-11-16 20:23:47 +00:00
Szimszon c025d50400 Translated using Weblate (Hungarian)
Currently translated at 100.0% (932 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-11-16 19:44:04 +00: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
David Baker eea8a41ef9 Unused import 2017-11-16 16:20:13 +00:00
David Baker 196eafdc7f Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show 2017-11-16 15:59:16 +00:00
David Baker 8ba9d26d4b Don't set the call state to ended on error
This isn't always the case, eg. just because we fail to pick up,
the call is still ringing.
2017-11-16 15:42:46 +00:00
Weblate c87198b69f Merge remote-tracking branch 'origin/develop' into develop 2017-11-16 15:35:21 +00:00
David Baker 02629d13d9
Merge pull request #1615 from matrix-org/luke/fix-sender-profile-opacity
Do something more sensible for sender profile name/aux opacity
2017-11-16 15:35:16 +00:00
Luke Barnard 7ffb542cb5 Do something more sensible for sender profile name/aux opacity
- If no translation is needed, don't do it.
 - For now, ignore the fact that this doens't allow us easily to put
   Flair into "luke sent an image" but we don't kow where the flair
   should go for this anyway.
2017-11-16 15:24:36 +00:00
Weblate 2962a9f181 Merge remote-tracking branch 'origin/develop' into develop 2017-11-16 15:12:40 +00:00
Peter Vágner c9a66d375f Translated using Weblate (Slovak)
Currently translated at 99.5% (928 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2017-11-16 15:12:40 +00:00
David Baker 6f8427a5af Revert rest of https://github.com/matrix-org/matrix-react-sdk/pull/1584
Because apparently the revert did not revert this part
2017-11-16 15:11:47 +00:00
Weblate b0f83dda03 Merge remote-tracking branch 'origin/develop' into develop 2017-11-16 13:36:20 +00:00
Andrey 1d2e13f91d Translated using Weblate (Russian)
Currently translated at 98.7% (920 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-11-16 13:36:20 +00:00
Luke Barnard b54e563cb6 Merge branch 'develop' into luke/linting-keyword-spacing 2017-11-16 13:23:42 +00:00
Luke Barnard dad797d4a2 Run linting --fix 2017-11-16 13:19:36 +00:00
Weblate e96f96d1f2 Merge remote-tracking branch 'origin/develop' into develop 2017-11-16 13:13:13 +00:00
Matthew Hodgson f62b04c3be
Merge branch 'develop' into travis/granular_bugs 2017-11-16 13:12:03 +00:00
Matthew Hodgson 3e13a919ed
remove rogue debug 2017-11-16 13:09:53 +00:00
Weblate e0e21efcf4 Merge remote-tracking branch 'origin/develop' into develop 2017-11-16 13:06:41 +00:00
Peter Vágner f4b7741449 Translated using Weblate (Slovak)
Currently translated at 99.7% (928 of 930 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2017-11-16 13:06:41 +00:00
Walter 02ffa919c4 Translated using Weblate (Russian)
Currently translated at 98.7% (918 of 930 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-11-16 13:06:41 +00:00
Bamstam 44e8a2cd54 Translated using Weblate (German)
Currently translated at 99.6% (927 of 930 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-16 13:06:40 +00:00
Luke Barnard f99755378a
Merge pull request #1612 from matrix-org/t3chguy/state_events
differentiate between state events and message events
2017-11-16 13:06:36 +00:00
Weblate 68cb84700e Merge remote-tracking branch 'origin/develop' into develop 2017-11-16 11:45:50 +00:00
Luke Barnard a80935e181 JSX does not do comments in a way one might expect 2017-11-16 11:45:40 +00:00
Weblate ba387f6287 Merge remote-tracking branch 'origin/develop' into develop 2017-11-16 11:29:08 +00:00
Bamstam 843bdd6e13 Translated using Weblate (German)
Currently translated at 99.5% (928 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-16 11:29:08 +00:00
pafcu 342378f48a
Add space after if 2017-11-16 12:19:56 +01:00
David Baker af8ff1b888 Don't blindly hangup on a call error.
Not all errors means we want to send a hangup (in fact most don't,
but the most notable being when we fail to answer a call: we should
not then automatically reject it).
2017-11-16 11:07:57 +00:00
Travis Ralston d0a0a9ce7f Fix URL preview string not being translated
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-15 22:33:23 -07:00
Travis Ralston fb1f20b7d4 Treat the master push rule as authoritative
Previously the push rule was ignored, leading to all kinds of interesting issues regarding notifications. This fixes those issues by giving the master push rule the authority it deserves for reasonable defaults.

Part 2 of the fix for:
* https://github.com/vector-im/riot-web/issues/5603
* https://github.com/vector-im/riot-web/issues/5606

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-15 22:33:23 -07:00
Travis Ralston 5976fb2eed Treat null/undefined notification settings as "not set"
Otherwise we end up lying and saying notifications are disabled, despite the push rules saying otherwise.

Part 1 of the fix for:
* https://github.com/vector-im/riot-web/issues/5603
* https://github.com/vector-im/riot-web/issues/5606

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-15 22:08:13 -07:00
Travis Ralston 10a1d9cb29 Language is a local setting
Fixes https://github.com/vector-im/riot-web/issues/5611

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-15 21:16:12 -07:00
Travis Ralston f141ee1944 Use the correct level order when getting arbitrary settings
This shouldn't currently be causing problems, but will in teh future. The bug can be exposed by having a setting where the level order is completely reversed, therefore causing LEVEL_ORDER[0] to actually be the most generic, not the most specific. Instead, we'll pull in the setting's level order and fallback to LEVEL_ORDER, therefore requesting the most specific value.

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-15 19:24:32 -07:00
Travis Ralston cf8ff6aed3 Validate that URL previews are explicitly enabled/disabled
Otherwise `!null` ends up being "true", therefore forcing URL previews on for everyone.

Fixes https://github.com/vector-im/riot-web/issues/5607

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-15 19:22:30 -07:00
Travis Ralston 022e40a127 Use SettingsStore for default theme
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-15 19:04:49 -07:00
Stefan Parviainen 2c1618bc10 Fix conflict and update strings
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-15 20:40:51 +01:00
Szimszon 0596925a86 Translated using Weblate (Hungarian)
Currently translated at 100.0% (932 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-11-15 19:05:56 +00:00
Weblate 80b1a685a6 Merge remote-tracking branch 'origin/develop' into develop 2017-11-15 18:34:56 +00:00
Andrey 45a90ef038 Translated using Weblate (Russian)
Currently translated at 98.3% (917 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-11-15 18:34:56 +00:00
Bamstam 1f1ca15219 Translated using Weblate (German)
Currently translated at 98.9% (922 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-15 18:34:55 +00:00
David Baker b0027525f3 Wire up Unknown Devices popup for outbound calls 2017-11-15 17:21:04 +00:00
Kévin C 648be26fb7 Translated using Weblate (French)
Currently translated at 100.0% (932 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-11-15 16:27:32 +00:00
Michael Telatynski c0002e7778
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/state_events 2017-11-15 16:03:07 +00:00
Michael Telatynski 5563b71c47
differentiate between state events and message events
so that people can't fake state event types and have them rendered.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-11-15 15:56:54 +00:00
David Baker aeca83ff2e Unused import 2017-11-15 15:20:45 +00:00
Richard Lewis 750e64deee Pass required props to TintableSvg. 2017-11-15 15:17:21 +00:00
David Baker 93800be742 Factor out showing UnknownDeviceDialog
So we can re-use it for calls that fail due to unknwon devices
2017-11-15 15:15:21 +00:00
Richard Lewis 24b9269ff5 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/invertOutlineColour 2017-11-15 15:08:28 +00:00
Weblate c5b5a78e86 Merge remote-tracking branch 'origin/develop' into develop 2017-11-15 14:47:28 +00:00
Matthew Hodgson f4ecc7fa5d speculatively fix @lampholder's NPE 2017-11-15 14:47:20 +00:00
Weblate e06ff8083d Merge remote-tracking branch 'origin/develop' into develop 2017-11-15 14:30:40 +00:00
Matthew Hodgson ec33806379
Merge pull request #1610 from matrix-org/rxl881/lintingErrors
Fix linting errors.
2017-11-15 14:30:36 +00:00
Richard Lewis 7bab7813bb Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/invertOutlineColour 2017-11-15 13:26:29 +00:00
Richard Lewis 59d405d4fa Use TintableSvgButtons for widget menubar icons. 2017-11-15 13:24:38 +00:00
Richard Lewis 6c2e9096cd Tintable SVGs that behave like normal image buttons / links. 2017-11-15 13:08:24 +00:00
David Baker f8fc6dc83e Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show 2017-11-15 12:11:33 +00:00
Weblate 072a3cd622 Merge remote-tracking branch 'origin/develop' into develop 2017-11-15 11:26:05 +00:00
Matthew Hodgson 96a3eff5d3 lint hell 2017-11-15 11:25:56 +00:00
Weblate 0847596083 Merge remote-tracking branch 'origin/develop' into develop 2017-11-15 11:15:57 +00:00
Matthew Hodgson 84591729a8 unbreak tests 2017-11-15 11:15:49 +00:00
Weblate 6e74657d41 Merge remote-tracking branch 'origin/develop' into develop 2017-11-15 10:56:01 +00:00
Matthew Hodgson 060a890275
Merge pull request #1516 from turt2live/travis/granular-settings
Granular settings
2017-11-15 10:55:55 +00:00
David Baker 63919befd0 Catch call failures due to unknown devices
And show a specific dialog that you can then launch the UDD from
(although currently with a 'Send Anyway' button which makes little
sense for VoIP)
2017-11-15 10:49:29 +00:00
Richard Lewis 56a70f5530 Add tinting for lowlights. 2017-11-15 10:40:07 +00:00
Richard Lewis 06b319937f Fix linting errors. 2017-11-15 10:14:16 +00:00
Weblate 7367a27df1 Merge remote-tracking branch 'origin/develop' into develop 2017-11-15 09:56:52 +00:00
Matthew Hodgson e91e94fd42 fix unstyled CSS bug https://github.com/vector-im/riot-web/issues/5601 2017-11-15 09:56:44 +00:00
Szimszon a226a4997b Translated using Weblate (Hungarian)
Currently translated at 100.0% (934 of 934 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-11-15 05:51:26 +00:00
Travis Ralston f58e8826c0 Use the correct settings store for presence
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-14 19:18:04 -07:00
Travis Ralston 443bff5832 Presence feature
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-14 19:14:56 -07:00
Travis Ralston bd4102eb3d Merge branch 'develop' into travis/granular-settings 2017-11-14 19:12:48 -07:00
Weblate cb32bac7fa Merge remote-tracking branch 'origin/develop' into develop 2017-11-15 01:46:01 +00:00
Matthew Hodgson 546b062d82 automatically and correctly retint when changing theme 2017-11-15 01:45:51 +00:00
Weblate 06e38c2e48 Merge remote-tracking branch 'origin/develop' into develop 2017-11-15 01:01:24 +00:00
Bamstam 955362ee2d Translated using Weblate (German)
Currently translated at 99.4% (929 of 934 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-15 01:01:24 +00:00
Matthew Hodgson d6fc4ebe3c fix new tinter problems
correctly handle skinned tertiaryColors (turns out they're used for the RoomSublist divider bars)
handle the fact that some room accountData apparently has ended up with rgb() colors in it...
2017-11-15 01:01:17 +00:00
Weblate 247df92f17 Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 23:53:21 +00:00
Matthew Hodgson f05958e334
Merge pull request #1482 from turt2live/travis/presence
Implement user-controlled presence
2017-11-14 23:53:16 +00:00
Stefan Parviainen ae252f7e59 Log if no match is found 2017-11-14 21:34:20 +01:00
Szimszon 3a6e89584c Translated using Weblate (Hungarian)
Currently translated at 100.0% (933 of 933 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-11-14 20:33:16 +00:00
Weblate 26e5271d81 Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 20:20:37 +00:00
Richard Lewis 58966c5c3d Make edit icon green by default 2017-11-14 19:53:59 +00:00
Richard Lewis e87940f63c Make app tile title stronger 2017-11-14 19:53:32 +00:00
Stefan Parviainen f8660de52d Add note about alternative to opacity 2017-11-14 20:13:00 +01:00
Stefan Parviainen df6d5cc2b4 Pass plain components, rather than functions returning them 2017-11-14 20:09:52 +01:00
Stefan Parviainen 788be67c75 Clarifications 2017-11-14 20:08:27 +01:00
Stefan Parviainen 772550a24a Dont't add empty nodes 2017-11-14 19:33:12 +01:00
Weblate 4c4220e9dd Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 16:07:56 +00:00
Matthew Hodgson 7c98558b6a fix neglible race when loading CSS 2017-11-14 16:07:48 +00:00
Weblate 869a2d158f Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 16:04:19 +00:00
Matthew Hodgson 1fd7ac30e4 turns out i made up the .complete property on link elements 2017-11-14 16:04:11 +00:00
Weblate 299a32fa98 Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 15:37:12 +00:00
Matthew Hodgson 8d6e3dd27d fix lint 2017-11-14 15:37:03 +00:00
Weblate 54b430c465 Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 15:28:42 +00:00
Matthew Hodgson dcfbe93409 fix race when loading CSS
fixes https://github.com/vector-im/riot-web/issues/5590
2017-11-14 15:28:34 +00:00
Matthew Hodgson 805796e4e0 force the tinter to refresh when we change theme 2017-11-14 15:27:28 +00:00
Weblate 72754cf49c Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 15:17:59 +00:00
Peter Vágner 07addbe1e0 Translated using Weblate (Slovak)
Currently translated at 99.7% (931 of 933 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2017-11-14 15:17:58 +00:00
Bamstam eb2d5d0ac5 Translated using Weblate (German)
Currently translated at 99.4% (928 of 933 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-14 15:17:58 +00:00
Matthew Hodgson 8c218557df fix disable_custom_urls 2017-11-14 15:17:50 +00:00
Weblate d6de8b8d58 Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 14:27:34 +00:00
Peter Vágner 1038e44672 Translated using Weblate (Slovak)
Currently translated at 99.7% (931 of 933 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2017-11-14 14:27:34 +00:00
Bamstam 20beb7990f Translated using Weblate (German)
Currently translated at 99.4% (928 of 933 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-14 14:27:33 +00:00
Matthew Hodgson b58514f427 Stop FF quantum exploding on CSS edits 2017-11-14 14:27:27 +00:00
Kévin C 64958d05b9 Translated using Weblate (French)
Currently translated at 100.0% (933 of 933 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-11-14 14:18:25 +00:00
David Baker 55260becc9 Revert "Lowercase all usernames" 2017-11-14 14:13:22 +00:00
Weblate c1d70f28d7 Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 14:05:54 +00:00
Peter Vágner 3d677d84fe Translated using Weblate (Slovak)
Currently translated at 100.0% (932 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2017-11-14 14:05:54 +00:00
Peter Vágner 9d19496011 Translated using Weblate (Slovak)
Currently translated at 100.0% (932 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2017-11-14 13:23:15 +00:00
Luke Barnard 12d9f05883 Merge branch 'develop' into luke/fix-restrict-power-level-options 2017-11-14 13:08:31 +00:00
Luke Barnard 3fa1bece0a Simplify further
Also fix not-i18n-friendly "of" to be "=".
2017-11-14 13:06:54 +00:00
Weblate 61ee39b3b2 Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 12:43:00 +00:00
Andrey 85f002b21c Translated using Weblate (Russian)
Currently translated at 98.4% (918 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-11-14 12:43:00 +00:00
David Baker e7c99a71b6
Merge pull request #1606 from matrix-org/luke/fix-member-info-power-level-display
Determine whether power level is custom once Roles have been determined
2017-11-14 12:42:55 +00:00
Luke Barnard c3492634bd Merge branch 'luke/fix-member-info-power-level-display' into luke/fix-restrict-power-level-options 2017-11-14 12:41:36 +00:00
Luke Barnard d2ef6bffa8 Remove reverseRoles
This variable seemed redundant in hindsight, it seemed better to remove it than to worry about where it went in the component.
2017-11-14 12:02:37 +00:00
Kévin C acd2be4b68 Translated using Weblate (French)
Currently translated at 100.0% (932 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-11-14 10:53:57 +00:00
Szimszon 6c8283b3a8 Translated using Weblate (Hungarian)
Currently translated at 100.0% (932 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-11-14 06:41:28 +00:00
Travis Ralston d92cba25ef Use the SettingsStore to get the theme
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-13 13:14:00 -07:00
Stefan Parviainen 2acd42e7c5 Make eslint happy 2017-11-13 21:10:08 +01:00
Travis Ralston 63bebe9dfd Split out avatar and display name hiding
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-13 12:58:10 -07:00
Travis Ralston ffecb82bca Groups were released
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-13 12:34:30 -07:00
Travis Ralston 0648b3eae7 Merge branch 'develop' into travis/granular-settings 2017-11-13 12:29:36 -07:00
Weblate a44d717783 Merge remote-tracking branch 'origin/develop' into develop 2017-11-13 19:22:39 +00:00
Bamstam beebe6b92b Translated using Weblate (German)
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/de/
2017-11-13 19:22:38 +00:00
Stefan Parviainen 3afbaf61e7 Refactor i18n stuff a bit 2017-11-13 20:19:33 +01:00
Travis Ralston c5c346f0b7 Merge branch 'develop' into travis/granular-settings 2017-11-13 12:18:41 -07:00
David Baker 0659ac1ccb Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show 2017-11-13 17:45:57 +00:00
Luke Barnard 52af7a7659 Attempt to clarify the affect that the users_default has on power levels
This modifies displayed power levels such that:
 - If users_default is !== 0:
   - the power level 0 is displayed as "Restricted (0)"
   - the power level users_default is displayed as "Default ({users_default})"
 - Otherwise:
   - the power level 0 is displayed as "Default (0)"

When changing users_default, to say, 10, when the textual powers are rendered
again, they will take users_default into account. So those previously at 10
and which would have previously have been rendered "Custom of 10" will now
read "Default (10)". Conversely, those that were "Default (0)" will now read
"Restricted (0)".
2017-11-13 17:03:48 +00:00
Krombel a97f530999 Translated using Weblate (German)
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/de/
2017-11-13 14:05:02 +00:00
Luke Barnard 88010fa26c Determine whether power level is custom once Roles have been determined
Instead of potentially inspecting an empty {} before mounting.

This fixes an issue where "Custom of N" would appear on the first mount of MemberInfo - part of https://github.com/vector-im/riot-web/issues/5107#issuecomment-331882294
2017-11-13 11:57:34 +00:00
Matthew Hodgson ca531f83d2 remove needless case-squash on login, castrating https://github.com/matrix-org/matrix-react-sdk/pull/1550 2017-11-13 10:34:38 +00:00
Matthew Hodgson 6942e94394 unbreak tests 2017-11-12 00:00:46 +00:00
Matthew Hodgson 46387e135e
Merge branch 'develop' into matthew/status 2017-11-11 23:50:48 +00:00
Matthew Hodgson 2827bc0718 replace some of the status.im theme with general config options 2017-11-11 23:46:43 +00:00
Weblate 25a1dccffc Merge remote-tracking branch 'origin/develop' into develop 2017-11-11 16:08:33 +00:00
David Baker 39763d668c
Revert "Lowercase all usernames" 2017-11-11 15:59:43 +00:00
David Baker bce4815851 Initialise unread messages value correctly 2017-11-11 15:57:20 +00:00
Matthew Hodgson a0cdaf29f9 Merge remote-tracking branch 'origin/develop' into matthew/status 2017-11-10 15:29:42 -08:00
Weblate 7cada3b227 Merge remote-tracking branch 'origin/develop' into develop 2017-11-10 16:19:40 +00:00
Luke Barnard a96bfee9f2 Remove unused UserSettingsStore import 2017-11-10 16:12:27 +00:00
Luke Barnard ceda5939f9 Remember to import React 2017-11-10 15:55:55 +00:00
Luke Barnard 853d33a93a Make groups a fully-fleged baked-in feature 2017-11-10 15:42:11 +00:00
Tong Hui 0f8df97a47 Translated using Weblate (Chinese (Simplified))
Currently translated at 70.4% (654 of 928 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2017-11-10 15:08:52 +00:00
Luke Barnard 6e1cf6ce17
Merge pull request #1548 from matrix-org/rxl881/widgetrendering
Improve widget rendering on prop updates
2017-11-10 12:41:20 +00:00
Luke Barnard 74c6ebc5c6
Merge pull request #1595 from matrix-org/luke/groups-show-user-profile-on-action
Display group member profile (avatar/displayname) in ConfirmUserActionDialog
2017-11-10 12:31:47 +00:00
David Baker d2549b621c
Merge pull request #1602 from matrix-org/dbkr/nullcheck_atroom_rule
Don't crash if there isn't a room notif rule
2017-11-10 11:57:43 +00:00
Luke Barnard 981ca458ec
Merge pull request #1596 from matrix-org/luke/groups-show-name-in-flair-tootip
Show group name in flair tooltip if one is set
2017-11-10 11:51:45 +00:00
Richard Lewis ba8a9f2a43 Comment length 2017-11-10 11:50:14 +00:00
David Baker ff5e00d244 Don't crash if there isn't a room notif rule 2017-11-10 11:50:00 +00:00
Luke Barnard 6deeaf94d6 group name not required 2017-11-10 11:43:05 +00:00
Richard Lewis d2070a08d8 Replace 'qs' dep. with 'querystring' 2017-11-10 11:42:56 +00:00
Luke Barnard 90a63d78b9
Merge pull request #1597 from matrix-org/luke/groups-fix-invite-avatar
Convert group avatar URL to HTTP before handing to BaseAvatar
2017-11-10 11:41:51 +00:00
Luke Barnard d179267714 Add prop type 2017-11-10 11:41:36 +00:00
Luke Barnard 0d174ffe9a Fix tests 2017-11-10 11:13:52 +00:00
Luke Barnard f4428267a1 Refactor onboarding redirect, add groups to the onboarding starters 2017-11-10 10:51:28 +00:00
Luke Barnard 266a504981 Use the same MatrixClient for the duration of GroupView lifecycle
Using the pegged matrix client would lead to trying to call removeListener on `null` when GroupView is unmounted during logout.
2017-11-10 10:49:14 +00:00
Peter Vágner 681f43913a Make the disabled PowerSelector element showing custom value translatable. Fixes #5547 2017-11-10 11:26:53 +01:00
Richard Lewis bd6b5c4498 Improve function name. 2017-11-10 10:17:55 +00:00
Richard Lewis 98ac3dd19b Explicitly set initialisation state. 2017-11-10 09:44:58 +00:00
Luke Barnard 7893927e14
Merge pull request #1598 from matrix-org/luke/groups-update-group-room-visibility-api
Modify the group room visibility API to reflect the js-sdk changes
2017-11-09 17:34:18 +00:00
Luke Barnard 31be27515c Modify the group room visibility API to reflect the js-sdk changes
See https://github.com/matrix-org/matrix-js-sdk/pull/569
2017-11-09 16:28:21 +00:00
David Baker b1ec430523 Remove now-unused dispatches 2017-11-09 16:09:12 +00:00
David Baker 820d9c1c25 Show staus bar on Unknown Device Error
Don't pop up the dialog as soon as we can't send a message.

Also removes dispatches used to keep the RoomStatusBar up to date.
We can get the same events straight from the js-sdk via the
pending events event.
2017-11-09 15:58:15 +00:00
Luke Barnard a8487c540f Convert group avatar URL to HTTP before handing to BaseAvatar
This is yet another component that imports the MatrixClient just for mxcUrlToHttp. It'd be much nicer to have an avatar component that accepted MXCs, e.g. by wrapping or modifying BaseAvatar.
2017-11-09 14:34:04 +00:00
Richard Lewis da8b1ff1cd Ensure that loading state is reset when showing app panel. 2017-11-09 14:28:24 +00:00
Weblate 3807d99a6a Merge remote-tracking branch 'origin/develop' into develop 2017-11-09 14:17:07 +00:00
Peter Vágner 1c1acd6d12 Translated using Weblate (Slovak)
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/sk/
2017-11-09 14:17:06 +00:00
Andrey f796c4c6d1 Translated using Weblate (Russian)
Currently translated at 98.4% (914 of 928 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-11-09 14:17:06 +00:00
bldrzzy 9b7f302310 Translated using Weblate (Polish)
Currently translated at 76.7% (712 of 928 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2017-11-09 14:17:06 +00:00
Xose M 0250958c25 Translated using Weblate (Galician)
Currently translated at 1.7% (16 of 928 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2017-11-09 14:17:06 +00:00
Luke Barnard 9a6c9594a1 Correctly display group invite
By making sure the groupName truncates in the right place
2017-11-09 14:16:54 +00:00
Richard Lewis f796bc79c3 Fix addition of scalar token to widget URL.
Add error logging.
2017-11-09 14:07:29 +00:00
Luke Barnard 9027780215 Show group name in flair tooltip if one is set
e.g. "Group Name (+group_id:homeserver)" or "+group_id:homeserver"

Fixes https://github.com/vector-im/riot-web/issues/5341
2017-11-09 12:38:43 +00:00
Luke Barnard 6eeb91ee2e Display group member profile (avatar/displayname) in ConfirmUserActionDialog
Fixes https://github.com/vector-im/riot-web/issues/5486
2017-11-09 12:24:20 +00:00
Xose M 9b7ab4b7bd Added translation using Weblate (Galician) 2017-11-09 06:24:11 +00:00
Travis Ralston 030633fa90 Merge remote-tracking branch 'matrix-org/develop' into travis/granular-settings 2017-11-08 17:43:38 -07:00
Travis Ralston 2711da28b4 Use the SettingsStore in the UnknownDeviceDialog 2017-11-08 17:43:06 -07:00
Travis Ralston f7da5836e1 Make blacklistUnverifiedDevices override the level order
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-08 17:41:32 -07:00
Travis Ralston c7d8f3931f Revert notification toolbar setting
It isn't a setting.

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-08 17:06:36 -07:00
Richard Lewis 8016fb82d7 Fix broken commit. 2017-11-08 20:38:54 +00:00
Richard Lewis 56581ef408 Fix various loadingElement related issues. 2017-11-08 20:38:31 +00:00
Richard Lewis b2b07d9370 Formatting 2017-11-08 20:17:28 +00:00
Weblate 23c9324fa5 Merge remote-tracking branch 'origin/develop' into develop 2017-11-08 18:52:33 +00:00
David Baker 7b243bf64d
Revert "UnknownDeviceDialog: get devices from SDK" 2017-11-08 18:49:50 +00:00
Richard Lewis be0a76dbd6 Update variable name and JSdoc for improved clarity. 2017-11-08 17:44:54 +00:00
Matthew Hodgson 58ee4d0a76 rewrite the tinter to be ES6, and correctly cache fixups per theme 2017-11-08 06:55:07 -08:00
Weblate 685e5b916b Merge remote-tracking branch 'origin/develop' into develop 2017-11-08 14:04:32 +00:00
David Baker b575df7da7
Merge pull request #1591 from matrix-org/luke/groups-order-admins-first
Order users in the group member list with admins first
2017-11-08 14:04:28 +00:00
Luke Barnard e2a0cba6cb If group member privilege level is equal, disambiguate with displayname or userId 2017-11-08 13:57:38 +00:00
Weblate 02cce94c2b Merge remote-tracking branch 'origin/develop' into develop 2017-11-08 13:35:58 +00:00
Luke Barnard 65cea53f3d
Merge pull request #1592 from matrix-org/luke/groups-fix-accept-invite-refresh-members
Fetch group members after accepting an invite
2017-11-08 13:35:53 +00:00
Krombel d583a12514 Translated using Weblate (German)
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/de/
2017-11-08 13:00:39 +00:00
Kévin C 569a3a3ac4 Translated using Weblate (French)
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/fr/
2017-11-08 12:34:28 +00:00
Matthew Hodgson e729bc431d Merge remote-tracking branch 'origin/develop' into matthew/status 2017-11-08 04:29:52 -08:00
Peter Vágner 447f23796c Translated using Weblate (Slovak)
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/sk/
2017-11-08 12:07:30 +00:00
Luke Barnard 3e3ebd6358 Fetch group members after accepting an invite 2017-11-08 11:52:52 +00:00
Luke Barnard e3e161fbea Order users in the group member list with admins first 2017-11-08 11:51:58 +00:00
Weblate 100053ff3d Merge remote-tracking branch 'origin/develop' into develop 2017-11-08 11:49:49 +00:00
Luke Barnard 7075931c58
Merge pull request #1589 from matrix-org/luke/improve-room-address-picker
Improve address picker for rooms
2017-11-08 11:49:45 +00:00
Weblate 63c8d676cf Merge remote-tracking branch 'origin/develop' into develop 2017-11-08 11:36:35 +00:00
Peter Vágner f14f2f99ab Translated using Weblate (Slovak)
Currently translated at 99.8% (927 of 928 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2017-11-08 11:31:58 +00:00
Luke Barnard 1c5e7f3048 Fix FlairStore getPublicisedGroupsCached to give the correct, existing promise 2017-11-08 11:31:04 +00:00
Peter Vágner 4a9752a482 Added translation using Weblate (Slovak) 2017-11-08 11:21:21 +00:00
Peter Vágner 1e7fc953b3 Ooops, also add the string to the default language file. 2017-11-08 11:56:30 +01:00
Weblate b496eec523 Merge remote-tracking branch 'origin/develop' into develop 2017-11-08 10:55:59 +00:00
Luke Barnard c1d9d3714a Fix not being able to filter community rooms - fixes vector-im/vector-web#5538 2017-11-08 10:55:51 +00:00
Szimszon 8f2bb73229 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-08 10:53:24 +00:00
Luke Barnard 077ca36b05 Rank rooms with shorter matching aliases first 2017-11-08 10:47:45 +00:00
Luke Barnard b3674f503d Do not search through room topics 2017-11-08 10:32:48 +00:00