Commit graph

13241 commits

Author SHA1 Message Date
David Baker
31889ecfad Lint 2019-01-21 19:07:44 +00:00
David Baker
e42b0a9972 Make error string less redundant 2019-01-21 18:02:09 +00:00
David Baker
1a9c3f1ac7 Make error string less technical 2019-01-21 17:41:55 +00:00
David Baker
0a2b79b62d Error if no sessions decrypted
Tell the user if they entered the wrong recovery key

Fixes https://github.com/vector-im/riot-web/issues/8143
2019-01-21 16:51:30 +00:00
Bruno Windels
86357fde51 sort combined typing users by name so order is stable 2019-01-21 17:49:46 +01:00
Bruno Windels
25aa58f29f increase/clear min-height on timeline on new message(s)
depending on whether the typing bar is visible
2019-01-21 17:35:40 +01:00
Bruno Windels
018f3d2a5c use box-sizing: border-box to make clientHeight === actual height 2019-01-21 17:30:02 +01:00
David Baker
250c7e0c4e
Merge pull request #2466 from matrix-org/dbkr/fix_direct_chat_button
Fix settings direct chat
2019-01-21 16:28:02 +00:00
David Baker
7e0f60505e Fix settings direct chat
We were expecting this function to return a string user ID, but it
returned a user object

Make it return a user ID and add jsdoc to say what it returns.

Fixes https://github.com/vector-im/riot-web/issues/8180
2019-01-21 16:02:25 +00:00
David Baker
b53c4d05ab
Merge pull request #2464 from matrix-org/dbkr/dont_show_verify_button_unknown_device
Show verify button when we have a device to verify
2019-01-21 15:04:50 +00:00
David Baker
4c381c32ee Show verify button when we have a device to verify
rather than when we don't
2019-01-21 11:34:13 +00:00
Matthew Hodgson
efcfaed335 switch to 35px high gradients 2019-01-20 14:31:06 +00:00
J. Ryan Stinnett
d7031c12f4
Merge pull request #2463 from jryans/field-component
Redesign: Add a form field component
2019-01-19 22:37:39 -06:00
J. Ryan Stinnett
728830e2fd Add rethemendex as script for easier access 2019-01-19 22:33:51 -06:00
Travis Ralston
36ffbef010
Tweak comment about field ID
Co-Authored-By: jryans <jryans@gmail.com>
2019-01-19 22:29:57 -06:00
J. Ryan Stinnett
efd5405267 Add a form field component for the redesign
The label moves into the border on focus and after being filled. A valid color
is applied to the label and input border. Other states like invalid can be added
later as needed.

Adapted from @ara4n's experiment into a React component with a CSS only
approach.
2019-01-19 22:13:53 -06:00
J. Ryan Stinnett
7c9509ceb8
Merge pull request #2460 from matrix-org/jryans/versioned-img-urls
Load fonts and images via source-relative URLs and requires
2019-01-18 14:27:55 -06:00
Bruno Windels
c9d5c4903b set min-height of messagelist to current height when showing typing bar
this ensures the timeline never shrinks, and avoids jumpiness when
typing bar disappears again.
2019-01-18 18:53:54 +01:00
J. Ryan Stinnett
8b05cca7d2 Add file-loader to Karma so assets will resolve in tests 2019-01-18 10:55:00 -06:00
David Baker
4b68ca141c
Merge pull request #2455 from matrix-org/dbkr/key_backup_status_unknown_device
Say when backup is signed by unknown device
2019-01-18 10:58:26 +00:00
David Baker
622d7427f7
Merge pull request #2458 from matrix-org/travis/upgrade-command
Add an /upgraderoom command to make upgrading easier for development
2019-01-18 10:00:53 +00:00
J. Ryan Stinnett
20e296b20e Convert image URLs in React to require calls
This allows Webpack to insert the proper image URL after builds steps like
adding a hash and so on. The path you supply to `require` is relative to the JS
source file, just like any other would be.
2019-01-17 22:06:49 -06:00
J. Ryan Stinnett
989227d435 Fix line length lint warnings
I am about to run some code replacements that might make lines too long, so with
this change I know we're starting from 0 line length warnings.
2019-01-17 22:06:49 -06:00
J. Ryan Stinnett
b2387f4cff Define SCSS variable for resource dir
Adds a `$res` SCSS variable set to the path from the root SCSS file to the `res`
directory.

This is a different base path than previously used in CSS URLs (it goes up 3
directories instead of 2), because Webpack will now be resolving images relative
to the root SCSS file, so the path corresponds to a source tree location,
instead of a path in the build output tree.

