mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-01 22:14:41 +03:00
Code Issues Projects Releases Packages Wiki Activity
7207 commits 218 branches 561 tags 444 MiB
Commit graph

7207 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
a5ed5be3cf Fix literal &lt/&gt in notifications 
Apparently I couldn't decide whether I was writing indexOf(...) > -1
or .includes()

Fixes https://github.com/vector-im/riot-web/issues/8230
 2019-01-23 14:47:31 +00:00
David Baker
697c7f9fe9
Merge pull request #8233 from vector-im/dbkr/fetch_develop_deps_return 
Add returns to fetch-develop-deps
 2019-01-23 14:29:53 +00:00
David Baker
f7c2603d7c
Merge pull request #8231 from vector-im/dbkr/electron_builder_20_38_5 
Update electron builder
 2019-01-23 11:41:21 +00:00
David Baker
a28691f14d Add returns to fetch-develop-deps 
These look necessary for https://github.com/vector-im/riot-web/pull/8225
to work - the build is failing on jenkins
 2019-01-23 11:40:21 +00:00
David Baker
ca9823b35e Merge remote-tracking branch 'origin/experimental' into dbkr/electron_builder_20_38_5 2019-01-23 11:12:25 +00:00
David Baker
91c037e578
Merge pull request #8225 from jryans/fetch-more-branches 
Try fetching more branches for PRs
 2019-01-23 11:12:01 +00:00
David Baker
5fe0af2500 Update electron builder 
This resolves an issue where the auto-updater on Mac with a standard
(ie. non-admin) user account would leave the app in a broken,
unlaunchable state (although it's not obvious what change in
electron-builder fixes this).

Fixes https://github.com/vector-im/riot-web/issues/8215
 2019-01-23 10:53:32 +00:00
J. Ryan Stinnett
6d7492d92a Add Riot logo via more targeted replacement 2019-01-22 22:41:16 -06:00
J. Ryan Stinnett
cf150fc575 Try fetching more branches for PRs 
Attempt both the PR author's branch and the PR's target branch. This resolves
issues on experimental where we need matrix-react-sdk to also be experimental.
 2019-01-22 21:28:09 -06:00
J. Ryan Stinnett
a2c84e7702 Remove dots between footer links 2019-01-22 19:51:24 -06:00
Adolfo Jayme-Barrientos
7a9a5e8dc3 Translated using Weblate (Catalan) 
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/
 2019-01-22 13:22:16 +00:00
Weblate
e9c6c2ed3f Merge remote-tracking branch 'origin/develop' into develop 2019-01-22 11:51:23 +00:00
Paulo Miranda
9da35a7980 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt_BR/
 2019-01-22 11:51:22 +00:00
David Baker
f01f56626a Merge branch 'master' into develop 2019-01-22 11:51:13 +00:00
David Baker
09485f4b9d Merge branch 'release-v0.17.9' 2019-01-22 11:51:01 +00:00
David Baker
5a30b02be4 v0.17.9 2019-01-22 11:45:33 +00:00
David Baker
21eb8b9100 Prepare changelog for v0.17.9 2019-01-22 11:45:33 +00:00
David Baker
a0c205e4c9 v0.17.9 2019-01-22 11:44:13 +00:00
David Baker
40d7df793d Released js-sdk & react-sdk 2019-01-22 11:31:00 +00:00
J. Ryan Stinnett
71610ce24d Rename mx_Login_box to mx_AuthPage_modal and fold into AuthPage 2019-01-21 19:11:57 -06:00
J. Ryan Stinnett
41adcdc898 Rename LoginPage, Header, Footer views to Auth* 2019-01-21 19:11:57 -06:00
J. Ryan Stinnett
e98346e7cd Rename login directory to auth 2019-01-21 17:46:03 -06:00
J. Ryan Stinnett
0802aaae91 Convert slashes in public paths 2019-01-18 17:54:16 -06:00
J. Ryan Stinnett
cf0b2816c1 Only CSS references need to traverse 
The path adjustment for assets in bundles is only needed with CSS files.  Paths
referenced in JS files are written to elements, where they are relative to the
document.
 2019-01-18 15:59:29 -06:00
