c22978d033
Merge remote-tracking branch 'origin/develop' into dbkr/translations
2017-05-26 17:30:02 +01:00
ac44151e2a
Put the reset method in the right scope...
2017-05-26 17:27:31 +01:00
9311b9012a
Use the same .reset as RoomViewStore
2017-05-26 17:23:02 +01:00
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
84cef00f1f
Mismatched oneUser / severalUsers
2017-05-26 17:16:23 +01:00
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
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
fde553a809
Merge pull request #903 from Kieran-Gould/kierangould/12hourtimestamp
...
Kierangould/12hourtimestamp
2017-05-26 16:52:09 +01:00
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
0f8e560247
Add function to display i18n keys in UI
...
Avoids having to load translations in riot-web tests
2017-05-26 15:29:11 +01:00
e3e848d09e
Fix missing full stop on translation key
2017-05-26 13:19:46 +01:00
5e136863b0
Block user settings with view_set_mxid
2017-05-26 13:18:44 +01:00
28094a9a66
Show "Something went wrong!" when errcode undefined
2017-05-26 13:13:57 +01:00
e44f3cc709
Fix tests
...
* Serve translation files from the karma server
* Port UserSettingsStore to ES6 exports because the test runner
gets confused by ES6 importing a commonjs module
* Remove extra spaces in translations strings for MELS
* Fix 'his/her' back to be 'their'
* Change test to expect singular 'invitation' for a single person
(there may be multiple invitations, but IMO this should be
'rejected n invitations' and we can play with the wording later,
I don't think the singular is any worse than the plural).
* set language in the MELS tests (and wait for it to complete)
* Don't bother setting lang in other tests for now
2017-05-26 11:58:45 +01:00
ad3373789f
Warn about LifecycleStore not explicitly being used
2017-05-26 11:50:32 +01:00
2400efa92b
Correct LifecycleStore docs
2017-05-26 11:48:38 +01:00
c0f43a14fd
Improve comment
2017-05-26 11:47:55 +01:00
2dcc03960a
Set the displayname to the mxid once PWLU
2017-05-26 11:46:33 +01:00
b5b157a0fb
Don't show notif nag bar if guest
2017-05-26 10:34:36 +01:00
2d6bf5fa91
Remove messages with HTML formatting
...
The translations strings are not HTML and it gets escaped.
2017-05-25 20:04:28 +01:00
ab92cc2254
Question marks do not internationalise
2017-05-25 19:55:54 +01:00
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
be4944a4b6
Hopefully get translations with '.'s sorted
...
attempt 2
2017-05-25 19:43:34 +01:00
dac6a3360b
Oops, don't change these reason strings.
2017-05-25 19:25:06 +01:00
43d8ccf128
Hopefully sort out strings with appended '.'s
2017-05-25 19:21:18 +01:00
c3c2916449
Use array literals
2017-05-25 18:26:42 +01:00
6c41be3c14
Missed OKs
2017-05-25 18:23:15 +01:00
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
9112fc231a
More translation string fixups
2017-05-25 17:35:18 +01:00
6d67655f66
Add german for Change password
2017-05-25 17:22:04 +01:00
85756c78b4
Change to object literal
2017-05-25 17:17:37 +01:00
263a51938d
Reset store state when logging out
...
This prevents leaking of state that we do not want to share with the next user
2017-05-25 17:16:16 +01:00
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
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
feef7d49e9
More tabs
2017-05-25 16:55:24 +01:00
3a379d09de
Update translations
...
Actually translate the language dropdown label & add the string.
Remove some unused ones.
2017-05-25 16:52:15 +01:00
39dbc4c6e1
Lots of changes to languageHandler
...
* Replace callbacks with promises
* Move plain functions to top level
* De-duplicate bits that fetched languages.json
* Take full language preference list from the browser if we
can get it, rather than just the first.
2017-05-25 16:45:32 +01:00
11799b4c71
Show "Password" instead of "New Password" when the existing password has been cached
2017-05-25 15:27:54 +01:00
0707b7440a
Merge branch 'new-guest-access' of github.com:matrix-org/matrix-react-sdk into new-guest-access
2017-05-25 15:20:22 +01:00
ce17df0883
Unbreak the roomlist
2017-05-25 15:20:02 +01:00
1214b01330
Merge pull request #926 from matrix-org/luke/new-guest-access-set-mxid-warm-fuzzy-revert
...
Remove warm-fuzzy after setting mxid
2017-05-25 15:16:52 +01:00
2265b59287
Remove warm-fuzzy after setting mxid
2017-05-25 14:54:28 +01:00
51c8ee6db2
Allow teamServerConfig to be missing
2017-05-25 14:38:12 +01:00
c54a24c49a
Merge pull request #923 from matrix-org/luke/remove-guest-warning-bar
...
Remove GuestWarningBar
2017-05-25 14:30:10 +01:00
7900bf1c7d
Don't show "Drop to ..." if total rooms = 0
2017-05-25 13:55:37 +01:00
3185d3ed41
Re-add bouncing/callout animation to action buttons
2017-05-25 13:54:59 +01:00
db45e99536
Remove defaulting here
...
We already do it in the place this function gets called
2017-05-25 12:09:48 +01:00
548f319816
Remove redundant role elements
2017-05-25 12:09:08 +01:00
5e855e6fee
Size is a string, import react
...
React gets put in by the JSX transpile
2017-05-25 12:09:01 +01:00
9337158a47
Separate classes for the different buttons
...
Also rename RoleButton to ActionButton because it's not being
given a Role any more.
Conflicts:
src/component-index.js
cherry-picking commit 4a5821e
2017-05-25 12:08:42 +01:00