Defining this variable has two main goals:

* URLs are a bit easier to read
* The path can be overridden, which is needed for external (riot-web) themes
2019-01-17 22:06:49 -06:00
J. Ryan Stinnett
7678b9c43b Lift font SCSS partials to theme root
This means that themes which include `light/css/_base.scss` (currently Dark and
Status) won't be forced to have Light's font-faces included.  This only really
matters for Status, which uses different fonts throughout.
2019-01-17 21:50:45 -06:00
J. Ryan Stinnett
9a7a8da6c0 Use font-family from theme in all components 2019-01-17 21:50:45 -06:00
Travis Ralston
91c0d8bae3
Merge pull request #2457 from matrix-org/travis/develop2
Merge develop->experimental
2019-01-17 16:19:30 -07:00
Travis Ralston
7f6ce69c3e Merge branch 'experimental' into travis/develop2 2019-01-17 16:03:45 -07:00
Travis Ralston
9b6ef8af72 Add an /upgraderoom command to make upgrading easier for development 2019-01-17 15:59:05 -07:00
Bruno Windels
2920deaefe better naming 2019-01-17 18:52:22 +01:00
Bruno Windels
146e651dae add comments 2019-01-17 18:52:14 +01:00
Bruno Windels
1db6f1b652 remove logging 2019-01-17 18:32:46 +01:00
Bruno Windels
d787d3d821 clear typing bar when receiving event from user 2019-01-17 18:26:11 +01:00
Bruno Windels
23e7811f33
Merge pull request #2454 from matrix-org/bwindels/topleftcursor
Fix: show hand cursor in topleft menu so its clear you can click it
2019-01-17 16:58:12 +00:00
David Baker
b551d2f43a Say when backup is signed by unknown device
rather than say it isn't signed by any devices

https://github.com/vector-im/riot-web/issues/8142

Requires https://github.com/matrix-org/matrix-js-sdk/pull/826
2019-01-17 16:45:00 +00:00
Bruno Windels
7df8951efa wait to hide typing bar until event arrives or 5s timeout 2019-01-17 16:30:55 +01:00
David Baker
9b01120499
Merge pull request #2453 from matrix-org/bwindels/searchfix
Fix: search makeover missing icons
2019-01-17 13:31:37 +00:00
Bruno Windels
2bec088591 show hand cursor in topleft menu so its clear you can click it 2019-01-17 14:07:33 +01:00
Bruno Windels
921906897f css url paths are relative to location of compiled file, not project structure 2019-01-17 13:49:52 +01:00
Bruno Windels
89b576936b
Merge pull request #2448 from matrix-org/bwindels/searchmakeover
Redesign: search makeover
2019-01-17 12:12:26 +00:00
Bruno Windels
e7359ff115
Merge pull request #2451 from matrix-org/bwindels/revertgridview
Revert "Tiled room UI"
2019-01-17 12:09:37 +00:00
David Baker
d04c33960b
Merge pull request #2452 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2019-01-17 10:26:29 +00:00
Besnik Bleta
506ee39a09 Translated using Weblate (Albanian)
Currently translated at 99.2% (1417 of 1427 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2019-01-17 10:17:09 +00:00
Bruno Windels
a7d21ebb8e re-apply Timer linting fixes that happened in the tiled ui PR 2019-01-17 10:44:12 +01:00
Bruno Windels
8c30d05eb8 Revert "Merge pull request #2348 from matrix-org/bwindels/roomgridview-experimental"
This reverts commit ece5cb1fcc, reversing
changes made to 64a3d2521c.
2019-01-17 10:29:37 +01:00
Szimszon
7d9f84c873 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1427 of 1427 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-01-16 19:19:44 +00:00
Kévin C
e199d5384e Translated using Weblate (French)
Currently translated at 100.0% (1427 of 1427 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-01-16 19:07:37 +00:00
Paulo Miranda
2e8368ce0b Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (1427 of 1427 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
2019-01-16 16:32:22 +00:00
J. Ryan Stinnett
859f2a8646 Show spinner while waiting on status message to commit
It can take some time to actually set the status message and see it play back as
a committed event.  This adds a spinner for immediate feedback so it's clear
that something is happening.

Fixes https://github.com/vector-im/riot-web/issues/8135.
2019-01-16 09:33:39 -06:00
Weblate
d627660aaf Merge remote-tracking branch 'origin/develop' into develop 2019-01-16 15:31:19 +00:00