J. Ryan Stinnett
7418815637 Fix some path math on Windows 2019-01-18 15:59:29 -06:00
J. Ryan Stinnett
d71e84b790
Merge pull request #8159 from vector-im/jryans/versioned-img-urls 
Use content hashing for font and image URLs
 2019-01-18 14:28:09 -06:00
J. Ryan Stinnett
aa388f1173 Copy images used by home.html 
This allows home.html to remain a regular HTML file without templating while
still having a copy of the rooms directory icon.
 2019-01-18 08:39:16 -06:00
J. Ryan Stinnett
7a3df1c7d6 Support image URLs in HTML templates 
Expands the image build process to also support the right paths when used in
HTML templates.
 2019-01-18 08:39:16 -06:00
J. Ryan Stinnett
59bedae15e 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 riot-web themes like Status
 2019-01-18 08:39:16 -06:00
J. Ryan Stinnett
a127077bde 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-18 08:39:16 -06:00
J. Ryan Stinnett
49be03e845 Process images with Webpack 
This adds a `file-loader` rule to the Webpack build so that any requests for
image resource will be output into the app's output directory, but with an extra
content has appended so that we can safely use a long cache lifetime.

The CSS and SCSS rules are also changed to use `css-loader` so that any `url`
inside is automatically processed by the new image rule above.
 2019-01-18 08:39:09 -06:00
Travis Ralston
e3d807b053
Merge pull request #8156 from vector-im/develop 
Develop->Experimental
 2019-01-17 16:00:52 -07:00
David Baker
e5c0af478d v0.17.9-rc.1 2019-01-17 11:09:13 +00:00
David Baker
82cd88cf25 Prepare changelog for v0.17.9-rc.1 2019-01-17 11:09:12 +00:00
David Baker
e94e712d49 v0.17.9-rc.1 2019-01-17 11:07:42 +00:00
David Baker
021d6c5908 Add npm user arg for https://github.com/matrix-org/matrix-js-sdk/pull/749 2019-01-17 11:06:41 +00:00
David Baker
b09f0618a9 js-sdk & react-sdk rc.1 2019-01-17 10:56:34 +00:00
David Baker
ea17711616
Merge pull request #8150 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate.
 2019-01-17 10:27:05 +00:00
Weblate
e0b4875615 Merge remote-tracking branch 'origin/develop' into develop 2019-01-17 10:16:34 +00:00
Paulo Miranda
bbfd1448c5 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt_BR/
 2019-01-17 10:16:34 +00:00
Paulo Miranda
d482d3c907 Translated using Weblate (Portuguese) 
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt/
 2019-01-17 10:16:34 +00:00
David Baker
3236f72031 Electron 4.0.1 2019-01-17 10:16:15 +00:00
Michael Telatynski
67ba81e80a
Merge pull request #8124 from vector-im/t3chguy/electron-mailto 
Correct the copying of e-mail addresses in the electron app
 2019-01-15 18:22:17 +00:00
Michael Telatynski
8c895cd435 Correct the copying of e-mail addresses in the electron app 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-01-15 08:37:01 +00:00
J. Ryan Stinnett
99b5695fec Fix SdkConfig import to use transformed module 
This was originally added in #7755, which pulled in the original source for the
module, breaking ancient browsers without support for classes (#8082).
 2019-01-11 17:51:19 -06:00
J. Ryan Stinnett
05f9cf453d Fix SdkConfig import to use transformed module 
This was originally added in #7755, which pulled in the original source for the
module, breaking ancient browsers without support for classes (#8082).
 2019-01-11 17:37:20 -06:00
J. Ryan Stinnett
3d7a74cc2b
Merge pull request #7165 from ptman/patch-1 
Start documenting keyboard shortcuts
 2019-01-10 09:23:29 -06:00
Paul Tötterman
f7f9d8bfc3 Take Mac into account in keyboard shortcuts 
Signed-off-by: Paul Tötterman <paul.totterman@iki.fi>
 2019-01-09 17:37:54 +02:00
Paul Tötterman
ff95952969 Start documenting keyboard shortcuts 
I'm sure I don't know all of them.

Signed-off-by: Paul Tötterman <paul.totterman@iki.fi>
 2019-01-09 17:37:54 +02:00
David Baker
373c587ef8
Merge pull request #8003 from vector-im/develop 
Merge develop into experimental
 2019-01-03 18:56:03 +00:00