Commit Graph

14523 Commits (5bf6206578fc7f53cefd376259e3220450929d2e)

Author SHA1 Message Date
J. Ryan Stinnett 5bf6206578 Ignore package-lock.json in case of confused npm users 2019-03-13 15:49:01 +00:00
J. Ryan Stinnett ebaf083c1f Deduplicate log ignore 2019-03-13 15:44:56 +00:00
J. Ryan Stinnett e42560a216 Ignore *.log files, such as from npm or Yarn 2019-03-13 14:42:36 +00:00
David Baker bdc8508198
Merge pull request #2785 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate
2019-03-13 14:09:03 +00:00
Weblate eb12984616 Merge branch 'origin/develop' into Weblate. 2019-03-13 14:05:08 +00:00
Paulo Miranda 97c5fe37e0 Translated using Weblate (Portuguese (Brazil))
Currently translated at 88.8% (1386 of 1560 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
2019-03-13 14:05:04 +00:00
Szimszon 765e067139 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1560 of 1560 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-03-13 14:04:59 +00:00
Sheogorath 4f91b8112c Translated using Weblate (German)
Currently translated at 93.2% (1454 of 1560 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2019-03-13 14:04:56 +00:00
Kévin C 879ee9f3d4 Translated using Weblate (French)
Currently translated at 99.8% (1558 of 1560 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-03-13 14:04:55 +00:00
Samu Voutilainen 8d4c455ea3 Translated using Weblate (Finnish)
Currently translated at 89.2% (1393 of 1560 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2019-03-13 14:04:53 +00:00
Stanislav Lukeš 1de20d8304 Translated using Weblate (Czech)
Currently translated at 99.2% (1548 of 1560 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2019-03-13 14:04:51 +00:00
Jeff Huang ce1934a7ba Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1560 of 1560 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-03-13 14:04:48 +00:00
pogback d092c3a49f Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (1560 of 1560 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2019-03-13 14:04:46 +00:00
David Baker e676643161
Merge pull request #2784 from jryans/no-padlock-click
Remove padlock click handler to show unknown devices
2019-03-13 13:28:09 +00:00
David Baker 99c7aa2df3
Merge pull request #2783 from jryans/yarn-ci
Use modern Yarn version on Travis CI
2019-03-13 13:23:15 +00:00
J. Ryan Stinnett 77a06756e3 Remove padlock click handler to show unknown devices
The unknown devices dialog is confusing at the moment due to the complex trust
model in Riot involving various possible device states.

The room header padlock allows you to access this dialog even if there are no
unknown devices, which leads users to be unsure what they can believe and
reduces confidence in Riot. For now, we'll remove the room header click handler
that shows this dialog.

Fixes https://github.com/vector-im/riot-web/issues/8815
2019-03-13 12:58:23 +00:00
J. Ryan Stinnett b51d3d0a42 Use modern Yarn version on Travis CI
Travis CI uses a quite old version of Yarn by default. This adds Yarn's
recommended incantation for using the latest stable version.
2019-03-13 12:32:03 +00:00
J. Ryan Stinnett 92a9f13452 Recommend using the latest Node LTS version 2019-03-13 10:53:53 +00:00
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
Travis Ralston 9b252cace5 Invert to be if(!form) goback 2019-03-12 10:39:38 -06: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 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