aa20ad706e
Remove redundant `currentRoomAlias`
2017-06-08 15:30:43 +01:00
ea97d16aa2
Merge branch 'develop' into luke/fix-event-id-state
...
Conflicts:
src/components/structures/MatrixChat.js
2017-06-08 14:33:58 +01:00
f320f7d475
Remove redundant action id
2017-06-08 14:30:45 +01:00
409d2d5d28
Merge pull request #1055 from matrix-org/rav/enforce_linting_of_clean_files
...
Make travis check for lint on files which are clean to start with
2017-06-08 14:24:19 +01:00
d3cf78ff5a
Control currently viewied event via RoomViewStore
...
Fix for https://github.com/vector-im/riot-web/issues/4224
Due to the way `MatrixChat` does a state update when the `view_room` dispatch fires and a second update when `RoomViewStore` sends an update, the current event ID and room ID were becoming out of sync. The solution devised was to have the event ID managed by the `RoomViewStore` itself and do any defaulting there (for when we revisit a room that we saved scroll state for previously).
This required a few changes:
- The addition of `update_scroll_state` in `RoomViewStore` allows the `RoomView` to save scroll state for a room before swapping to another one. Previously the caching of scroll state was done in `RoomView`.
- The `view_room` dispatch now accepts an `event_id`, which dictates which event is supposed to be scrolled to in the `MessagePanel` when a new room is viewed. It also accepts `event_offset`, but currently, this isn't passed in by a dispatch in the app, but it is clobbered when loading the default position when an `event_id` isn't specified. Finally, `highlighted` was added to distinguish whether the initial event being scrolled to is also highlighted. This flag is also used by `viewRoom` in `MatrixChat` in order to decide whether to `notifyNewScreen` with the specified `event_id`.
2017-06-08 14:17:49 +01:00
8479a8f5ff
Update .eslintignore.errorfiles
2017-06-08 14:11:34 +01:00
9bda212cb1
Make travis/jenkins check for lint on files which are clean to start with
2017-06-08 14:03:30 +01:00
c9f723b160
Update from Weblate. ( #1053 )
...
* Added translation using Weblate (Thai)
* Translated using Weblate (Thai)
Currently translated at 2.6% (22 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (Thai)
Currently translated at 8.9% (74 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (German)
Currently translated at 99.8% (826 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (Swedish)
Currently translated at 35.4% (293 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/sv/
* Translated using Weblate (Thai)
Currently translated at 9.7% (81 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (German)
Currently translated at 100.0% (827 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (Russian)
Currently translated at 76.9% (636 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
* Translated using Weblate (Hungarian)
Currently translated at 0.1% (1 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/hu/
* Translated using Weblate (Thai)
Currently translated at 39.2% (325 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (German)
Currently translated at 99.8% (827 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (German)
Currently translated at 99.8% (827 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (Thai)
Currently translated at 39.7% (329 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (German)
Currently translated at 99.8% (828 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (Hungarian)
Currently translated at 3.1% (26 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/hu/
* Translated using Weblate (Russian)
Currently translated at 77.4% (641 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
* Translated using Weblate (Thai)
Currently translated at 39.7% (329 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (Russian)
Currently translated at 100.0% (828 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
* Translated using Weblate (German)
Currently translated at 100.0% (828 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (Russian)
Currently translated at 100.0% (828 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
* Translated using Weblate (German)
Currently translated at 100.0% (850 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (French)
Currently translated at 96.5% (821 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
* Translated using Weblate (Thai)
Currently translated at 39.0% (332 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (French)
Currently translated at 97.0% (825 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
* Translated using Weblate (German)
Currently translated at 100.0% (850 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (Thai)
Currently translated at 40.8% (347 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (French)
Currently translated at 100.0% (850 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
* Translated using Weblate (German)
Currently translated at 100.0% (850 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (Thai)
Currently translated at 49.5% (421 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (Thai)
Currently translated at 56.0% (476 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (Russian)
Currently translated at 100.0% (852 of 852 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
* Translated using Weblate (German)
Currently translated at 99.7% (850 of 852 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (Thai)
Currently translated at 56.2% (479 of 852 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (German)
Currently translated at 99.7% (851 of 853 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (German)
Currently translated at 99.7% (851 of 853 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (German)
Currently translated at 100.0% (853 of 853 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-08 12:05:02 +01:00
bc0eb4294c
rename welcome page to home
2017-06-08 10:27:35 +01:00
22a4325ca3
Merge pull request #1054 from matrix-org/rav/logging_for_timeline_load_fail
...
Add some logging around switching rooms
2017-06-08 09:41:41 +01:00
566fb2caeb
Add some logging around switching rooms
...
... which I wish had been there when I was staring at a rageshake.
2017-06-07 22:41:02 +01:00
ea02d8841c
Update from Weblate. ( #1052 )
...
* Added translation using Weblate (Thai)
* Translated using Weblate (Thai)
Currently translated at 2.6% (22 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (Thai)
Currently translated at 8.9% (74 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (German)
Currently translated at 99.8% (826 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (Swedish)
Currently translated at 35.4% (293 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/sv/
* Translated using Weblate (Thai)
Currently translated at 9.7% (81 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (German)
Currently translated at 100.0% (827 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (Russian)
Currently translated at 76.9% (636 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
* Translated using Weblate (Hungarian)
Currently translated at 0.1% (1 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/hu/
* Translated using Weblate (Thai)
Currently translated at 39.2% (325 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (German)
Currently translated at 99.8% (827 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (German)
Currently translated at 99.8% (827 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (Thai)
Currently translated at 39.7% (329 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (German)
Currently translated at 99.8% (828 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (Hungarian)
Currently translated at 3.1% (26 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/hu/
* Translated using Weblate (Russian)
Currently translated at 77.4% (641 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
* Translated using Weblate (Thai)
Currently translated at 39.7% (329 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (Russian)
Currently translated at 100.0% (828 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
* Translated using Weblate (German)
Currently translated at 100.0% (828 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (Russian)
Currently translated at 100.0% (828 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
* Translated using Weblate (German)
Currently translated at 100.0% (850 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (French)
Currently translated at 96.5% (821 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
* Translated using Weblate (Thai)
Currently translated at 39.0% (332 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
2017-06-07 18:48:48 +01:00
ca1c0e42b0
oops, merge correctly
2017-06-07 18:42:34 +01:00
5cf44454d2
fix more punctuation fails
2017-06-07 18:41:18 +01:00
f7ab6a574c
Remove unused string
2017-06-07 18:32:52 +01:00
8228db88d2
oops, fix more i18n var name typos
2017-06-07 18:28:49 +01:00
ef2fedc3a9
fix missing translations and typos in i18n
2017-06-07 18:24:35 +01:00
fe487232ad
sync fullstops everywhere
2017-06-07 18:15:56 +01:00
74d680a952
sync fullstops everywhere
2017-06-07 18:15:56 +01:00
0370b7c5e8
Merge pull request #1050 from matrix-org/luke/feature-user-directory-invite
...
Use user_directory endpoint to populate ChatInviteDialog
2017-06-07 18:06:35 +01:00
29da25529c
Make it backwards compatible
...
Hit the user_directory API and if M_UNRECOGNIZED, do a local search and continue to search locally therein.
2017-06-07 17:53:58 +01:00
68ddf35db4
Use then, catch, done and display any errors that occur during search
2017-06-07 17:33:15 +01:00
bfa095184d
Merge pull request #1046 from matrix-org/t3chguy/piwik_fixes_1
...
Various Analytics changes/fixes/improvements
2017-06-07 17:17:47 +01:00
e9a66625b2
Merge pull request #1051 from matrix-org/luke/fix-room-list-undefined-this
...
Use an arrow function to allow `this`
2017-06-07 16:26:30 +01:00
49b22fb6c6
Use an arrow function to allow `this`
...
This was causing `TypeError: Cannot read property '_getEmptyContent' of undefined` for those with custom tags.
2017-06-07 16:13:40 +01:00
3b6599dcdc
Use user_directory endpoint to populate ChatInviteDialog
...
Also attempt to slightly improve the feedback given when searching. There is still room for improvement - it's not totally obvious whether to display a spinner because it's quite jarring were it to replace the dd. This does mean that "No results" will flash awkardly between two queries, neither of which return any results.
2017-06-07 16:05:36 +01:00
d4041777f9
Merge pull request #937 from matrix-org/new-guest-access
...
New guest access
2017-06-07 13:39:57 +01:00
53ea41e8a5
Merge branch 'develop' into new-guest-access
2017-06-07 12:08:37 +01:00
d59b0e1595
Merge pull request #1048 from matrix-org/kegan/translation-gibbon
...
Translate src/components/structures
2017-06-07 12:01:52 +01:00
ccaa55d2c8
Merge pull request #1049 from matrix-org/dbkr/ilag_cancel_join_on_login
...
Cancel 'join room' action if 'log in' is clicked
2017-06-07 11:59:45 +01:00
1dbdbc163b
Cancel 'join room' action if 'log in' is clicked
...
or 'choose different server'
We canceled the deferred action in the MatrixChat SetMxId dialog
but not the one in roomview.
Fixes https://github.com/vector-im/riot-web/issues/4217
2017-06-07 11:55:24 +01:00
4127e7121c
Translate src/components/structures
...
Includes some pluralisation! Tested them manually to make sure they work.
2017-06-07 11:40:46 +01:00
0a2a782d63
track the action of opt-out
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-07 11:26:52 +01:00
bd948ef915
for riot.im instances, track location.pathname
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-07 11:25:27 +01:00
56df54f946
hardcode logged url to riot.im/app so piwik has a base to work with, it gets confused when a CustomURL isn't actually a URL (like it wasn't after the latest redaction fixes.
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-07 11:17:57 +01:00
184c2d5e58
Merge pull request #1015 from matrix-org/t3chguy/random_fix_1
...
fix copy and paste derp and rip out unused imports
2017-06-06 18:02:35 +01:00
9f15e8e152
Merge branch 'master' into develop
2017-06-06 17:41:05 +01:00
31f1e421f2
v0.9.2
2017-06-06 17:40:30 +01:00
5191f93432
Prepare changelog for v0.9.2
2017-06-06 17:40:30 +01:00
00ccf4bb51
Revert "Call MatrixClient.clearStores on logout"
...
This reverts commit c3d37c1ff9
2017-06-06 17:33:50 +01:00
df6940c5f3
Merge pull request #1044 from matrix-org/luke/fix-password-recovery-landing
...
Hotfix: Allow password reset when logged in
2017-06-06 17:27:09 +01:00
205fd1fad4
Allow password reset when logged in
2017-06-06 17:22:49 +01:00
71c12b0615
Update from Weblate. ( #1042 )
...
* Added translation using Weblate (Thai)
* Translated using Weblate (Thai)
Currently translated at 2.6% (22 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (Thai)
Currently translated at 8.9% (74 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (German)
Currently translated at 99.8% (826 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (Swedish)
Currently translated at 35.4% (293 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/sv/
* Translated using Weblate (Thai)
Currently translated at 9.7% (81 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (German)
Currently translated at 100.0% (827 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (Russian)
Currently translated at 76.9% (636 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
* Translated using Weblate (Hungarian)
Currently translated at 0.1% (1 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/hu/
* Translated using Weblate (Thai)
Currently translated at 39.2% (325 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (German)
Currently translated at 99.8% (827 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-06 16:44:28 +01:00
5c1866c1c6
Add get_membership_count scalar API ( #1043 )
2017-06-06 16:41:08 +01:00
0b56d33bd2
Null guard all interpolated strings passed to _t ( #1035 )
2017-06-06 13:56:37 +01:00
9c30de0eaa
Merge pull request #1041 from matrix-org/dbkr/reset_first_sync_promise
...
Reset 'first sync' flag / promise on log in
2017-06-06 11:43:28 +01:00
c27f50207d
comment
2017-06-06 11:43:07 +01:00
12d2480916
Reset 'first sync' flag / promise on log in
...
Otherwise on any logins after the first,we always think the first
sync has completed.
2017-06-06 11:36:33 +01:00
22df03944c
Merge branch 'develop' into new-guest-access
2017-06-06 10:35:28 +01:00
f8198ba9c9
Merge branch 'develop' into new-guest-access
2017-06-06 10:33:01 +01:00
Luke Barnard