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
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
fde553a809
Merge pull request #903 from Kieran-Gould/kierangould/12hourtimestamp
...
Kierangould/12hourtimestamp
2017-05-26 16:52:09 +01:00
David Baker
e3e848d09e
Fix missing full stop on translation key
2017-05-26 13:19:46 +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
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
David Baker
5c359e63ab
Bulk change counterpart imports
...
to use languageHandler wrapper func
2017-05-25 11:39:08 +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
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
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
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
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
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
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
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
Luke Barnard
ca79d9bb6e
Separate predicates for RM/RR
...
Instead of modifying the condition for updating the RR, separate the RM and RR conditions and use an OR to decide when to set both.
Make some logs only log when DEBUG.
2017-05-09 17:36:19 +01:00