Richard Lewis
2da30137ec
Fix import path and add LG widget
2017-06-13 10:31:16 +01:00
Michael Telatynski
c1d1a1377c
allow forcing of TURN, pass account val per-call until UX is designed.
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-12 20:20:27 +01:00
Richard Lewis
f9f924bbd6
Merge branch 'master' of https://github.com/matrix-org/matrix-react-sdk into rxl881/apps
2017-06-12 14:50:25 +01:00
Michael Telatynski
c1cbdbcc4f
Merge branches 'develop' and 'kegan/hide-join-part' of github.com:matrix-org/matrix-react-sdk into kegan/hide-join-part
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
# Conflicts:
# src/components/structures/UserSettings.js
2017-06-12 13:22:52 +01:00
Richard van der Hoff
cc74a09abd
Remove start_upgrade_registration dispatch handler
...
This dispatch is no longer raised anywhere, so we may as well get rid of the
code that it executes, as well as the state which is only set there.
2017-06-12 08:38:29 +01:00
Richard van der Hoff
9e96e8e87f
Remove guest-only bits of UserSettings
...
There is now no way to open UserSettings as a guest, so we might as well lose
the dead code.
2017-06-12 08:36:41 +01:00
Richard van der Hoff
56efe7d2f2
Merge pull request #1064 from matrix-org/rav/delinting
...
Delinting
2017-06-12 08:34:58 +01:00
Oliver Hunt
4124a8dcff
Save scroll state immediately before updating
...
Signed-off-by: Oliver Hunt <oliver@hunt.bz>
2017-06-12 06:19:12 +01:00
Michael Telatynski
ccad1013a7
don't return null in case it breaks things
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-11 23:42:22 +01:00
Michael Telatynski
1069bd33f0
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/updating_stuff
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-11 23:21:50 +01:00
Michael Telatynski
6ead97c7a6
change interface to UpdateCheckBar and change launching mechanism
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-11 19:12:40 +01:00
Luke Barnard
ecc8abbfc9
When ChatCreateOrReuseDialog is cancelled by a guest, go home
2017-06-09 13:46:45 +01:00
Robert Swain
9e0b476b72
Merge branch 'develop' into rob/apps
2017-06-09 12:06:44 +02:00
David Baker
924c08b143
Merge pull request #1067 from matrix-org/luke/fix-forgetting-last-room
...
Goto /home when forgetting the last room
2017-06-09 11:03:14 +01:00
Luke Barnard
19bb879fbf
Handle only 1 room in the list
2017-06-09 10:54:42 +01:00
Luke Barnard
c7229967a6
Goto /home when forgetting the last room
2017-06-09 10:28:45 +01:00
Luke Barnard
a21b6e61a6
Default to home page when settings is closed
...
If the current room isn't set.
2017-06-09 10:08:26 +01:00
Richard van der Hoff
105c6b2b87
delint MatrixChat
...
once more. with feeling.
2017-06-09 03:09:03 +01:00
Richard van der Hoff
20bdae6079
delint UserSettings.js
2017-06-09 03:08:57 +01:00
Luke Barnard
ce0977373e
Merge pull request #1058 from matrix-org/luke/fix-event-id-state
...
Control currently viewed event via RoomViewStore
2017-06-08 18:10:29 +01:00
Luke Barnard
5588e115eb
Clarify doc for highlighted
2017-06-08 17:57:37 +01:00
Luke Barnard
9892566007
Highlighted means highlighted
2017-06-08 17:54:41 +01:00
Luke Barnard
c02dbd1cdc
Rename initial state variables
2017-06-08 17:26:08 +01:00
David Baker
5e55b6a643
PR feedback
2017-06-08 16:23:43 +01:00
David Baker
9def0bb5c2
Oops, fix email check
2017-06-08 16:08:19 +01:00
David Baker
8dc20606c8
Use comma for list of three things
2017-06-08 16:07:29 +01:00
Luke Barnard
000a045e35
Rename RVS state (event -> initialEvent) and redocument
2017-06-08 15:52:21 +01:00
David Baker
d691c891e7
Move all login error string generation into view
...
This makes all the various hits done by login report the same
useful error messages and gets rid of the broken ones like printing
the http status code even if it was undefined. Also add text for
the case of overzealous browser extensions because lots of people
get bitten by it.
2017-06-08 15:49:48 +01:00
Luke Barnard
1792fa45f4
Null-guard roomId before sending a dispatch to update scroll state
...
Otherwise we pointlessly assign the null key to something
2017-06-08 15:45:50 +01:00
Luke Barnard
59e649f326
Add comment about roomId potentially not being resolved following an update from RoomViewStore
2017-06-08 15:43:45 +01:00
Luke Barnard
e58e4db628
Explain why search results are cleared when eventId changes
2017-06-08 15:38:58 +01:00
Luke Barnard
dca2be6325
Add RoomView initial state and docs
2017-06-08 15:37:30 +01:00
Luke Barnard
2e82bf40fb
Explain setting of highlighted in room/$eventId showScreen handling.
2017-06-08 15:34:20 +01:00
Luke Barnard
8ddc38c9b1
Doc _viewRoom highlighted
2017-06-08 15:32:31 +01:00
Luke Barnard
aa20ad706e
Remove redundant currentRoomAlias
2017-06-08 15:30:43 +01:00
Luke Barnard
ea97d16aa2
Merge branch 'develop' into luke/fix-event-id-state
...
Conflicts:
src/components/structures/MatrixChat.js
2017-06-08 14:33:58 +01:00
Luke Barnard
f320f7d475
Remove redundant action id
2017-06-08 14:30:45 +01:00
Luke Barnard
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
David Baker
6d1fa775a0
Formatting
2017-06-08 14:14:45 +01:00
Richard van der Hoff
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
Matthew Hodgson
ef2fedc3a9
fix missing translations and typos in i18n
2017-06-07 18:24:35 +01:00
Richard van der Hoff
27e5098e00
Merge remote-tracking branch 'origin/develop' into rav/handle_received_room_key_requests
2017-06-07 15:44:33 +01:00
Richard Lewis
a09001933a
git status
2017-06-07 15:39:27 +01:00
Richard van der Hoff
c1151fd31c
Merge branch 'develop' into rav/handle_received_room_key_requests
2017-06-07 15:37:38 +01:00
Luke Barnard
53ea41e8a5
Merge branch 'develop' into new-guest-access
2017-06-07 12:08:37 +01:00
David Baker
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
Kegan Dougal
4127e7121c
Translate src/components/structures
...
Includes some pluralisation! Tested them manually to make sure they work.
2017-06-07 11:40:46 +01:00
Richard Lewis
c552f7f336
App icon styling
2017-06-07 10:55:49 +01:00
Oliver Hunt
3d59d72aaa
Fixed pagination infinite loop caused by long messages
...
Signed-off-by: Oliver Hunt <oliver@hunt.bz>
2017-06-07 04:49:41 +01:00
Richard Lewis
f6f660fa9a
Initial app icon tiles
2017-06-06 23:45:17 +01:00
Matthew Hodgson
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
David Baker
9f15e8e152
Merge branch 'master' into develop
2017-06-06 17:41:05 +01:00
David Baker
00ccf4bb51
Revert "Call MatrixClient.clearStores on logout"
...
This reverts commit c3d37c1ff9
.
This commit was introducing a bug where no rooms would be shown if
you want straight to /#/login and logged in (because this causes
a guest session to be created but the indexeddb store not to be
cleared, so the new login picks up the stale indexedb sync data.
2017-06-06 17:33:50 +01:00
Luke Barnard
205fd1fad4
Allow password reset when logged in
2017-06-06 17:22:49 +01:00
David Baker
c27f50207d
comment
2017-06-06 11:43:07 +01:00
David Baker
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
David Baker
f8198ba9c9
Merge branch 'develop' into new-guest-access
2017-06-06 10:33:01 +01:00
Matthew Hodgson
ed7c138d91
quick and dirty override to disable MD globally
2017-06-05 21:38:25 +01:00
David Baker
a99f6525c9
Merge pull request #1039 from matrix-org/dbkr/ilag_cancel_action
...
Cancel deferred actions
2017-06-05 21:27:13 +01:00
Luke Barnard
4ab6dc9ddd
Merge branch 'new-guest-access' into luke/ilag-i18n
2017-06-05 20:28:51 +01:00
David Baker
f6cfff9098
Cancel deferred actions
...
if the set mxid dialog is canceled
2017-06-05 18:37:38 +01:00
Richard Lewis
dc4f321707
Pass room and user id to apps draw
2017-06-05 18:21:31 +01:00
David Baker
5924654f9d
Defer an intention for creating a room
2017-06-05 17:45:01 +01:00
Erik Johnston
998a55a590
Add basic group view
2017-06-05 17:10:08 +01:00
David Baker
3dbea45426
Comment
2017-06-05 16:50:00 +01:00
David Baker
3c0290588c
Always show the spinner during the first sync
...
Before, we were relying on the fact that `ready` would still have
been false from before. This was not the case, for example, if we
naviagted straight to /#/login (which causes a guest session to be
set up and the sync for that completes after we navigate to the
login screen).
We should always mark ourselves as not-ready after login since we
will always have to wait for the sync.
2017-06-05 16:17:32 +01:00
Luke Barnard
619830617a
Merge branch 'develop' into luke/ilag-i18n
...
In order to get ILAG internationalised
Conflicts:
src/components/structures/LoggedInView.js
src/components/structures/MatrixChat.js
src/components/views/dialogs/ChatCreateOrReuseDialog.js
src/components/views/dialogs/SetDisplayNameDialog.js
src/createRoom.js
src/i18n/strings/en_EN.json
2017-06-05 16:08:03 +01:00
David Baker
c5cd6aecd6
Revert "Call MatrixClient.clearStores on logout"
...
This reverts commit c3d37c1ff9
.
This commit was introducing a bug where no rooms would be shown if
you want straight to /#/login and logged in (because this causes
a guest session to be created but the indexeddb store not to be
cleared, so the new login picks up the stale indexedb sync data.
2017-06-05 15:54:44 +01:00
David Baker
85aa3f6f13
Merge pull request #1032 from matrix-org/luke/fix-welcome-user-background
...
Only view welcome user if we are not looking at a room
2017-06-05 14:38:55 +01:00
David Baker
d8e3423060
Merge pull request #1031 from matrix-org/luke/fix-deferred-start-chat-settings
...
Keep deferred actions for view_user_settings and view_create_chat
2017-06-05 14:10:29 +01:00
Luke Barnard
c82e79ab5f
Only view welcome user if we are not looking at a room
2017-06-05 14:07:24 +01:00
Luke Barnard
3195b9f964
Keep deferred actions for view_user_settings and view_create_chat
...
This will bring up the correct UI as intended instead of defaulting to the home page with welcome user in the room list.
Fixes https://github.com/vector-im/riot-web/issues/4162
2017-06-05 13:41:52 +01:00
Luke Barnard
beafb68538
Don't do a deferred start chat if user is welcome user
...
There's no point in deferring creating a new DM with the welcome user because the setMxId dialog will do so anyway.
2017-06-05 13:14:55 +01:00
Luke Barnard
239874ccce
Introduce state peekLoading
to avoid collision with roomLoading
...
The room loading spinner will now be displayed if the alias is being resolved (roomLoading) or if the peek is being loaded for the room `peekLoading`.
2017-06-05 09:52:39 +01:00
Michael Telatynski
98e99d542b
i18n things
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-03 15:49:28 +01:00
Michael Telatynski
0f4dc5c072
first iter of manual update control
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-03 15:49:28 +01:00
Michael Telatynski
464863acd6
remove unused imports
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 21:35:55 +01:00
David Baker
2cc9f9c403
Fix accepting a 3pid invite
...
Fixes https://github.com/vector-im/riot-web/issues/4123
2017-06-02 16:25:14 +01:00
David Baker
ec0ad93ad7
Merge pull request #1007 from matrix-org/dbkr/propagate_room_join_errors
...
Propagate room join errors to the UI
2017-06-02 16:09:34 +01:00
Kegan Dougal
bfb313ce9d
riot-bot only if english please
2017-06-02 14:13:45 +01:00
Matthew Hodgson
375b435dfe
hide analytics settings if no piwik url
2017-06-02 13:34:01 +01:00
Matthew Hodgson
adfeff34ae
Merge pull request #1004 from matrix-org/t3chguy/hide_redactions
...
allow hiding redactions, restoring old behaviour
2017-06-02 12:27:52 +01:00
Luke Barnard
953a573f81
Merge pull request #1006 from matrix-org/luke/new-guest-access-user-action-chat
...
Implement /user/@userid:domain?action=chat
2017-06-02 12:03:11 +01:00
David Baker
03f4f269ce
Propagate room join errors to the UI
...
Dispatch so we can set the state in RoomViewStore. Show the error
when the room join fails (unsure if it's better to do this from
the component or the store). Remove unused joinError from roomview.
2017-06-02 11:53:10 +01:00
Luke Barnard
e88b52fa8f
Add comment
2017-06-02 11:42:47 +01:00
Luke Barnard
6a9781f023
Remove redundant state
2017-06-02 11:41:09 +01:00
Luke Barnard
defecb1b14
Implement /user/@userid:domain?action=chat
...
This is a URL that can be used to start a chat with a user.
- If the user is a guest, setMxId dialog will appear before anything and a defered action will cause `ChatCreateOrReuseDialog` to appear once they've logged in.
- If the user is registered, they will not see the setMxId dialog.
fixes https://github.com/vector-im/riot-web/issues/4034
2017-06-02 11:36:18 +01:00
Kegan Dougal
a8ca7c899f
Review comments
2017-06-02 11:16:08 +01:00
Kegan Dougal
f54c182eb1
Add remaining strings for vector-im/riot-web#4151
2017-06-02 10:47:08 +01:00
Richard van der Hoff
a3a262b150
Merge remote-tracking branch 'origin/develop' into rav/handle_received_room_key_requests
2017-06-02 10:31:14 +01:00
Michael Telatynski
5e2e550bf9
don't lose date seperator when the first event of the new day is redacted
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 04:39:44 +01:00
Michael Telatynski
d2d0ba952a
allow hiding redactions. no point onAccountData as it'd cause a full
...
refresh, this may need to be handled differently in the future.
Currently handling same as the new timestamp stuff
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 04:23:07 +01:00
Michael Telatynski
b1973d7998
undefined =/= ''
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 00:42:19 +01:00
Michael Telatynski
f4db83a031
try empty string as falsey key
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 00:31:43 +01:00
Michael Telatynski
6b4daf02a9
i18 missed things
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 00:27:20 +01:00
Michael Telatynski
0bafd6458a
Revert voodoo
2017-06-02 00:26:31 +01:00
Michael Telatynski
46a9326607
special case default - CallMediaHandler can figure it out
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 00:20:34 +01:00
Michael Telatynski
3eb519b227
this is just endless
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 23:54:17 +01:00
Michael Telatynski
beedeec163
copy the arrays so we're not making a mess
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 23:50:14 +01:00
Michael Telatynski
0f2c89d525
lets actually make things work, eh?
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 23:39:54 +01:00
Michael Telatynski
4e36c10c38
only unshift default if there is no deviceId===default
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 23:33:36 +01:00
Michael Telatynski
dd4480f8c3
change device data structure to array of objects
...
so that we can set falsey values, for unsetting device
most dolphinately needs testing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 23:26:43 +01:00
Michael Telatynski
aa90d6b097
fix **AMAZING** C&P derp
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 23:00:25 +01:00
Michael Telatynski
dbba1dedb6
i18nize all the things and change show logic
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 22:58:17 +01:00
Michael Telatynski
04b86e5d1d
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into webrtc_settings
...
and i18nize webrtc stufffs
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
# Conflicts:
# src/components/structures/UserSettings.js
2017-06-01 22:56:31 +01:00
Matthew Hodgson
ee965a89a7
Merge pull request #986 from uhoreg/compact
...
enable useCompactLayout user setting an add a class when it's enabled
2017-06-01 21:32:54 +01:00
Matthew Hodgson
6c56fa3381
Merge pull request #990 from matrix-org/kegan/translation-marmoset
...
Translation fixes for everything but src/components
2017-06-01 21:22:00 +01:00
Richard van der Hoff
7d55f3e75d
handle room key request cancellations
2017-06-01 18:40:04 +01:00
Richard van der Hoff
d5bc24d9f7
Initial implementation of KeyRequestHandler, KeyShareDialog etc
2017-06-01 18:40:04 +01:00
Matthew Hodgson
33214b8752
Merge pull request #991 from turt2live/travis/date-sep-12hr
...
Support 12hr time on DateSeparator
2017-06-01 18:26:13 +01:00
Luke Barnard
16c4c14a16
Fix to show the correct room
2017-06-01 18:01:30 +01:00
Richard van der Hoff
53ebc8d7bd
Merge pull request #983 from matrix-org/rav/clear_storage_on_logout
...
Call MatrixClient.clearStores on logout
2017-06-01 17:34:21 +01:00
turt2live
ab1e277f5f
Support 12hr time on DateSeparator
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-06-01 09:53:24 -06:00
Kegan Dougal
ced68f2719
Find a way to translate the name of RTE in user settings
...
I never said it was a *nice* way...
2017-06-01 15:53:08 +01:00
Matthew Hodgson
00750b4686
quick and dirty RoomAvatarEvent
2017-06-01 13:31:24 +01:00
Hubert Chathi
92d1a9a6ff
enable useCompactLayout user setting an add a class when it's enabled
...
Signed-off-by: Hubert Chathi <hubert@uhoreg.ca>
2017-05-31 22:00:30 -04:00
Matthew Hodgson
b4284cf000
fix up Can't connect to HS i18n with _tJsx
2017-06-01 01:17:39 +01:00
Richard van der Hoff
cbbed3f544
Fixes to i18n code
2017-05-31 18:31:10 +01:00
Richard van der Hoff
c3d37c1ff9
Call MatrixClient.clearStores on logout
...
... to make sure that we don't have any sensitive data sitting around in the
stores.
2017-05-31 18:28:21 +01:00
Luke Barnard
7abaadddde
Merge pull request #977 from matrix-org/luke/session-store-null-on-logout
...
Remove cachedPassword from localStorage on_logged_out
2017-05-31 16:00:24 +01:00
Luke Barnard
d0e270bd1c
Only re-render LoggedInView if MatrixClientPeg.get() is truthy
2017-05-31 15:15:27 +01:00
Richard van der Hoff
2d73f094ff
Delint MatrixChat, again ( #979 )
...
grrr.
2017-05-31 15:09:09 +01:00
Kegan Dougal
fc93517094
WIP join/part hiding
...
- Doesn't work with MELS
- Doesn't work with read markers
- Doesn't work with jumping to events
Shelving this for now as I fix some of this mess.
2017-05-31 13:36:19 +01:00
Michael Telatynski
dcd99ac3de
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron_settings
...
# Conflicts:
# src/components/structures/UserSettings.js
# src/i18n/strings/en_EN.json
First time using JetBrains Merge Tool, MAY HAVE GONE HORRIBLY WRONG
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-30 23:54:57 +01:00
Michael Telatynski
0d930c0553
change wording and i18n it
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-30 23:46:51 +01:00
Matthew Hodgson
e30e45a82c
Merge branch 'develop' into new-guest-access
2017-05-30 21:05:07 +01:00
Matthew Hodgson
93a35dc07a
Merge branch 'develop' into t3chguy/piwik
2017-05-30 15:58:55 +01:00
Marcel
70e7d81093
More i18n strings ( #963 )
...
* Add i18n for E2E import and Export Dialogs
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add various previous missing i18n strings
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Translate CreateRoomButton
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add ChatInviteDialog and fix missing to.
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add ConfitmRedactDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add DeactivateAccountDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add DeviceVerifyDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add SessionRestoreErrorDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add SetDisplayNameDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add UnknownDeviceDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add AddressTile translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add DeviceVerifyButtons translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add Dropdown translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add UserSelector translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add CaptchaForm translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add CasLogin translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add CustomServerDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add InteractiveAuthEntryComponents translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add LoginFooter translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add RegistrationForm translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add ServerConfig translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add MAudioBody translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add MImageBody translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add MVideoBody translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add TextualBody translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add UnknownBody translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add UrlPreviewSettings translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add AuxPanel translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add PresenceLabel translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* fix syntax error
* weird space :P
* missing ','
* fix missing value
* fix json fail
* remove acidential added file
* fix another json fail
2017-05-30 15:09:57 +01:00
Luke Barnard
2baef643e3
Add /start to show the setMxId above HomePage
2017-05-30 14:27:02 +01:00
Michael Telatynski
ee6789ed15
change aux order so room settings is top most, forwarding could go weird
...
if you clicked roomsettings whilst forwarding
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-30 11:22:27 +01:00
Michael Telatynski
baba2e12e2
fix weird indentation
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-30 11:21:33 +01:00
Michael Telatynski
ff9141e424
add a hideCancel flag as some things have own cancel etc on RoomHeader
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-30 11:20:41 +01:00
Luke Barnard
9536e1ef36
Merge pull request #954 from matrix-org/matthew/ilag-login
...
add login link to SetMxIdDialog
2017-05-30 09:48:33 +01:00
Matthew Hodgson
ad1b14967b
hide rightpanel on welcome page
2017-05-30 03:59:06 +01:00
Michael Telatynski
7e02977c27
i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 22:32:45 +01:00
Michael Telatynski
a2229ced11
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron_settings
2017-05-29 21:56:45 +01:00
Michael Telatynski
9b8dcaf274
make analytics setting use new thing
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 15:11:37 +01:00
Michael Telatynski
97d0c41d30
fix ugly special casing in generic settings renderer
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 15:08:11 +01:00
Michael Telatynski
f5d336103e
add opt out / un opt out toggle
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 14:36:50 +01:00
Michael Telatynski
7e8123e5fe
move all init/enable/disable logic to Analytics/MatrixChat
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 14:26:29 +01:00
Matthew Hodgson
df599890c5
add login link to SetMxIdDialog
2017-05-29 01:32:31 +01:00
Matthew Hodgson
5c885922d9
Merge branch 'develop' into new-guest-access
2017-05-28 22:58:18 +01:00
Michael Telatynski
0a1b361141
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/piwik
2017-05-28 13:21:33 +01:00
Matthew Hodgson
accc17a39a
Merge pull request #812 from t3chguy/forward_message
...
Message Forwarding
2017-05-28 02:37:31 +01:00
Matthew Hodgson
10a9313bba
Merge pull request #944 from matrix-org/t3chguy/fix-focus-steal
...
don't focus_composer on window focus
2017-05-27 23:30:00 +01:00
Michael Telatynski
45cd80dedb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/piwik
2017-05-27 20:59:35 +01:00
Michael Telatynski
98c2f9201b
initial piwik stuff
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-27 20:47:09 +01:00
Marcel
8935e9706e
Change variable name as mentioned by t3chguy
2017-05-27 21:21:23 +02:00
Marcel
a30110b5d3
Fix vector-im/riot-web#4042
2017-05-27 21:11:00 +02:00
Michael Telatynski
4cd7964b58
remove window onFocus handling entirely
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-27 18:43:59 +01:00
Matthew Hodgson
3703306a9e
oops
2017-05-27 18:35:18 +01:00
Matthew Hodgson
3302fc690f
fix all missing translations picked up by check-i18n.pl
2017-05-27 18:20:44 +01:00
Matthew Hodgson
1eb7993aa7
Merge pull request #946 from matrix-org/t3chguy/fix_imports
...
import _t, drop two unused imports
2017-05-27 18:08:00 +01:00
Michael Telatynski
8524f5868c
import _t, drop two unused imports
...
without this FilePanel would ever-load
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-27 17:59:11 +01:00
Michael Telatynski
8e1db84bee
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix-focus-steal
2017-05-27 14:29:06 +01:00
Michael Telatynski
2bcb381aa7
maybe window focus should be ignored so focus is left as what it was
...
but with this at least clicking on a text input will not make you
be thrown into composer instead
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-27 14:19:34 +01:00
Matthew Hodgson
03194e66b3
actually wire up alwaysShowTimestamps
2017-05-27 00:14:16 +01:00
Luke Barnard
fd27d6dab1
Merge pull request #936 from matrix-org/luke/new-guest-access-need-to-set-mx-id-beore-user-settings
...
Block user settings with view_set_mxid
2017-05-26 18:48:55 +01:00
David Baker
97aeb57a8b
Merge remote-tracking branch 'origin/develop' into dbkr/translations
2017-05-26 18:15:32 +01:00
Luke Barnard
276d3cad9c
Merge pull request #906 from matrix-org/luke/revert-login-username-prefix-suffix
...
Remove suffix and prefix from login input username
2017-05-26 18:07:10 +01:00
David Baker
62ffe929e4
Translate Add Threepid labels
2017-05-26 18:03:24 +01:00
David Baker
23fbce66a2
Translate 'email' threepid label
2017-05-26 17:56:51 +01:00
David Baker
c22978d033
Merge remote-tracking branch 'origin/develop' into dbkr/translations
2017-05-26 17:30:02 +01:00
Matthew Hodgson
3d688a6ada
Merge pull request #933 from matrix-org/luke/new-guest-access-set-display-name-to-useridlocalpart
...
Set the displayname to the mxid once PWLU
2017-05-26 17:17:23 +01:00
Matthew Hodgson
1c7785535f
Merge pull request #929 from matrix-org/luke/new-guest-access-fix-view-next-room
...
Fix view_next_room, view_previous_room and view_indexed_room
2017-05-26 17:09:35 +01:00
Matthew Hodgson
fbc3f83625
Merge pull request #928 from matrix-org/luke/new-guest-access-inidicate-joining-early
...
Use RVS to indicate "joining" when setting a mxid
2017-05-26 17:08:34 +01:00
Matthew Hodgson
fde553a809
Merge pull request #903 from Kieran-Gould/kierangould/12hourtimestamp
...
Kierangould/12hourtimestamp
2017-05-26 16:52:09 +01:00
Luke Barnard
9f902c1190
Merge pull request #932 from matrix-org/luke/new-guest-access-no-notif-bar-if-is-guest
...
Don't show notif nag bar if guest
2017-05-26 16:42:12 +01:00
David Baker
e3e848d09e
Fix missing full stop on translation key
2017-05-26 13:19:46 +01:00
Luke Barnard
5e136863b0
Block user settings with view_set_mxid
2017-05-26 13:18:44 +01:00
Luke Barnard
ad3373789f
Warn about LifecycleStore not explicitly being used
2017-05-26 11:50:32 +01:00
Luke Barnard
c0f43a14fd
Improve comment
2017-05-26 11:47:55 +01:00
Luke Barnard
2dcc03960a
Set the displayname to the mxid once PWLU
2017-05-26 11:46:33 +01:00
Luke Barnard
b5b157a0fb
Don't show notif nag bar if guest
2017-05-26 10:34:36 +01:00
David Baker
2d6bf5fa91
Remove messages with HTML formatting
...
The translations strings are not HTML and it gets escaped.
2017-05-25 20:04:28 +01:00
David Baker
ab92cc2254
Question marks do not internationalise
2017-05-25 19:55:54 +01:00
David Baker
e7fbf889fa
Make current language more accurate
...
Make it reflect reality if it's been taken from the browser langs
by just getting what was saet in counterpart rather than the saved
setting.
Also fix style.
2017-05-25 19:53:27 +01:00
David Baker
443ab1add7
Put back default strings on dialogs
...
But make them work by calling _t in render rather than
getDefaultProps().
Also sort out some 'Warning!' strings
2017-05-25 18:20:48 +01:00
David Baker
9112fc231a
More translation string fixups
2017-05-25 17:35:18 +01:00
Luke Barnard
0849b0e205
Fix view_next_room, view_previous_room and view_indexed_room
...
These must now make a dispatch to RoomViewStore instead of calling `viewRoom` directly on MatrixChat. This will call both `viewRoom` of MatrixChat _and_ the logic in RVS so there is some redundancy here. It'd be best to move as much as possible of viewRoom out to the RVS itself.
But for now, this fixes a bug that occures when leaving (the viewed room would not change).
2017-05-25 17:10:49 +01:00
Luke Barnard
91edc06441
Use RVS to indicate "joining" when setting a mxid
...
This prevents RoomView from doing any peeking whilst the join/registration is in progress, causing weirdness with TimelinePanel getPendingEventList (which throws an error if called when peeking).
2017-05-25 17:04:42 +01:00
David Baker
3a379d09de
Update translations
...
Actually translate the language dropdown label & add the string.
Remove some unused ones.
2017-05-25 16:52:15 +01:00
Luke Barnard
51c8ee6db2
Allow teamServerConfig to be missing
2017-05-25 14:38:12 +01:00
David Baker
5c359e63ab
Bulk change counterpart imports
...
to use languageHandler wrapper func
2017-05-25 11:39:08 +01:00
Luke Barnard
c894c83fbe
Remove GuestWarningBar
2017-05-25 11:02:48 +01:00
Luke Barnard
f3fc459875
Merge pull request #922 from matrix-org/luke/new-guest-access-default-welcome
...
Implement default welcome page and allow custom URL /w config
2017-05-25 10:08:34 +01:00
Luke Barnard
8fc44a9b66
Add comment to explain sync_state dispatch
2017-05-25 09:31:14 +01:00
Michael Telatynski
8158ec6d54
touchups
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-25 01:25:17 +01:00
Michael Telatynski
09d0ab7df5
attempt to make media selector work everywhere (TM)
...
loadDevices not only in electron
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-25 01:01:40 +01:00
Michael Telatynski
a4b2bacc7e
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into webrtc_settings
2017-05-25 00:26:38 +01:00
Luke Barnard
fffe425730
Add non-null RoomView key
2017-05-24 18:04:04 +01:00
Luke Barnard
5f36f797da
Implement default welcome page and allow custom URL /w config
...
This changes the default behaviour of displaying the room directory to instead displaying the default homepage. If specified, the config "welcomePageUrl" can be used to override the default '/home.html'.
2017-05-24 17:55:36 +01:00
Luke Barnard
298c5e4df3
Implement a store for RoomView
...
This allows for a truely flux-y way of storing the currently viewed room, making some callbacks (like onRoomIdResolved) redundant and making sure that the currently viewed room (ID) is only stored in one place as opposed to the previous many places.
This was required for the `join_room` action which can be dispatched to join the currently viewed room.
Another change was to introduce `LifeCycleStore` which is a start at encorporating state related to the lifecycle of the app into a flux store. Currently it only contains an action which will be dispatched when the sync state has become PREPARED. This was necessary to do a deferred dispatch of `join_room` following the registration of a PWLU (PassWord-Less User).
The following actions are introduced:
- RoomViewStore:
- `view_room`: dispatch to change the currently viewed room ID
- `join_room`: dispatch to join the currently viewed room
- LifecycleStore:
- `do_after_sync_prepared`: dispatch to store an action which will be dispatched when `sync_state` is dispatched with `state = 'PREPARED'`
- MatrixChat:
- `sync_state`: dispatched when the sync state changes. Ideally there'd be a SyncStateStore that emitted an `update` upon receiving this, but for now the `LifecycleStore` will listen for `sync_state` directly.
2017-05-24 16:56:13 +01:00
Michael Telatynski
b9ac1222ed
remove listener on unmount
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-24 15:55:37 +01:00
Michael Telatynski
1186207658
Initial Electron Settings - for Auto Launch
...
(opens path for Proxy Settings)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-24 15:51:11 +01:00
David Baker
b677a2002f
Minimal UI fixes
...
Add a label. Make css selector match style. Also fix import.
2017-05-24 14:36:14 +01:00
David Baker
aef068b00e
Indenting
2017-05-24 14:28:30 +01:00
David Baker
f412552c2c
Fix imports/exports
2017-05-23 18:32:45 +01:00
David Baker
d419c42a4f
Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801
2017-05-23 15:16:31 +01:00
David Baker
46bb29a3af
Merge pull request #910 from matrix-org/t3chguy/version_anchor_newtab
...
Make the linked versions open a new tab, turt2live complained :P
2017-05-23 13:51:40 +01:00
Michael Telatynski
a10c2faac1
lets not open an attack vector :)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-23 13:12:21 +01:00
Luke Barnard
b0a824c941
Remove double declaration of TextInputDialog
2017-05-22 16:28:23 +01:00
Luke Barnard
05aaa599cc
Merge branch 'develop' into new-guest-access
...
Conflicts:
src/components/structures/MatrixChat.js
2017-05-22 16:19:10 +01:00
Richard van der Hoff
fc08dc33c6
Group e2e keys into blocks of 4 characters
...
Hopefully this will make them a bit easier to compare.
2017-05-22 12:01:09 +01:00
Kieran Gould
47e5e8d678
Moved isTwelveHour alllll the way up to TimelinePanel.
2017-05-19 23:04:37 +01:00
Maxwell Kepler
008cc95e9c
Add 12 hour support
2017-05-19 22:29:49 +01:00
Michael Telatynski
cc3673d2d2
Make the linked versions open a new tab, turt2live complained :P
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-19 17:39:21 +01:00
Richard van der Hoff
e3dbf057fb
Fix 'missing page_type' error
...
LoggedInView will complain if it is instantiated without a page_type, so let's
keep showing the syncing spinner until we have one.
2017-05-19 14:09:20 +01:00
Richard van der Hoff
c61294f71c
Delintify some of MatrixChat ( #907 )
...
... it annoyed me too much.
2017-05-19 13:53:11 +01:00
Luke Barnard
2bec44a517
Remove suffix and prefix from login input username
...
This is an attempt reduce confusion when entering a custom home server: https://github.com/vector-im/riot-web/issues/3736
2017-05-19 10:03:51 +01:00
Michael Telatynski
cc7edbf86d
allow for sending arbitrary events, also override highlight with
...
event currently being forwarded while forwardingEvent is set
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-19 01:29:11 +01:00
Michael Telatynski
a2ab36f598
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into forward_message
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-19 00:33:36 +01:00
Michael Telatynski
0e7e4d8595
replace weird sidebar snapping with better ui_opacity
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-19 00:20:32 +01:00
Luke Barnard
e38437e6ce
Invite the welcome user after registration if configured
...
This will shift focus to the welcome user DM.
We probably don't want to do this for teams, but I shall leave that for another PR that fixes teams WRT to new-guest-access.
2017-05-18 11:14:56 +01:00
Richard Lewis
7e1de2ac35
Show/hide apps panel and misc formatting and lint fixes
2017-05-17 21:15:57 +01:00
Luke Barnard
e1089574ae
Write some tests for the RTS UI
...
Add tests that make assertions about the UI during registration when registration is done with a user recognised as a team member (by the mock rtsClient).
2017-05-17 09:46:17 +01:00
David Baker
75eea89c08
Revert "Merge pull request #765 from t3chguy/t3chguy/escape-closes-user-settings"
...
This reverts commit a29d8c2af2
, reversing
changes made to 1d836c7d02
.
2017-05-16 16:12:57 +01:00
David Baker
ebfafb3639
Revert "Merge pull request #807 from matrix-org/matthew/quick-search"
...
This reverts commit 0ad1d8caf3
, reversing
changes made to 1189368aab
.
2017-05-16 16:11:01 +01:00
Luke Barnard
c6350379dc
Merge pull request #881 from matrix-org/luke/user-settings-remove-current-password
...
Remove "Current Password" input if mx_pass exists
2017-05-16 12:29:23 +01:00
Luke Barnard
eb36e979c2
Reference store token, call .remove on it on unmount
2017-05-16 11:52:51 +01:00
Luke Barnard
d7eec27c4b
Merge pull request #889 from matrix-org/luke/new-guest-access-need-to-set-mx-id
...
Replace NeedToRegisterDialog /w SetMxIdDialog
2017-05-15 18:36:20 +01:00
Luke Barnard
f199f3599e
Replace NeedToRegisterDialog /w SetMxIdDialog
...
This uses MatrixChat's `view_set_mxid`
2017-05-15 17:31:26 +01:00
Luke Barnard
269fd51130
Remove SessionStore listener on unmount
2017-05-15 17:17:32 +01:00
Luke Barnard
eb0041d21a
Remove redundant state
2017-05-15 17:03:54 +01:00
Luke Barnard
f73cf772fb
Move sessionStore ref from MatrixChat to LoggedInView
...
MatrixChat didn't actually use the sessionStore, so this is one less prop to pass.
2017-05-15 14:56:05 +01:00
Luke Barnard
da3cb0ee48
SessionStore extends flux.Store
2017-05-15 14:52:19 +01:00
Michael Telatynski
8715b5233c
link to #/register
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-15 10:31:17 +01:00
Michael Telatynski
83cb1e6e29
tell guests they can't use filepanel until they register
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-15 10:15:35 +01:00
Matthew Hodgson
317e24852d
explicitly label email & phone add sections; fixes https://github.com/vector-im/riot-web/issues/3531
2017-05-15 03:03:17 +01:00
Matthew Hodgson
7d8c104cb8
Merge pull request #884 from matrix-org/t3chguy/tiny_usersettings_fixes
...
I broke UserSettings for webpack-dev-server
2017-05-15 01:57:45 +01:00
Matthew Hodgson
7f78e737eb
Merge pull request #880 from matrix-org/t3chguy/fixRoomHeaderPreviewing
...
various fixes to RoomHeader
2017-05-15 01:52:42 +01:00
Matthew Hodgson
38cb123506
Merge pull request #883 from matrix-org/t3chguy/file_panel_fixes
...
show error if we can't set a filter because no room
2017-05-15 00:19:45 +01:00
Michael Telatynski
6ec799a028
I broke UserSettings for webpack-dev-server
...
where version file doesn't exist, version starts as null
then gets set to undefined by the promise
this wasn't handled and now undefined is understood to be unknown
rather than null
also picked up on a small casing error
threePids vs threepids, most things using the latter apart from the init
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-13 15:04:20 +01:00
Michael Telatynski
29568feb95
show error if we can't set a filter
...
this way it still works for a room we've been in before
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-12 22:38:57 +01:00
Luke Barnard
683f1b8a1a
Invite the welcome user after registration if configured
...
This will shift focus to the welcome user DM.
We probably don't want to do this for teams, but I shall leave that for another PR that fixes teams WRT to new-guest-access.
2017-05-12 17:39:38 +01:00
Luke Barnard
536724e7c5
ES6 SessionStore
2017-05-12 15:58:44 +01:00
Luke Barnard
5c8187dc8f
Explicitly pass thru userHasGeneratedPassword
2017-05-12 15:47:37 +01:00
Luke Barnard
1176573f39
Implement SessionStore
...
This wraps session-related state into a basic flux store. The localStorage item 'mx_pass' is the only thing managed by this store for now but it could easily be extended to track other items (like the teamToken which is passed around through props a lot)
2017-05-12 12:02:45 +01:00
Luke Barnard
8725ef3863
Remove "Current Password" input if mx_pass exists
...
If the user is PWLU, do not show "Current Password" field in ChangePassword and when setting a new password, use the cached password.
2017-05-11 17:47:45 +01:00
Michael Telatynski
5e4467adce
hide settings/search appropriately
...
pass inRoom prop to RoomHeader (defaults to false)
remove default onSettingsClick, handle if it is passed EVERYWHERE
if onSettingsClick is passes, show that button
show search button only if we are in the room, seems to fail otherwise
this seems to handle all cases I could throw at it. Give it your best
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-11 17:35:06 +01:00
Luke Barnard
cfa108a28c
No need to dispatch, just call setMxId
2017-05-11 17:07:03 +01:00
Luke Barnard
6326a95b39
Prevent ROUs from creating new chats/new rooms
...
Spawn a SetMxIdDialog instead and do nothing.
2017-05-11 17:04:11 +01:00
Luke Barnard
2437eb7910
Merge pull request #874 from matrix-org/luke/fix-rm-not-updating
...
Fix RM not updating if RR event unpaginated
2017-05-11 15:54:49 +01:00
Luke Barnard
5151264f60
Merge branch 'develop' into new-guest-access
...
Conflicts:
src/component-index.js
2017-05-11 13:22:30 +01:00
Luke Barnard
852e1eb720
Rename some variables
...
`ReadUpTo` -> `RR`
`ReadReceipt` -> `RR`
`ReadMarker` -> `RM`
2017-05-11 09:31:59 +01:00
Luke Barnard
3815ad6cd0
Sent -> Event
2017-05-11 09:20:34 +01:00
Luke Barnard
856ef58d46
fix commen
2017-05-10 14:55:58 +01:00
Luke Barnard
fe8ea4ffe7
Rename vars, linting
2017-05-10 14:51:47 +01:00
Luke Barnard
30e183a7f1
Only send RR if we should
2017-05-10 14:48:01 +01:00
Luke Barnard
7f766d89c3
Rename variables, more comments
2017-05-10 14:42:06 +01:00