Commit Graph

14616 Commits (6f79e8503a1923bd225ee93e98157cb650b36237)

Author SHA1 Message Date
Jason Robinson 1f1d966033
Merge pull request #2782 from matrix-org/jaywink/use-versioned-scalar-api
Add versioning to integration manager API /register and /account calls
2019-03-13 12:50:27 +02:00
Jason Robinson 2aba18faaf Add versioning to integration manager API /register and /account calls
Current used version will be 1.1.

Signed-off-by: Jason Robinson <jasonr@matrix.org>
2019-03-13 12:39:47 +02:00
Jason Robinson bc0806581c
Merge pull request #2777 from matrix-org/jaywink/ensure-scalar-token
Ensure scalar_token is valid before opening integrations manager
2019-03-13 12:00:04 +02:00
Jason Robinson 02ff1763a2 Ensure scalar_token is valid before opening integrations manager
Since Scalar (and other integration managers) are loaded as apps into
an iframe, a valid `scalar_token` must exist when loading the app.

It is possible that a scalar_token becomes invalid between the time
when the integration manager button was rendered and the user clicking
the link. Here we make a call to integration manager `/account`
before trying to render the integration manager, which ensures we
have a valid token for the integration manager to work with.

Moving the scalar token revalidation to the cases where it is actually
needed could make it possible to decrease the amount of Scalar /account
calls we do when switching rooms, which is currently 3.

Signed-off-by: Jason Robinson <jasonr@matrix.org>
2019-03-13 11:47:00 +02:00
J. Ryan Stinnett 9585f111a9
Merge pull request #2773 from jryans/yarn
Switch to `yarn` for dependency management
2019-03-13 09:34:34 +00:00
J. Ryan Stinnett c0bb9c8c9c
Merge pull request #2778 from jryans/autocomplete-highlight
Use a distinct color for selected autocomplete items
2019-03-12 18:38:55 +00:00
Travis Ralston 09600dcabd
Merge pull request #2775 from matrix-org/travis/auth-escape-hatch
Provide an escape from the registration process
2019-03-12 10:56:49 -06:00
J. Ryan Stinnett e90d659e19 Remove validation demo code
This is example code from @ara4n's work in
https://github.com/matrix-org/matrix-react-sdk/pull/2550. We're not ready to
actually apply validation yet, so removing this for now.
2019-03-12 16:53:30 +00:00
J. Ryan Stinnett 69a066657b Remove bits of Field that supported uncontrolled
Field is no longer used as an uncontrolled component, so we can remove some
supporting code that we no longer need.
2019-03-12 16:51:19 +00:00
Travis Ralston 9b252cace5 Invert to be if(!form) goback 2019-03-12 10:39:38 -06:00
J. Ryan Stinnett d4dbba3938 Convert uncontrolled Field usages to controlled
As part of adding validation to Field, the logic is simpler to follow if we can
assume that all usages of Field use it as a controlled component, instead of
supporting both controlled and uncontrolled.

This converts the uncontrolled usages to controlled.
2019-03-12 16:17:21 +00:00
J. Ryan Stinnett cff3c94858 Fix indentation in PhoneNumbers.js 2019-03-12 15:39:30 +00:00
J. Ryan Stinnett a719839d9f Use a distinct color for selected autocomplete items
This restores the ability to see which autocomplete item is selected (which
seems to have gotten lost during redesign).

Fixes https://github.com/vector-im/riot-web/issues/9134
2019-03-12 14:51:37 +00:00
J. Ryan Stinnett 5a648ecfe4 Ensure we always set some value in Field
Always set some value on the Field's input so that it doesn't flip flop between
controlled and uncontrolled.
2019-03-12 14:02:54 +00:00
J. Ryan Stinnett ea050683bd Use the right prop type for functions 2019-03-12 14:02:54 +00:00
J. Ryan Stinnett 57ce4d6e7d Call the parent component's `onChange` if it exists 2019-03-12 14:02:54 +00:00
J. Ryan Stinnett 7241418eba Appease the linter
This checks `onValidate` in `render` to make the linter happy.
2019-03-12 14:02:54 +00:00
J. Ryan Stinnett b8925d857d Reorganize field validity styles
* The field border style was previously moved up to the field
* Validity colors should be shown regardless of focus state
2019-03-12 14:02:54 +00:00
J. Ryan Stinnett edb7f39ec9 Validity class currently unused on tooltip 2019-03-12 14:02:54 +00:00
Matthew Hodgson 40f16fa310 adds validation for fields.
* renames RoomTooltip to be a generic Tooltip (which it is)
 * hooks it into Field to show validation results
 * adds onValidate to Field to let Field instances call an arbitrary validation function

