Commit Graph

8007 Commits (ff4909e6ab9bb124a5ad438adc85facf4dca9139)

Author SHA1 Message Date
Weblate 0f0073033b Merge remote-tracking branch 'origin/develop' into develop 2018-03-15 09:20:20 +00:00
stuve20 12d2bab544 Translated using Weblate (Swedish)
Currently translated at 42.5% (423 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2018-03-15 09:20:20 +00:00
random 8af3bfa8f3 Translated using Weblate (Italian)
Currently translated at 17.6% (176 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2018-03-15 09:20:19 +00:00
Osoitz f788ef280f Translated using Weblate (Basque)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-03-15 09:20:19 +00:00
Osoitz 117129bcac Translated using Weblate (Basque)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-03-15 08:52:59 +00:00
Luke Barnard bc5699b3d7 Add change delay warning in GroupView settings 2018-03-14 18:17:15 +00:00
Luke Barnard c903cc6375 Fix tests 2018-03-14 14:55:36 +00:00
Krombel 0b974979e2 Translated using Weblate (German)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-03-14 14:34:10 +00:00
Luke Barnard 8672b97f9a Improve room list performance when receiving messages
In summary this makes RoomTiles (and RoomAvatars) do more for
themselves in terms of reacting individually to state changes in
the js-sdk.

Instead of force updating the entire room list for avatar changes
and room name changes, do this in the RoomTile and RoomAvatar
instead. This increases the number of listeners listening to the
matrix client, but allows us to properly implement a
shouldComponentUpdate for RoomTile (because the avatar, name and
notification count are now in component state)
2018-03-14 14:29:55 +00:00
Richard Lewis 83412acbe7 Display sticker content (URL), rather than thumbnail. 2018-03-14 11:11:21 +00:00
Weblate 3011ffcdc2 Merge remote-tracking branch 'origin/develop' into develop 2018-03-14 09:37:20 +00:00
István fa966971e7 Translated using Weblate (Hungarian)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-03-14 09:37:19 +00:00
Osoitz 57d4ae6e0e Translated using Weblate (Basque)
Currently translated at 99.7% (993 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-03-14 09:37:19 +00:00
Anatoliy Sablin 953a520f38 Enable autocompletion for non-English languages. 2018-03-14 00:33:19 +03:00
Luke Barnard 4f4441fb07 Only use `dangerouslySetInnerHTML` for HTML messages
...and plain messages with emoji that we replace with <img> tags
amonst the html-escaped `content.body`.
2018-03-13 17:15:16 +00:00
Richard Lewis 66ea78de65 Clean up whitelisted permission addition / logging. 2018-03-13 11:59:15 +00:00
Richard Lewis 8b311c706c Null guard widget listener 2018-03-13 11:58:47 +00:00
Richard Lewis 7d13edc67a Get user widgets by default (if roomID is not specified). 2018-03-13 11:58:18 +00:00
Weblate 5d8e2c066c Merge remote-tracking branch 'origin/develop' into develop 2018-03-13 11:50:19 +00:00
István 65e60676eb Translated using Weblate (Hungarian)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-03-13 11:50:19 +00:00
Ralitsa Bozhkova 917960449b Translated using Weblate (Bulgarian)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-03-13 11:50:18 +00:00
Luke Barnard 35cc443562 Limit group requests to 3 at once
using a FIFO queue.

This is needed in order to lower the priority of getting group
state and prioritise everything else, namely initial sync.

It should be noted that this by no means guarantees that the
first incremental sync will happen sooner; the client could
end up doing some other requests first instead.
2018-03-13 11:35:19 +00:00
Richard Lewis f820374f9f Logging. 2018-03-13 11:01:51 +00:00
Richard Lewis 53b716bad6 Throw capability request exception. 2018-03-13 10:51:01 +00:00
Richard Lewis de33294000 Center loading spinner. 2018-03-13 10:07:49 +00:00
Richard Lewis a81269cba8 Check if user widget. 2018-03-13 10:07:27 +00:00
Andrey 8ddbd09f4f Translated using Weblate (Russian)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-03-12 19:52:49 +00:00
Weblate 502cba0be5 Merge remote-tracking branch 'origin/develop' into develop 2018-03-12 17:54:05 +00:00
Luke Barnard 99b3922998
Merge pull request #1796 from matrix-org/luke/fix-group-invite-flow
Show GroupMemberList after inviting a group member
2018-03-12 17:53:59 +00:00
Luke Barnard 0a480b05aa Show GroupMemberList after inviting a group member
because we might be looking at a member when inviting a new
member.

See https://github.com/vector-im/riot-web/pull/6303
2018-03-12 17:23:31 +00:00
Weblate 05cdd8098b Merge remote-tracking branch 'origin/develop' into develop 2018-03-12 15:33:08 +00:00
Slavi Pantaleev 791ef02715 Translated using Weblate (Russian)
Currently translated at 99.7% (993 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-03-12 15:33:07 +00:00
Slavi Pantaleev 5885104c3a Translated using Weblate (Bulgarian)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-03-12 15:33:06 +00:00
David Baker d416b9d7d1 Copyright 2018-03-12 15:24:32 +00:00
David Baker ac85938186 Fix syntax fail 2018-03-12 15:23:22 +00:00
Richard Lewis b2d23b6999 Switch to 'm.sticker' message events. Allow whitelisting of wisget capabilities. 2018-03-12 13:56:02 +00:00
Andrey 5854c5f42c Translated using Weblate (Russian)
Currently translated at 99.7% (993 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-03-12 12:09:57 +00:00
Ralitsa Bozhkova d1961ab111 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-03-12 12:02:44 +00:00
Марко М. Костић 46d1328af4 Translated using Weblate (Serbian)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
2018-03-11 14:09:30 +00:00
Ralitsa Bozhkova bf41b7b91f Translated using Weblate (Bulgarian)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-03-10 10:37:27 +00:00
Richard Lewis 46f46ee294 Simplify request mapping. 2018-03-09 23:04:00 +00:00
Richard Lewis 7e062090de Cleanup timeout before unmount. 2018-03-09 21:12:56 +00:00
Szimszon b92e74bc60 Translated using Weblate (Hungarian)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-03-09 19:15:05 +00:00
Nathan van Beelen d4d8ed7797 Translated using Weblate (Dutch)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2018-03-09 14:23:08 +00:00
Richard Lewis a33859326e Use getUserWidgets where possible. 2018-03-09 09:15:16 +00:00
Richard Lewis e7c19fd83b Don't render placeholder when image is visible. 2018-03-08 23:12:12 +00:00
Richard Lewis e36ae3cede Fix context menu offset. 2018-03-08 17:33:07 +00:00
Weblate 9524d1c313 Merge remote-tracking branch 'origin/develop' into develop 2018-03-08 17:30:21 +00:00
David Baker e87f8ee7b8
Merge pull request #1793 from matrix-org/luke/fix-tag-panel-clear-filter-tinting
Use TintableSvg for TagPanel clear filter button
2018-03-08 17:30:17 +00:00
Richard Lewis fdec4b36c9 Hide padding if last control. 2018-03-08 17:25:28 +00:00
Richard Lewis 3ab8b1f866 Hide sticker picker delete button and show minimise button. 2018-03-08 17:20:42 +00:00
Luke Barnard 5ba55858e8 Use TintableSvg for TagPanel clear filter button 2018-03-08 17:06:48 +00:00
Kévin C 99c15be766 Translated using Weblate (French)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-03-08 16:57:54 +00:00
Weblate 3d34596162 Merge remote-tracking branch 'origin/develop' into develop 2018-03-08 16:47:50 +00:00
Luke Barnard a1d0cf65d6 Fix missing space between "...is a" and user ID 2018-03-08 16:34:19 +00:00
Weblate b5c44e6b36 Merge remote-tracking branch 'origin/develop' into develop 2018-03-08 15:08:05 +00:00
Luke Barnard 5148ca1a88
Merge pull request #1791 from matrix-org/luke/e2e-request-keys-button
E2E "fudge-button"
2018-03-08 15:07:58 +00:00
Luke Barnard 3a3cced905 E2E "fudge-button"
Implement a UI to expose a JS-SDK API for cancelling and resending
a room key request for an event.

This is useful in scenarios where the user has dismissed the request
on their other devices and would like to send the restart the
verification dance manually.

Depends on JS-SDK PR https://github.com/matrix-org/matrix-js-sdk/pull/624
2018-03-08 14:13:33 +00:00
Richard Lewis c59dd5b840 Add placeholders for sticker images (and fancy transitions). 2018-03-08 12:31:01 +00:00
Osoitz e864dc97ba Translated using Weblate (Basque)
Currently translated at 100.0% (990 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-03-08 10:16:51 +00:00
Weblate e0798af09d Merge remote-tracking branch 'origin/develop' into develop 2018-03-08 09:59:02 +00:00
Марко М. Костић 7f44f236e0 Translated using Weblate (Serbian)
Currently translated at 99.8% (989 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
2018-03-08 09:59:01 +00:00
Tirifto d5ced62b90 Translated using Weblate (Esperanto)
Currently translated at 97.7% (968 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2018-03-08 09:59:01 +00:00
David Baker d919c1a41d Remove spurious console.trace
There's no comment to say why this is here and the commit that
add it (e91e94fd4) doesn't mention it either, so it's presumably
unintentional.
2018-03-08 09:47:42 +00:00
Richard Lewis 7f91b47598 Move sticker picker icon. 2018-03-07 11:52:42 +00:00
Weblate 4a81d1cd6b Merge remote-tracking branch 'origin/develop' into develop 2018-03-06 20:18:07 +00:00
David Baker a97e7375d5 Don't reset the presence timer on every dispatch
Only on user activity (there's now a dispatch every time we set a
member event, ie. A LOT, hence this now being a problem)
2018-03-06 17:48:21 +00:00
Weblate 4d76194a9d Merge remote-tracking branch 'origin/develop' into develop 2018-03-06 12:22:19 +00:00
David Baker d167dbcf86
Merge pull request #1788 from matrix-org/luke/fix-flair-store-potential-mem-leak
Potentially fix a memory leak in FlairStore
2018-03-06 12:22:14 +00:00
Luke Barnard faf517419f Return null instead of undefined on failure 2018-03-06 12:14:41 +00:00
Luke Barnard 0fc79a4a0d Remove delay used in testing 2018-03-06 12:13:46 +00:00
Luke Barnard afbd563810 Potentially fix a memory leak in FlairStore
For each successful request of a group profile, we previously
emitted an `updateGroupProfile` event per caller of
`getGroupProfileCached`. This is sub-optimal because only a single
event emit is required to update the views listening.

It's possible that this was enabling some race to cause a memory
leak but this is not certain, hence the extra logging for future
debugging.
2018-03-06 11:33:56 +00:00
Richard Lewis b529edb5cc Linting 2018-03-06 11:02:36 +00:00
Richard Lewis d5465cf2fa Prefix and clarify global variable naming. 2018-03-06 10:55:59 +00:00
Richard Lewis 7755a3ce90 Nest sticker image element for correct positioning of tooltips. 2018-03-06 10:48:32 +00:00
Weblate 17657aa8e2 Merge remote-tracking branch 'origin/develop' into develop 2018-03-06 09:43:39 +00:00
Ralitsa Bozhkova bd8f78526e Translated using Weblate (Bulgarian)
Currently translated at 100.0% (990 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-03-06 09:43:38 +00:00
Richard Lewis e2cedbe9d7 Pull in changes from develop 2018-03-05 16:43:59 +00:00
Krombel ecad9b9dd3 Translated using Weblate (German)
Currently translated at 100.0% (990 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-03-05 16:38:43 +00:00
Luke Barnard a95f6a9804 Implement transparent RoomTile for use in some places
where a transparent appearance is required (i.e. in MemberInfo
or ChatCreateOrReuseDialog)
2018-03-05 12:36:02 +00:00
Szimszon 73768a7afc Translated using Weblate (Hungarian)
Currently translated at 100.0% (990 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-03-03 08:36:20 +00:00
RainSlide 8d8d73942e Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (990 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-03-02 13:18:50 +00:00
Ralitsa Bozhkova ffcf58b144 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (990 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-03-02 08:53:42 +00:00
Weblate 7daf0279d6 Merge remote-tracking branch 'origin/develop' into develop 2018-03-01 15:56:37 +00:00
David Baker 9a7a7ea2d6
Merge pull request #1784 from matrix-org/luke/fix-group-avatar-default-colour
Fix varying default group avatar colour for given group
2018-03-01 15:56:33 +00:00
Luke Barnard 94c1baa25d Fix varying default group avatar colour for given group 2018-03-01 15:42:22 +00:00
Weblate 2aa15095f2 Merge remote-tracking branch 'origin/develop' into develop 2018-03-01 15:38:16 +00:00
Andrey 379690bcc2 Translated using Weblate (Russian)
Currently translated at 100.0% (990 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-03-01 15:36:58 +00:00
Luke Barnard 86295acba3 Merge branch 'develop' into luke/fix-group-avatar-update 2018-03-01 15:27:06 +00:00
Kévin C 25e8272d2c Translated using Weblate (French)
Currently translated at 100.0% (990 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-03-01 15:07:44 +00:00
Luke Barnard d5908fbc1e Fix FlairStore cache busting 2018-03-01 15:06:05 +00:00
Weblate 8499a95f18 Merge remote-tracking branch 'origin/develop' into develop 2018-03-01 15:05:51 +00:00
David Baker e91ae6b5ac
Merge pull request #1782 from matrix-org/luke/fix-drag-drop-click-weirdness
Workaround for atlassian/react-beautiful-dnd#273
2018-03-01 15:05:47 +00:00
Weblate ad2a8469a3 Merge remote-tracking branch 'origin/develop' into develop 2018-03-01 15:05:14 +00:00
Ralitsa Bozhkova 8b51ad7053 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (989 of 989 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-03-01 15:05:13 +00:00
Luke Barnard 61a6f140f5 onClientSync -> _onClientSync 2018-03-01 14:43:26 +00:00
Luke Barnard 4037a22492 Fix bug where avatar change not reflected in LLP
Fixes vector-im/riot-web#6189
2018-03-01 14:40:03 +00:00
Luke Barnard 64332b3021 Workaround for atlassian/react-beautiful-dnd#273
Fix two bugs in Riot due to a single bug in react-b-dnd

Fixes vector-im/riot-web#6253
Fixes vector-im/riot-web#6156
2018-03-01 13:48:46 +00:00
Krombel 35b42ad729 Translated using Weblate (German)
Currently translated at 100.0% (989 of 989 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-03-01 10:33:56 +00:00
Luke Barnard f29918b766 gen-i18n 2018-02-28 18:18:59 +00:00
Luke Barnard 27c71f15b9 Add setting to disable TagPanel 2018-02-28 18:16:01 +00:00
Weblate b57c9c579c Merge remote-tracking branch 'origin/develop' into develop 2018-02-28 17:07:36 +00:00
David Baker 1ac62a17ff
Merge pull request #1779 from matrix-org/luke/fix-room-settings-power-levels
Fix room power level settings
2018-02-28 17:07:31 +00:00
Weblate de727b37a8 Merge remote-tracking branch 'origin/develop' into develop 2018-02-28 16:58:32 +00:00
Klaus Marx 14d7e5e73d Translated using Weblate (German)
Currently translated at 99.6% (986 of 989 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-02-28 16:58:31 +00:00
RainSlide a48d17258a Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (989 of 989 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-02-28 16:58:30 +00:00
RainSlide 758bc2976c Translated using Weblate (Chinese (Simplified))
Currently translated at 76.3% (755 of 989 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2018-02-28 16:58:30 +00:00
Ralitsa Bozhkova a36ff75da7 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (989 of 989 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-02-28 16:58:30 +00:00
Luke Barnard fa9ff4ae6e
Merge pull request #1769 from matrix-org/t3chguy/fix_hide_joins_parts
fix shouldHideEvent saying an event is a leave/join when a profile ch…
2018-02-28 16:58:26 +00:00
Luke Barnard d3dc2a33b4 Fix bug preventing setting room power levels
- don't use refs, use onChange of PowerSelector
 - store power levels as state in the RoomSetting component
2018-02-28 16:32:20 +00:00
Luke Barnard 567d83ba52 Update PowerSelector to support powerLevelKey prop
As a key to send as second argument to onChange. This is useful
when passing the same callback to multiple PowerSelectors.
2018-02-28 16:15:20 +00:00
Luke Barnard 9a72e69a43 Handle lack of room directory visibility response 2018-02-28 16:14:18 +00:00
Luke Barnard dd529791fb Remove unused prop 2018-02-28 16:13:01 +00:00
Luke Barnard d91d1932f4 Add tests for RoomSettings
For setting:
 - name
 - topic
 - history visibility
 - power levels

Testing RoomSettings required more stubbing on the matrix client.

The power level tests should be failing at this commit, with
fixes being made in upcoming commits.

Some tests are marked as known failures that we should fix but
aren't necessarily bugs:
 - SettingStore.setValue is used when saving despite the user not
   having made a change.
 - Testing directory publicity changes cannot be tested because we
   update state asynchronously in componentWillMount (which we do
   not block on in beforeEach).

Also, we needed to use `export default` to make sure everything
uses the same client peg and client.
2018-02-28 16:07:21 +00:00
Richard Lewis f3c928a4fc Lint. 2018-02-28 13:43:19 +00:00
daniel tygel 32c2650452 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (989 of 989 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
2018-02-28 13:15:02 +00:00
Jeff Huang eebf9193ad Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (989 of 989 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-02-28 06:17:18 +00:00
Michael Telatynski d66d66b2ec
comment on weirdness
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-28 01:03:58 +00:00
Michael Telatynski 03676a68ac
Add /devtools to Autocomplete and run gen-i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-28 00:57:14 +00:00
Michael Telatynski bd4b40309d
fix based on PR review
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-28 00:49:14 +00:00
Jeff Huang 753193055b Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (989 of 989 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-02-28 00:02:52 +00:00
Richard Lewis 0fdbddf8fd Show sticker description as a tooltip, on hover. 2018-02-27 23:07:59 +00:00
Andrey d733e38a8f Translated using Weblate (Russian)
Currently translated at 100.0% (989 of 989 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-02-27 19:38:08 +00:00
Kévin C 7d92248ae3 Translated using Weblate (French)
Currently translated at 100.0% (989 of 989 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-02-27 17:46:29 +00:00
Ralitsa Bozhkova 82592a7024 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (989 of 989 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-02-27 17:36:47 +00:00
Weblate 7e3cf89e5a Merge remote-tracking branch 'origin/develop' into develop 2018-02-27 15:11:17 +00:00
Jeff 624188571b Translated using Weblate (French)
Currently translated at 100.0% (987 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-02-27 15:11:16 +00:00
Katie Wolfe 15f0ae1986 Translated using Weblate (Esperanto)
Currently translated at 97.2% (960 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2018-02-27 15:11:16 +00:00
Ralitsa Bozhkova 7d0f6584ab Translated using Weblate (Bulgarian)
Currently translated at 100.0% (987 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-02-27 15:11:16 +00:00
Osoitz a92e3eac6c Translated using Weblate (Basque)
Currently translated at 100.0% (987 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-02-27 15:11:16 +00:00
Richard Lewis 57c98d96a5 Update widget type. 2018-02-27 13:40:21 +00:00
Richard Lewis ef4d13715a Wrap menu close in timeout to avoid element disappearing unexpectedly. 2018-02-27 11:29:14 +00:00
Luke Barnard 2b49947e1e Add "Did you know:..." microcopy to groups view
To explain how to drag group avatars into the TagPanel
2018-02-27 09:20:06 +00:00
daniel tygel bc18aecd1e Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (987 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
2018-02-26 21:41:09 +00:00
Richard Lewis 8e7564b9a3 Wrap the close menu trigger in a timeout 2018-02-26 17:47:52 +00:00
Richard Lewis 5ca0fc3ab5 Make MStickerBody extend MImageBody. 2018-02-26 14:01:33 +00:00
Richard Lewis b64736aa44 Add listener to close stickerpicker. 2018-02-26 13:43:16 +00:00
Richard Lewis 73c8ef50d1 Fix current roomID. 2018-02-26 13:37:53 +00:00
Richard Lewis 707e3f3382 Temp. revert unintended commit. 2018-02-26 13:32:27 +00:00
Richard Lewis 14d52c9f25 Open integration manager from widget postMessage. 2018-02-26 13:29:16 +00:00
Richard Lewis d3de44e6eb Global interface to start integration manager. 2018-02-26 13:26:49 +00:00
Richard Lewis 20a442c962 Add comment. 2018-02-25 23:00:46 +00:00
Richard Lewis 2b0790b32b Fix PropTypes. 2018-02-25 22:36:59 +00:00
Richard Lewis c93faf7de7 Fix promise wrapping. 2018-02-25 22:21:30 +00:00
Richard Lewis e249e3d622 Correct stickerpicker naming, 2018-02-25 22:10:38 +00:00
Richard Lewis ee4310cc41 Avoid potential NPE. 2018-02-25 21:47:23 +00:00
Richard Lewis 86461bc88f Disable all widget assets on widget removal. 2018-02-24 00:10:28 +00:00
Richard Lewis 332892fee6 Pull in changes from develop 2018-02-23 17:30:42 +00:00
Weblate 26c4192cbd Merge remote-tracking branch 'origin/develop' into develop 2018-02-23 16:36:17 +00:00
Matthew Hodgson 3552800d19
Merge pull request #1753 from matrix-org/luke/fix-room-list-drop-target-bg
Give emptySubListTip a container for correct bg colour
2018-02-23 16:36:10 +00:00
Richard Lewis b2bf4d4709 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot 2018-02-23 15:37:33 +00:00
Richard Lewis 9ae89e2b43 Reduce logging. 2018-02-23 15:27:55 +00:00
Richard Lewis 9b667f2c38 Reduce logging. 2018-02-23 15:26:47 +00:00
Richard Lewis d755b8284c Remove logging and cleanup. 2018-02-23 15:22:56 +00:00
Weblate f053a6b623 Merge remote-tracking branch 'origin/develop' into develop 2018-02-23 15:16:01 +00:00
Richard Lewis 57b027b776 Fix API names. 2018-02-23 15:11:28 +00:00
Luke Barnard fae7af1a62 Do proper null-checks on decypted events to fix NPEs
Previously we assumed that a decrypted event has a room_id
but this isn't necessarily true for to_device events.

It makes sense to ignore events that aren't associated with
rooms anyway given that the list we're updating only contains
rooms!
2018-02-23 15:04:04 +00:00
Richard Lewis 46f94b3c5a Ensure that roomId is validated before accessing room-based widgets. 2018-02-23 14:53:52 +00:00
Weblate 78d2ebdb6b Merge remote-tracking branch 'origin/develop' into develop 2018-02-23 10:38:54 +00:00
David Baker a28691b9de
Merge pull request #1775 from matrix-org/luke/fix-room-list-reordering-e2e
Reorder the RoomListStore lists on Event.decrypted
2018-02-23 10:38:49 +00:00
Luke Barnard 9e969e33b7 Reorder the RoomListStore lists on Event.decrypted 2018-02-23 10:32:33 +00:00
Richard Lewis 88288ff3f5 Add error handling for failure to connect to integration manager. 2018-02-23 10:20:16 +00:00
Weblate 534e81ba60 Merge remote-tracking branch 'origin/develop' into develop 2018-02-23 10:14:12 +00:00
Matthew Hodgson d8ef6f79b1 s/autoShow/autoshow/ 2018-02-23 10:14:02 +00:00
Weblate 9cdc73bdb8 Merge remote-tracking branch 'origin/develop' into develop 2018-02-23 10:12:22 +00:00
Xose M 070619bfdb Translated using Weblate (Galician)
Currently translated at 99.1% (979 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2018-02-23 10:12:21 +00:00
Ralitsa Bozhkova bc162d3bd0 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (987 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-02-23 10:12:21 +00:00
Ralitsa Bozhkova e1fc1c1c6c Translated using Weblate (Bulgarian)
Currently translated at 99.8% (987 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-02-22 20:56:47 +00:00
Slavi Pantaleev 45172537f5 Translated using Weblate (Bulgarian)
Currently translated at 99.8% (986 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-02-22 20:56:47 +00:00
Ralitsa Bozhkova 0838ef3299 Translated using Weblate (Bulgarian)
Currently translated at 99.8% (986 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-02-22 20:56:19 +00:00
Slavi Pantaleev 5402f4919c Translated using Weblate (Bulgarian)
Currently translated at 99.7% (985 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-02-22 20:55:54 +00:00
Luke Barnard 5d6a447620 Fix bug where global "Never send to unverified..." is ignored 2018-02-22 18:47:27 +00:00
Michael Telatynski 4c4c9506ca
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix_hide_joins_parts 2018-02-22 16:21:35 +00:00
Michael Telatynski a897da7504
Use undocumented piwik cmd to disable heartbeattimer
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-22 16:15:50 +00:00
Michael Telatynski 773fef7f1d
fix shouldHideEvent saying an event is a leave/join when a profile change
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-22 16:14:56 +00:00
Osoitz f4bdb4897e Translated using Weblate (Basque)
Currently translated at 100.0% (987 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-02-22 15:36:13 +00:00
Richard Lewis 9a5c916570 Close modal on integration manager launch. 2018-02-22 15:36:01 +00:00
Richard Lewis ce560c577f Fix link spacing 2018-02-22 15:20:51 +00:00
adi1 f2e1c0ebca
Fix TextualBody.js to remove NodeList.forEach()
Not all browsers support forEach() on NodeList objects. This causes crashes on some browsers, such as IE and FF<50.
2018-02-22 13:59:37 +01:00
Weblate 8b9f265f1c Merge remote-tracking branch 'origin/develop' into develop 2018-02-22 11:15:24 +00:00
Ralitsa Bozhkova dbe0a64e39 Translated using Weblate (Bulgarian)
Currently translated at 92.0% (909 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-02-22 11:15:22 +00:00
Matthew Hodgson 663c7e5285
Merge pull request #1767 from matrix-org/luke/fix-tint-updating
Fix bug that prevented tint updates
2018-02-22 11:15:19 +00:00
Luke Barnard f08ec3498a Fix bug that prevented tint updates 2018-02-22 10:53:06 +00:00
Weblate 99b42857b9 Merge remote-tracking branch 'origin/develop' into develop 2018-02-22 10:30:49 +00:00
Ralitsa Bozhkova cc727bc5b5 Translated using Weblate (Bulgarian)
Currently translated at 90.0% (889 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-02-22 10:30:47 +00:00
Matthew Hodgson 8e0f0d3c0b
Merge pull request #1765 from matrix-org/luke/fix-group-member-spinner-order
Fix group member spinner being out of flex order
2018-02-22 10:30:42 +00:00
Szimszon 0c0d4707e1 Translated using Weblate (Hungarian)
Currently translated at 100.0% (987 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-02-22 07:56:27 +00:00
Weblate 862b7b736c Merge remote-tracking branch 'origin/develop' into develop 2018-02-22 00:18:32 +00:00
Richard Lewis 8ac02b34ef
Merge pull request #1766 from matrix-org/rxl881/iframePermissionsFix
Allow widget iframes to request camera and microphone permissions.
2018-02-22 00:18:26 +00:00
Weblate 1b167b32f0 Merge remote-tracking branch 'origin/develop' into develop 2018-02-21 23:51:55 +00:00
Ralitsa Bozhkova 4f122e38e3 Translated using Weblate (Bulgarian)
Currently translated at 81.5% (805 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-02-21 23:51:54 +00:00
Matthew Hodgson 70d2ffc850 don't let 3pid invites mark room as unread
fixes https://github.com/vector-im/riot-web/issues/5698
2018-02-21 23:51:45 +00:00
Richard Lewis 13bebd69c9 Made comment "react-style". 2018-02-21 23:35:57 +00:00
Richard Lewis ecde099146 Fix typo. 2018-02-21 23:24:53 +00:00
Richard Lewis 7e8660cd37 Add comment for "is" attribute. 2018-02-21 23:23:44 +00:00
Richard Lewis ffb524b6a5 Allow widget iframes to request camera and microphone permissions. 2018-02-21 23:10:08 +00:00
lukebarnard 5cd7a7fc06 Fix group member spinner being out of flex order 2018-02-21 19:26:14 +00:00
Kévin C 296e2bd928 Translated using Weblate (French)
Currently translated at 100.0% (987 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-02-21 18:16:22 +00:00
Walter d9032d706f Translated using Weblate (Russian)
Currently translated at 100.0% (987 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-02-21 18:08:38 +00:00
Weblate 242e015ce3 Merge remote-tracking branch 'origin/develop' into develop 2018-02-21 18:05:52 +00:00
Ralitsa Bozhkova bb386c05d9 Translated using Weblate (Bulgarian)
Currently translated at 79.5% (784 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-02-21 18:05:51 +00:00
Matthew Hodgson 4a3be82828
Merge pull request #1764 from matrix-org/luke/feature-tag-panel-global-filter-cross
Change icon from "R" to "X"
2018-02-21 18:05:46 +00:00
Luke Barnard ff868691c9 Only show "X" when filtering, add alt/title 2018-02-21 17:15:43 +00:00
Luke Barnard fc73442cdc Change icon from "R" to "X" 2018-02-21 15:06:10 +00:00
Weblate 3593f1739d Merge remote-tracking branch 'origin/develop' into develop 2018-02-21 13:38:13 +00:00
Ralitsa Bozhkova 5e90da73f0 Translated using Weblate (Galician)
Currently translated at 98.7% (974 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2018-02-21 13:38:12 +00:00
Ralitsa Bozhkova b7601f86d1 Translated using Weblate (Bulgarian)
Currently translated at 76.8% (758 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-02-21 13:38:12 +00:00
Luke Barnard a78575929c Document a few action creators 2018-02-21 10:15:52 +00:00
Luke Barnard 644ddbf9b9 Regenerate room lists on Room event
To make sure that we handle rooms that our
client has not seen previously, we regenerate
the room list when the room is stored -
which is indicated by the js-sdk by the
Room event.
2018-02-20 17:57:46 +00:00
Weblate eadf609932 Merge remote-tracking branch 'origin/develop' into develop 2018-02-20 14:22:23 +00:00
Ralitsa Bozhkova f227d13dfe Translated using Weblate (Bulgarian)
Currently translated at 43.8% (432 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-02-20 14:22:21 +00:00
David Baker b5146001d6
Merge pull request #1761 from matrix-org/luke/fix-direct-messages-with-self
Fix DMs being marked as with the current user ("me")
2018-02-20 14:22:17 +00:00
Luke Barnard bc15303358 Factor out updateDmState 2018-02-20 14:10:34 +00:00
Luke Barnard d21f55633d Fix DMs being marked as with the current user ("me")
Whilst testing various DM paths, @lukebarnard1 found that there were
many failures to add the room as a DM against the correct user. It
turned out most of the failures seen were because the user chosen
was the current user. If the user accepted an invite it would often
be marked as with themselves because we chose the sender of the
join event as the DM user.

This fix makes the DM room setting process the same for both the
inviting client and the invited client. A RoomState.members
event causes the DM room state to be set in the room, regardless
of whether we are currently `joining` (see previous impl.)

The two cases for setting a DM are:
 - this user accepting an invite with is_direct
 - this user inviting someone with is_direct

This should handle all cases for setting DM state.
2018-02-20 14:03:43 +00:00
Weblate d6e1ac3ca6 Merge remote-tracking branch 'origin/develop' into develop 2018-02-20 10:17:24 +00:00
Ralitsa Bozhkova c5ad486c57 Translated using Weblate (Catalan)
Currently translated at 89.2% (880 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
2018-02-20 10:17:23 +00:00
Ralitsa Bozhkova 1c96c1f4d9 Translated using Weblate (Bulgarian)
Currently translated at 38.0% (375 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-02-20 10:17:22 +00:00
David Baker fd90a8b23c
Merge pull request #1756 from matrix-org/luke/fix-recent-ordering
Make RoomListStore aware of Room.timeline events
2018-02-20 10:17:16 +00:00
Weblate 46a29b56d9 Merge remote-tracking branch 'origin/develop' into develop 2018-02-19 16:39:22 +00:00
Ralitsa Bozhkova 4998890a0e Translated using Weblate (Bulgarian)
Currently translated at 27.7% (274 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-02-19 16:39:20 +00:00
Richard van der Hoff 715198dc17
Merge pull request #1760 from matrix-org/matthew/improve-postmessage-origin-check2
improve origin check of ScalarMessaging postmessage API.
2018-02-19 16:39:15 +00:00
Weblate 4c4b813aa1 Merge remote-tracking branch 'origin/develop' into develop 2018-02-19 09:59:25 +00:00
Simó Albert i Beltran 71a1de1e73 Translated using Weblate (Catalan)
Currently translated at 89.2% (880 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
2018-02-19 09:59:23 +00:00
Ralitsa Bozhkova da35871cb1 Translated using Weblate (Bulgarian)
Currently translated at 24.4% (241 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-02-19 09:59:23 +00:00
Luke Barnard 5d1af70b96
Merge pull request #1759 from matrix-org/luke/feature-tag-panel-global-filter
Implement global filter to deselect all tags
2018-02-19 09:59:19 +00:00
Luke Barnard 32130fbc28 Don't regenerate RoomListStore state for notifs/scrollback/etc.
Only do so for the live timeline of rooms.
2018-02-19 09:56:03 +00:00
Matthew Hodgson 2d5a2a9d48 improve origin check of ScalarMessaging postmessage API.
ensures that https://scalar.ve can't access the API.
many thanks to @rugk for pointing out the potential vuln.
cc @rxl881 in case this bug has been transplanted elsewhere.
2018-02-17 00:02:38 +00:00
Luke Barnard 7a0c82a327 Fix click background to deselect 2018-02-16 18:08:29 +00:00
Weblate d5b502743a Merge remote-tracking branch 'origin/develop' into develop 2018-02-16 17:51:30 +00:00
Luke Barnard 113fc696d8 Implement global filter to deselect all tags
and make TagPanel scrollable whilst we're at it.
2018-02-16 17:43:43 +00:00
Travis Ralston cbeee72062
Don't show empty custom tags when filtering tags
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-02-16 10:11:04 -07:00
Luke Barnard 3f6c15506c Remove unused `room` parameter of MatrixActions.Room.timeline 2018-02-16 16:17:47 +00:00
Weblate cedfa4b607 Merge remote-tracking branch 'origin/develop' into develop 2018-02-16 16:01:17 +00:00
Tulir Asokan f2903d1439 Translated using Weblate (Finnish)
Currently translated at 95.2% (939 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2018-02-16 16:01:16 +00:00
Ralitsa Bozhkova cca820c353 Translated using Weblate (Bulgarian)
Currently translated at 15.2% (150 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-02-16 16:01:16 +00:00
Luke Barnard 84ab1ae3e2 Do not assume that tags have been removed
when moving tags
2018-02-16 15:52:15 +00:00
Luke Barnard 94a0a90457 Make RoomListStore aware of Room.timeline events
so that we can do reorderings of lists ordered by most recent event.

No optimisations here; we only update for timeline events
on live timelines that could update the "unread count".
2018-02-16 14:16:50 +00:00
Weblate aae428887a Merge remote-tracking branch 'origin/develop' into develop 2018-02-15 20:20:33 +00:00
Ralitsa Bozhkova b111a824e8 Translated using Weblate (Bulgarian)
Currently translated at 12.0% (119 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-02-15 20:20:32 +00:00
Matthew Hodgson 07b691a45d typo 2018-02-15 20:20:25 +00:00
Weblate 5e8ec9f451 Merge remote-tracking branch 'origin/develop' into develop 2018-02-15 14:51:18 +00:00
Ralitsa Bozhkova 19b6684089 Translated using Weblate (Bulgarian)
Currently translated at 7.0% (70 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-02-15 14:51:17 +00:00
Luke Barnard 1a880761e0
Merge pull request #1747 from matrix-org/luke/fix-scrollbars-on-jump-to-first
Change CSS class for message panel spinner
2018-02-15 14:51:12 +00:00
Luke Barnard 57419a7f8d Give emptySubListTip a container for correct bg colour 2018-02-15 14:11:45 +00:00
Weblate f46c16b94a Merge remote-tracking branch 'origin/develop' into develop 2018-02-15 13:35:14 +00:00
Ralitsa Bozhkova 39af04f090 Translated using Weblate (Bulgarian)
Currently translated at 5.5% (55 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-02-15 13:35:13 +00:00
David Baker 55dc49f4ff Merge remote-tracking branch 'origin/develop' into dbkr/roomliststore_unregister 2018-02-15 13:29:30 +00:00
David Baker ceec405519 Remove RoomListStore listener
This caused the the RoomList component to leak (although in practice
only accross logins because that's the only time it's unmounted)
2018-02-15 11:23:00 +00:00
Weblate e79d502972 Merge remote-tracking branch 'origin/develop' into develop 2018-02-15 11:05:34 +00:00
Ralitsa Bozhkova a4c7da63af Translated using Weblate (Bulgarian)
Currently translated at 4.6% (46 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-02-15 11:05:33 +00:00
Luke Barnard c8ccbed0b1
Merge pull request #1751 from matrix-org/luke/dnd-group-view-tag-panel
Implement GroupTile avatar dragging to TagPanel
2018-02-15 11:05:28 +00:00
Luke Barnard 3948ee8ca1 Give each GroupTile avatar its own droppable
so that they can be dragged and dropped
without interacting with each other, as
they would do if GroupView contained
one droppable to contain them all.
2018-02-14 17:53:54 +00:00
Luke Barnard 389d96bc46 Use optimistic removedTagsAccountData state in TagOrderStore
when receiving TagOrderActions.moveTag.pending, which now exposes
this state.
2018-02-14 16:47:29 +00:00
Luke Barnard 3850b552a5 Make GroupTile avatar draggable 2018-02-14 16:46:06 +00:00
Luke Barnard 74c8a74e7d Add Droppable to GroupView
to contain the GroupTiles as Draggables
2018-02-14 16:43:01 +00:00
Luke Barnard b626420eb9 Move DND context to LoggedInView
so that we can drag things from any part of the logged in app to
another. (Specifically GroupView and TagPanel).
2018-02-14 16:40:58 +00:00
Luke Barnard db4f0cb0bf Handle adding previously removed tags 2018-02-14 16:40:24 +00:00
Weblate c68eb57798 Merge remote-tracking branch 'origin/develop' into develop 2018-02-14 11:41:05 +00:00
David Baker ca763faf96
Merge pull request #1750 from matrix-org/luke/fix-room-list-custom-tag-ordering2
Fix custom tags not being ordered manually
2018-02-14 11:40:59 +00:00
Weblate eb4f5b76b3 Merge remote-tracking branch 'origin/develop' into develop 2018-02-14 11:33:53 +00:00
David Baker 46b8fb9a19
Merge pull request #1746 from matrix-org/luke/fix-room-settings-resets
Store component state for editors
2018-02-14 11:33:48 +00:00
Luke Barnard 3020c8cd94 Fix custom tags not being ordered manually
Actually fixes vector-im/riot-web#6135 unlike #1748, which
incorrectly assumed that custom tags would be included in
listOrders.

This fix makes sure that the `default` case in the `switch`
is actually used.
2018-02-14 11:23:29 +00:00
Luke Barnard 47c232b5b3 Merge branch 'develop' into luke/fix-scrollbars-on-jump-to-first 2018-02-14 11:00:27 +00:00
Weblate 480c046fb1 Merge remote-tracking branch 'origin/develop' into develop 2018-02-14 10:31:43 +00:00
Simó Albert i Beltran db2f6f863a Translated using Weblate (Spanish)
Currently translated at 58.1% (573 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2018-02-14 10:31:43 +00:00
Walter ed871cbd83 Translated using Weblate (Russian)
Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-02-14 10:31:43 +00:00
Simó Albert i Beltran 02e0663409 Translated using Weblate (Catalan)
Currently translated at 88.3% (871 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
2018-02-14 10:31:42 +00:00
Ralitsa Bozhkova bee0a952c3 Translated using Weblate (Bulgarian)
Currently translated at 0.2% (2 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-02-14 10:31:42 +00:00
David Baker 7cc82a682c
Merge pull request #1745 from matrix-org/luke/fix-login-page-feedback
Give the login page its spinner back
2018-02-14 10:31:36 +00:00
Weblate 24c9a06c80 Merge remote-tracking branch 'origin/develop' into develop 2018-02-13 17:28:48 +00:00
Luke Barnard c670b76ec8
Merge pull request #1743 from matrix-org/luke/feature-tag-panel-tile-context-menu
Add context menu to TagTile
2018-02-13 17:28:43 +00:00
Ralitsa Bozhkova 06b18dda18 Added translation using Weblate (Bulgarian) 2018-02-13 17:23:42 +00:00
Luke Barnard a34fea8af8 Merge branch 'develop' into luke/feature-tag-panel-tile-context-menu 2018-02-13 16:51:00 +00:00
Weblate 8ae62b8526 Merge remote-tracking branch 'origin/develop' into develop 2018-02-13 16:15:55 +00:00
Luke Barnard f16bc93fee If a tag is unrecognised, assume manual ordering
(as we did previously)

Fixes https://github.com/vector-im/riot-web/issues/6135
2018-02-13 16:09:17 +00:00
Luke Barnard 5af560f625 Make removedTags a Set for perf 2018-02-13 14:43:34 +00:00
Weblate 1cdb1d841d Merge remote-tracking branch 'origin/develop' into develop 2018-02-13 14:18:52 +00:00
Luke Barnard 36e8bf1f20 Change CSS class for message panel spinner
to stop scrollbars appearing when we
 - jump to a message or,
 - permalink that is to an not paginated in event
2018-02-13 14:13:47 +00:00
Luke Barnard 8377abcd19 Store component state for editors
to prevent a forceUpdate from /sync causing the editors to revert
before the user had a chance to hit "Save".

Part of fixing https://github.com/vector-im/riot-web/issues/6019
2018-02-13 12:01:36 +00:00
Luke Barnard 493116b17e Give the login page its spinner back 2018-02-13 11:43:22 +00:00
Luke Barnard db0ea9eb0e Merge branch 'develop' into luke/room-list-flux 2018-02-13 10:18:24 +00:00
Weblate d28d7d8768 Merge remote-tracking branch 'origin/develop' into develop 2018-02-13 10:00:56 +00:00
Luke Barnard 6d3634a06c Move groups button to TagPanel 2018-02-13 09:44:00 +00:00
Peter Vágner 5e9368e794 Add comments explaining our non standard usage of aria-described-by 2018-02-12 21:13:53 +01:00
Luke Barnard 322012cf88 Add comment to explain hacky optimism 2018-02-12 18:46:36 +00:00
Luke Barnard 3eeef064bf Remove unused asyncId 2018-02-12 18:37:54 +00:00
Luke Barnard 7a4c1994c3 Use Boolean() instead of assuming filter is based on truthiness 2018-02-12 18:35:13 +00:00
Luke Barnard e3f68f12c8 Add context menu to TagTile
With two options: View Community and Remove, which
removes the tag from the panel.
2018-02-12 18:01:08 +00:00
Weblate 66de16e31f Merge remote-tracking branch 'origin/develop' into develop 2018-02-12 10:23:14 +00:00
Oskars 0f5dc5a7e4 Translated using Weblate (Latvian)
Currently translated at 96.5% (952 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lv/
2018-02-12 10:23:14 +00:00
David Baker b4aa9f37f6
Merge pull request #1738 from tulir/timestamp-hover-seconds
Add seconds to timestamp on hover
2018-02-12 11:23:08 +01:00
Aidan Gauland 0fd9b3e9b2 Avoid doubling up username in read receipt view
In the ReadReceiptMarker title, use the RoomMember.rawDisplayName because
RoomMember.name may already include the username, which we are going to add
ourselves.
2018-02-11 16:27:07 +13:00
Aidan Gauland 97ce84c8e3 Add display name to the read receipt view
Show the user's display name (aka nick) in the ReadReceiptMarker
title (mouseover text), and then the user ID in parentheses.
2018-02-11 16:14:17 +13:00
Weblate f2da24533c Merge remote-tracking branch 'origin/develop' into develop 2018-02-10 18:38:48 +00:00
Oskars e141075560 Translated using Weblate (Latvian)
Currently translated at 90.3% (891 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lv/
2018-02-10 18:38:47 +00:00
Matthew Hodgson 40cee9bb02
Merge pull request #1739 from matrix-org/luke/fix-autocomplete-truncated-users
Do not truncate autocompleted users in composer
2018-02-10 18:38:43 +00:00
Richard Lewis 55593416fa Hide apps drawer when viewining room settings. 2018-02-09 13:23:34 +00:00
Tirifto 9dba4ab569 Translated using Weblate (Esperanto)
Currently translated at 97.1% (958 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2018-02-09 12:34:55 +00:00
Weblate 338c9f7fbd Merge remote-tracking branch 'origin/develop' into develop 2018-02-09 12:24:49 +00:00
Марко М. Костић 22aedb6075 Translated using Weblate (Serbian)
Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
2018-02-09 12:24:49 +00:00
Simó Albert i Beltran 52181fde95 Translated using Weblate (Catalan)
Currently translated at 88.3% (871 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
2018-02-09 12:24:48 +00:00
David Baker 3d174b0207 Merge branch 'release-v0.11.4' into develop 2018-02-09 12:24:36 +00:00
David Baker 3e4175f3e0 Add isUrlPermitted function 2018-02-09 12:20:05 +00:00
Richard Lewis 9e3c1fbc7a Pass room name. 2018-02-09 11:44:27 +00:00
Osoitz cf0d45a65b Translated using Weblate (Basque)
Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-02-09 10:28:52 +00:00
Peter Vágner 410570936a Reimplement setting aria-hidden on the main app node by dispatching actions rather than assuming we can find and manipulate the node directly 2018-02-08 22:51:07 +01:00
Марко М. Костић 16049bff3d Translated using Weblate (Serbian)
Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
2018-02-08 21:16:29 +00:00
Peter Vágner 8f97e9479d Ooops, restore a bit of RoomCreateDialog content I have accidentally
removed while trying to solve merge conflicts (thx @dbkr)
2018-02-08 21:16:57 +01:00
Luke Barnard 0154772789 Change wording of debug log submission
Fixes https://github.com/vector-im/riot-web/issues/5985
2018-02-08 18:18:57 +00:00
Richard Lewis 234ca8b062 Remove top padding from app tile. 2018-02-08 17:50:30 +00:00
Luke Barnard c5da1015fe Do not truncate autocompleted users in composer
so that disambiguation is possible at a glance.

Fixes https://github.com/vector-im/riot-web/issues/6024
2018-02-08 17:47:36 +00:00
lukebarnard 9b0df19149 Make RoomListStore aware of sub list orderings
so that it can do optimistic updates of ordered lists.
2018-02-08 16:20:37 +00:00
Luke Barnard 21d70125e4 Dispatch MatrixActions synchronously
Otherwise we risk blocking the dispatches on other work, and they
do not need to be done asynchronously.

This emerged as a bug where the room list appeared empty until
MatrixActions.sync dispatches all occured in one big lump, well
after the sync events being emitted by the js-sdk.
2018-02-08 16:17:26 +00:00
Tulir Asokan 7a594ce08d Add seconds to formatFullDate()
Fixes vector-im/riot-web#6055

Signed-off-by: Tulir Asokan <tulir@maunium.net>
2018-02-08 18:09:04 +02:00
Weblate 8b693c08b7 Merge remote-tracking branch 'origin/develop' into develop 2018-02-08 10:31:18 +00:00
Марко М. Костић 5cf3d3176f Translated using Weblate (Serbian)
Currently translated at 91.1% (899 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
2018-02-08 10:31:18 +00:00
Richard van der Hoff 5823b32ab1
RoomView: guard against unmounting during peeking
it's possible for the user to change room before the peek operation completes. Check if we've been unmounted before setting state.
2018-02-08 10:01:24 +00:00
lukebarnard 2549b44768 Linting 2018-02-07 18:57:32 +00:00
Weblate b3cd0d6da0 Merge remote-tracking branch 'origin/develop' into develop 2018-02-07 16:09:51 +00:00
David Baker d51f6ceea2
Merge pull request #1736 from matrix-org/luke/fix-hs-is-urls-reset
Fix HS/IS URL reset when switching to Registration
2018-02-07 16:09:43 +00:00
lukebarnard 45ad46b468 Fix HS/IS URL reset when switching to Registration 2018-02-07 15:58:29 +00:00
Richard Lewis 5e30468a00 Linting 2018-02-07 14:48:43 +00:00
Richard Lewis 7b75dbbd15 Use default AppTile menu bar. 2018-02-07 14:44:01 +00:00
Weblate cc30f0c15a Merge remote-tracking branch 'origin/develop' into develop 2018-02-07 12:04:39 +00:00
Robert A. Viana 34eae0fbde Translated using Weblate (Portuguese (Brazil))
Currently translated at 67.0% (661 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
2018-02-07 12:04:38 +00:00
Jeff Huang 8d21803df5 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-02-07 12:04:37 +00:00
Luke Barnard 9da708335a
Merge pull request #1734 from matrix-org/dbkr/fix_call_buttons_canary_2
Fix the reject/accept call buttons in canary (mk2)
2018-02-07 12:04:34 +00:00
David Baker 8eb4137ec3 missing semicolon 2018-02-07 11:51:41 +00:00
David Baker 2a68e3ea39 import sdk 2018-02-07 11:42:50 +00:00
Weblate 211cfedc21 Merge remote-tracking branch 'origin/develop' into develop 2018-02-07 10:16:40 +00:00
David Baker 383ef8b2ef
Merge pull request #1731 from matrix-org/dbkr/rate_limited_func_time_from_finish
Make ratelimitedfunc time from the function's end
2018-02-07 10:16:36 +00:00
David Baker 0a5bf07913 Use getComponent 2018-02-07 10:13:19 +00:00
Richard Lewis f3943bef51 Check for empty user widgets. 2018-02-07 10:05:50 +00:00
Weblate fd1daa70d3 Merge remote-tracking branch 'origin/develop' into develop 2018-02-07 09:54:36 +00:00
Марко М. Костић b65e80fa53 Translated using Weblate (Serbian)
Currently translated at 80.4% (793 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
2018-02-07 09:54:36 +00:00
Szimszon 443c19c6e1 Translated using Weblate (Hungarian)
Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-02-07 09:54:35 +00:00
Krombel 74a28a7496 Translated using Weblate (German)
Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-02-07 09:54:35 +00:00
lukebarnard c1649d1b75 Give dialogs a matrixClient context
Dialogs are mounted outside of the main react tree of MatrixChat,
so they won't have its child context.
2018-02-07 09:45:36 +00:00
Krombel ae094bebe5 Translated using Weblate (German)
Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-02-07 09:40:38 +00:00
Richard Lewis 393236ba34 Update / remove stickerpacks 2018-02-07 09:23:00 +00:00
Peter Vágner 054849bc18 Translated using Weblate (Slovak)
Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2018-02-07 08:53:50 +00:00
Peter Vágner 14991afbe5 Merge branch 'develop' into dialog-a11y 2018-02-06 23:04:15 +01:00
Szimszon 1b196655fa Translated using Weblate (Hungarian)
Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-02-06 21:11:38 +00:00
Kévin C ab88c1cf58 Translated using Weblate (French)
Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-02-06 19:11:45 +00:00
David Baker 424c367ecc Fix the reject/accept call buttons in canary (mk2)
Fixes https://github.com/vector-im/riot-web/issues/6081 by making
the accept/reject buttons AccessibleButtons which they should be
anyway (presumably the role=button makes chrome do the right thing
with the events). Also swallow the onClick event otherwise that
propagates out to the room header and causes it to expand/collapse.
2018-02-06 18:45:43 +00:00
Weblate 0601d65af7 Merge remote-tracking branch 'origin/develop' into develop 2018-02-06 17:50:58 +00:00
Luke Barnard cf4ae681f4
Offline mode (#1723)
* Allow the client to run without connection to HS (i.e. using indexeddb)

Allows running without having pushRules (it's safe not to have these 
when running from indexeddb sync.)

This means rooms will be displayed with "unknown" notifcation state.

This assumes anything that uses the push rules will get pushRule state
again when the client starts syncing again.

For recovering from being disconnected, 
* If an avatar has fallen back, try again on reconnection
* If a thumbnail image failed to load, retry on reconnect
* Load joined groups when reconnecting

Update tests to give MELS a context.matrixClient
2018-02-06 17:50:53 +00:00
Luke Barnard 121b776e8a
Merge branch 'develop' into luke/fix-render-1-1-avatars-when-others-leave 2018-02-06 16:46:25 +00:00
Weblate 23df00a53d Merge remote-tracking branch 'origin/develop' into develop 2018-02-06 15:26:54 +00:00
David Baker 6162c0b360 Fix key bindings in address picker dialog
Another regression from https://github.com/matrix-org/matrix-react-sdk/pull/1674

Fixes https://github.com/vector-im/riot-web/issues/5994
2018-02-06 15:01:14 +00:00
David Baker aab57d091d Make ratelimitedfunc time from the function's end
Otherwise any function tghat takes longer than the delay to execute
will become eligible for execution again immediately after
finishing and therefore be able to spin.

This should help with https://github.com/vector-im/riot-web/issues/6060
(at least in the respect that it makes ratelimitedfunc do its job)
even if it's not the reason Riot started getting wedged.
2018-02-06 14:39:13 +00:00
lukebarnard 1ea6301eca Add index fix again
This was changed on /develop to fix an issue where the incorrect
index was being used in a condition to handle literal edge cases
of dragging room tiles to start or end of an ordered sublist.
2018-02-06 14:25:50 +00:00
Andrey 6a858863fc Translated using Weblate (Russian)
Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-02-06 12:41:26 +00:00
lukebarnard dd0e981d72 Handle indication from server that a room has no more tags 2018-02-06 12:00:23 +00:00
lukebarnard 8d0d0b43ff Handle first tag added/last tag removed
This is a special case because untagged rooms should
appear in im.vector.fake.recent and tagged rooms
should not.
2018-02-06 12:00:06 +00:00
lukebarnard b744dbaab7 Handle setting a newTag without metaData
metaData is actually the request body for the PUT that adds the tag
so we need to send {} for e.g. m.lowpriority, which is not manually
ordered.
2018-02-06 11:56:55 +00:00
Weblate 3a5e69d7b5 Merge remote-tracking branch 'origin/develop' into develop 2018-02-06 10:38:05 +00:00
Robert A. Viana 623cc10ab0 Translated using Weblate (Portuguese (Brazil))
Currently translated at 67.0% (660 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
2018-02-06 10:38:04 +00:00
Luke Barnard 127eb61d36
Merge pull request #1730 from matrix-org/dbkr/display_name_change_message
Fix display name change text
2018-02-06 10:37:59 +00:00
David Baker f1eb899cad Re-run i18n script & prune 2018-02-06 10:26:37 +00:00
David Baker 8458023bbc Fix display name change message
(i18n file fixes coming separately for ease of review)

Fixes https://github.com/vector-im/riot-web/issues/5171
2018-02-06 10:24:38 +00:00
lukebarnard feca1707f1 Remove a factor n complexity during room visibility calc 2018-02-06 09:55:58 +00:00
Weblate 584e47a031 Merge remote-tracking branch 'origin/develop' into develop 2018-02-06 09:14:42 +00:00
Robert A. Viana 0f2ca3bd95 Translated using Weblate (Portuguese (Brazil))
Currently translated at 66.9% (659 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
2018-02-06 09:14:42 +00:00
Luke Barnard 71aa4ee9e1
Merge pull request #1721 from matrix-org/t3chguy/composer_slashcmd_history
Persist contentState when sending SlashCommand via MessageComposerInput
2018-02-06 09:14:36 +00:00
lukebarnard c665c1170b Regenerate room lists when we get RoomMember.membership 2018-02-05 18:27:50 +00:00
lukebarnard 9982efbd8f Regenerate room lists when we get m.direct 2018-02-05 18:06:29 +00:00
lukebarnard 415da3e6ab Merge branch 'develop' into luke/room-list-flux 2018-02-05 17:57:46 +00:00
lukebarnard 330ce0f02e On failure, regenerate state from sdk
Instead of using history, which could be unpredictable
2018-02-05 17:34:05 +00:00
Weblate c1dad4579a Merge remote-tracking branch 'origin/develop' into develop 2018-02-05 14:27:22 +00:00
Luke Barnard 70afce73a7
Merge pull request #1726 from matrix-org/t3chguy/fix_usercontent_pointer
This is actually MFileBody not MImageBody, change classname
2018-02-05 14:27:17 +00:00
Weblate 0ec023b523 Merge remote-tracking branch 'origin/develop' into develop 2018-02-05 12:07:47 +00:00
David Baker 0d04c8dab5
Merge pull request #1717 from matrix-org/t3chguy/fix_3pid_dm_rooms
Use invite_3pid prop of createRoom instead of manual invite after create
2018-02-05 12:07:43 +00:00
Richard Lewis e508f06765 Add asset add / remove messaging clauses. 2018-02-05 11:50:25 +00:00
Richard Lewis 992c4771f4 Add button to remove all stickerpacks 2018-02-05 11:49:44 +00:00
Richard Lewis 34de3729fe Add method to remove all stickerpacks. 2018-02-05 11:49:26 +00:00
Richard Lewis 29962ed89d Add stickerpack strings. 2018-02-05 11:48:48 +00:00
lukebarnard 81eca49266 Merge branch 'luke/room-list-flux' of github.com:matrix-org/matrix-react-sdk into luke/room-list-flux 2018-02-05 11:40:42 +00:00
Luke Barnard ff8fcb3139
Merge branch 'develop' into luke/room-list-flux 2018-02-05 11:39:39 +00:00
Weblate 5ddb0b9b4b Merge remote-tracking branch 'origin/develop' into develop 2018-02-05 10:21:10 +00:00
David Baker ec3a37d9f3
Merge pull request #1729 from matrix-org/t3chguy/aliases_null_guard
guard against m.room.aliases events with no keys (redaction?)
2018-02-05 10:21:05 +00:00
Weblate 2d6dd988d6 Merge remote-tracking branch 'origin/develop' into develop 2018-02-05 10:14:28 +00:00
David Baker 3275a56013
Merge pull request #1718 from matrix-org/t3chguy/fix_memberlist_3pid_invites
Fix not showing Invited section if all invites are 3PID
2018-02-05 10:14:23 +00:00
Weblate e1296a076e Merge remote-tracking branch 'origin/develop' into develop 2018-02-05 09:58:44 +00:00
Марко М. Костић 4133801390 Translated using Weblate (Serbian)
Currently translated at 78.4% (772 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
2018-02-05 09:58:44 +00:00
Simó Albert i Beltran 03b137d425 Translated using Weblate (Catalan)
Currently translated at 88.5% (871 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
2018-02-05 09:58:43 +00:00
David Baker 916ab68506
Merge pull request #1720 from matrix-org/t3chguy/nvl/fix_rich_reply_on_image
Fix Rich Replies on files
2018-02-05 09:58:37 +00:00
Nathan van Beelen d884596a1f Translated using Weblate (Dutch)
Currently translated at 100.0% (984 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2018-02-04 14:23:33 +00:00
Michael Telatynski d1a24ac87b
guard against m.room.aliases events with no keys (redaction?)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-02 08:12:56 +00:00
Krombel 41c9cb1c27 Translated using Weblate (German)
Currently translated at 100.0% (984 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-02-01 15:12:22 +00:00
David Baker 497cf21c86 Translated using Weblate (Hungarian)
Currently translated at 100.0% (984 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-02-01 10:35:12 +00:00
Weblate ee81d6aea1 Merge remote-tracking branch 'origin/develop' into develop 2018-01-31 18:10:59 +00:00
Nathan van Beelen 3a33eea5e9 Translated using Weblate (Dutch)
Currently translated at 75.5% (743 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2018-01-31 18:10:57 +00:00
David Baker 4c17b5f1c7
Merge pull request #1724 from matrix-org/t3chguy/nvl/rich_quoting_nullguard
Null guard against falsey (non-null) props.node, to make react happy
2018-01-31 18:10:52 +00:00
Weblate f193b3ae2c Merge remote-tracking branch 'origin/develop' into develop 2018-01-30 15:21:19 +00:00
David Baker cfd1f28258
Merge pull request #1722 from matrix-org/luke/load-tags-after-first-sync
Use correct condition for getting account data after first sync
2018-01-30 15:21:12 +00:00
Michael Telatynski 8a6727ea98
This is actually MFileBody not MImageBody, change classname
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-30 10:55:23 +00:00
Weblate 1fa9e7420f Merge remote-tracking branch 'origin/develop' into develop 2018-01-30 10:27:20 +00:00
Марко М. Костић 977dec40a3 Translated using Weblate (Serbian)
Currently translated at 60.8% (599 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
2018-01-30 10:27:19 +00:00
Szimszon fd4fc883c1 Translated using Weblate (Hungarian)
Currently translated at 100.0% (984 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-01-30 10:27:19 +00:00