Rebased from @ara4n's https://github.com/matrix-org/matrix-react-sdk/pull/2550
by @jryans. Subsequent commits revise and adapt this work.
2019-03-12 14:02:54 +00:00
J. Ryan Stinnett a5c1d6733f Ignore .npmrc 2019-03-12 12:03:53 +00:00
David Baker b39a7e01d3
Merge pull request #2770 from matrix-org/dbkr/fix_instant_rrs_pt2
Fix instantly sending RRs
2019-03-12 10:59:26 +00:00
J. Ryan Stinnett 0791f220fb
Merge pull request #2776 from matrix-org/erikj/fix_null_counter
Fix simple header counters to correctly handle zero, take two
2019-03-12 10:46:51 +00:00
David Baker 9f4de60f9b Merge branch 'dbkr/fix_instant_rrs_pt2' of github.com:matrix-org/matrix-react-sdk into dbkr/fix_instant_rrs_pt2 2019-03-12 10:29:44 +00:00
David Baker 374be0b3b4 Rename more things 2019-03-12 10:28:47 +00:00
Erik Johnston 1a35130869 Fix simple header counters to correctly handle zero, take two 2019-03-12 10:00:10 +00:00
David Baker 08e21ff5d4 Fix comment 2019-03-12 09:40:17 +00:00
J. Ryan Stinnett 2d074d0de6
Rename
Co-Authored-By: dbkr <dbkr@users.noreply.github.com>
2019-03-12 09:37:55 +00:00
J. Ryan Stinnett ea01853233
Rename
Co-Authored-By: dbkr <dbkr@users.noreply.github.com>
2019-03-12 09:37:38 +00:00
David Baker 63d19a899b Rest of the naming changes 2019-03-12 09:37:00 +00:00
Travis Ralston 7eea62a22b
Merge pull request #2764 from matrix-org/travis/fix-hover
Fix sticky hover state by listening for hover on the document
2019-03-11 16:35:25 -06:00
Travis Ralston 9794e32f48 Provide an escape from the registration process
Fixes https://github.com/vector-im/riot-web/issues/6560

Would be better improved by https://github.com/matrix-org/matrix-doc/pull/1921 or similar in the future.
2019-03-11 16:32:50 -06:00
Travis Ralston 1165c51c77
Merge pull request #2772 from matrix-org/erikj/fix_null_counter
Fix header counters to correctly handle zero
2019-03-11 15:10:53 -06:00
J. Ryan Stinnett d9063bbf8e Maybe bash instead of dash 2019-03-11 18:36:45 +00:00
J. Ryan Stinnett 337ac2f6a0 Reorder link and install steps
Take advantage of Yarn's preservation of links while installing and set up links
first and install second. This should result in a small speedup since we no
longer install the published SDKs just to replace them on the next line.
2019-03-11 18:36:45 +00:00
J. Ryan Stinnett f6466802b0 Convert prepublish script to prepare
This avoids the deprecation warning about `prepublish` scripts. It should not
change when the script is run.
2019-03-11 16:06:05 +00:00
J. Ryan Stinnett efad7f5952
Merge pull request #2774 from jryans/cm-permalink
Pass correct args when creating event permalink in context menu
2019-03-11 15:22:05 +00:00
J. Ryan Stinnett c38a7e6756 Pass correct args when creating event permalink in context menu
After the permalink API was changed in
https://github.com/matrix-org/matrix-react-sdk/pull/2671, it seems we forgot to
update this call site, so it was creating `<room>/<room>` links, instead of
`<room>/<event>`.

Fixes https://github.com/vector-im/riot-web/issues/9110
2019-03-11 15:05:05 +00:00
J. Ryan Stinnett 7c947d87ab Update scripts and docs to use `yarn` where appropriate
Most `npm` operations are replaced with `yarn`, which generally has better
behavior. However, steps like publish that write to the NPM registry are left to
`npm`, which currently handles these tasks best.
2019-03-11 14:22:02 +00:00
Erik Johnston 03d60e6af2 Fix header counters to correctly handle zero
Currently if you set the value to zero the counter is not displayed.
2019-03-11 14:04:15 +00:00
J. Ryan Stinnett db5b76b225 Add yarn lock file
For the React SDK, we did not commit npm lock files, so there is no correct copy
to import from. For this repo, I created a fresh yarn lock file using yarn
install.
2019-03-11 13:53:34 +00:00
J. Ryan Stinnett 94b3e8825b Allow lock files to be committed
We have changed our release scripts to commit changes to lock files during
release, so it should be safe to allow them again.
2019-03-11 13:47:14 +00:00
David Baker ce9f3d8a57 Rename 2019-03-11 11:38:54 +00:00
David Baker 8940c4e06f
Merge pull request #2771 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate
2019-03-11 10:11:01 +00:00
David Baker 3cab5eba44 Translated using Weblate (Portuguese (Brazil))
Currently translated at 85.6% (1330 of 1552 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
2019-03-11 10:08:20 +00:00
Weblate f0850b78c2 Merge branch 'origin/develop' into Weblate. 2019-03-11 10:02:30 +00:00
roket1428 281e21d624 Translated using Weblate (Turkish)
Currently translated at 41.1% (638 of 1552 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2019-03-11 10:02:28 +00:00
Kenneth Larsson e1a7f07a9f Translated using Weblate (Swedish)
Currently translated at 79.5% (1235 of 1552 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2019-03-11 10:02:28 +00:00
Paulo Miranda e7b0ab14ae Translated using Weblate (Portuguese (Brazil))
Currently translated at 85.6% (1330 of 1552 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
2019-03-11 10:02:17 +00:00
Karol Kosek 15ca7331ef Translated using Weblate (Polish)
Currently translated at 75.0% (1165 of 1552 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2019-03-11 10:02:13 +00:00