Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-09-21 16:45:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,451 Commits 3 Branches 492 Tags 100 MiB
a356264801
Commit Graph

6451 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baker
a356264801 Fix double-closed tags 2018-10-04 10:49:28 +01:00
Travis Ralston
92b2980b41
Merge pull request #7435 from aaronraimist/patch-1 
Document how to turn off Piwik and bug reports (#6738)
 2018-10-02 22:53:40 -06:00
Aaron Raimist
eabcc9261d
Add text saying that bug reports aren't automatic 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-02 22:58:49 -05:00
David Baker
f69869ac1e
Merge pull request #7429 from vector-im/bwindels/alsocommitlockfile 
also commit the lock file when bumping version as it is now committed to the repo
 2018-10-02 12:13:04 +01:00
Aaron Raimist
d256194255
Document how to turn off Piwik and bug reports (#6738) 2018-10-01 20:21:13 -05:00
Bruno Windels
4de63e612d also commit the lock file when bumping version as it is now committed to the repo 2018-10-01 17:18:31 +02:00
Bruno Windels
0a4e3379f9 Merge branch 'master' into develop 2018-10-01 17:03:54 +02:00
Bruno Windels
e355753900 also update package-lock file 2018-10-01 17:01:07 +02:00
Bruno Windels
712d020dfa v0.16.5 2018-10-01 16:51:39 +02:00
Bruno Windels
5fc53f19f4 Prepare changelog for v0.16.5 2018-10-01 16:51:39 +02:00
Bruno Windels
957fde964b v0.16.5 2018-10-01 16:48:52 +02:00
Bruno Windels
b9688acdf5 bump both SDKs to latest version 2018-10-01 16:16:25 +02:00
David Baker
2a8c7b260a Don't show mobile guide if deep linking 
Other part of https://github.com/vector-im/riot-web/issues/7378
 2018-10-01 15:14:40 +02:00
David Baker
a2c7ef5424 Don't show custom server bit on matrix.org 
On mobile guide

Part of https://github.com/vector-im/riot-web/issues/7378
 2018-10-01 15:14:18 +02:00
David Baker
894ad32e83
Merge pull request #7393 from vector-im/dbkr/update_deps_2 
Update a bunch of deps
 2018-10-01 09:41:14 +01:00
Bruno Windels
4e4906605b
Merge pull request #7415 from vector-im/dbkr/mobile_guide_deep_link 
Don't show mobile guide if deep linking
 2018-09-28 13:34:11 +01:00
David Baker
894e31fe73 Don't show mobile guide if deep linking 
Other part of https://github.com/vector-im/riot-web/issues/7378
 2018-09-28 11:23:46 +01:00
David Baker
67a762aeaf Actually update package.json 2018-09-28 11:02:14 +01:00
David Baker
28f1140588 Merge remote-tracking branch 'origin/develop' into dbkr/update_deps_2 
Updates a bunch more deps now we've updated webpack
 2018-09-28 10:58:22 +01:00
David Baker
ac81080185
Merge pull request #7408 from vector-im/dbkr/unnecessary_custom_server 
Don't show custom server bit on matrix.org
 2018-09-28 10:32:06 +01:00
David Baker
bc8323f96b Don't show custom server bit on matrix.org 
On mobile guide

Part of https://github.com/vector-im/riot-web/issues/7378
 2018-09-27 18:19:33 +01:00
Matthew Hodgson
a38661c0f0
Merge pull request #7387 from vector-im/matthew/webpack4 
Webpack4
 2018-09-27 16:21:43 +01:00
Bruno Windels
57cdd26d4d v0.16.5-rc.1 2018-09-27 14:50:38 +01:00
Bruno Windels
582b67c42e v0.16.5-rc.1 2018-09-27 14:48:40 +01:00
Bruno Windels
44791a65b8 Revert "v0.16.5-rc.1" 
This reverts commit 81dfe506ac.
 2018-09-27 14:46:42 +01:00
Bruno Windels
f3214b7891 Prepare changelog for v0.16.5-rc.1 2018-09-27 14:43:05 +01:00
Bruno Windels
81dfe506ac v0.16.5-rc.1 2018-09-27 14:42:14 +01:00
Bruno Windels
2356524d1c bump matrix-js-sdk and matrix-react-sdk 2018-09-27 13:55:06 +01:00
Bruno Windels
a371bede4d
Merge pull request #7395 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate.
 2018-09-26 18:15:03 +01:00
David Baker
2166213400 Update a bunch of deps 
To try & get deps without vulns in them.

Exceptions are:
 * electron builder: which is nontrivial to update
 * webpack-dev-server: probably needs newer webpack
 * moderizr: no new version released yet
 2018-09-26 12:37:40 +01:00
Matthew Hodgson
c4f6158f46 pin karma-webpack to 4.0.0-beta.0 to fix perf regression 
so karma-webpack 3.0.5 is 4x slower than 4.0.0-beta.0 for webpacking for unknown reasons.
However, 4.0.0-rc.1 and 4.0.0-rc.2 fail with a different error. So: pinned for now
 2018-09-26 03:12:08 +01:00
Matthew Hodgson
7e33ea351d upgrade karma & babel to latest 2018-09-26 02:27:22 +01:00
Matthew Hodgson
9e916cdd5c make sure karma runs tests in dev mode to speed up build 2018-09-26 01:39:05 +01:00
Matthew Hodgson
b7843a5d46 find versions of webpack, webpack-cli, and karma-webpack which work together atm 2018-09-26 01:18:53 +01:00
Matthew Hodgson
41e03333a7 Merge branch 'develop' into matthew/webpack4 2018-09-26 00:17:49 +01:00
Matthew Hodgson
c57c653535 Merge branch 'develop' into matthew/webpack4 2018-09-26 00:15:56 +01:00
Weblate
8793ad9f4f Merge remote-tracking branch 'origin/develop' into develop 2018-09-25 22:54:39 +00:00
Silvano
07b56426ad Translated using Weblate (Italian) 
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/it/
 2018-09-25 22:54:39 +00:00
Adolfo Jayme-Barrientos
43f9f2a0f2 Translated using Weblate (Catalan) 
Currently translated at 97.2% (36 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/
 2018-09-25 22:54:38 +00:00
ali almi
d01824f711 Translated using Weblate (Arabic) 
Currently translated at 81.0% (30 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ar/
 2018-09-25 22:54:38 +00:00
Matthew Hodgson
841c8fd41d
Merge pull request #7355 from vector-im/travis/build-process 
Reduce the number of terminals required to build riot-web to 1
 2018-09-25 23:54:34 +01:00
Travis Ralston
4041f3db5c Send standard output/input from npm-sub.js to the parent proc 2018-09-25 15:54:38 -06:00
Travis Ralston
91304e70a1 Swap out the complicated canary stuff for serial execution 
Fixes https://github.com/vector-im/riot-web/issues/7386
 2018-09-25 15:49:14 -06:00
Travis Ralston
27c23058dc Alter build process to rely on canaries only 
With the react-sdk and js-sdk having their `npm start`s split out (as per https://github.com/matrix-org/matrix-react-sdk/pull/2175 and https://github.com/matrix-org/matrix-js-sdk/pull/742) we can trigger an initial build ourselves and start the watcher afterwards. This canary approach has a very slight speed increase over serially running all the commands as the watcher can be started as early as possible.

This all can be improved and potentially eliminated with a bit more planning, however: https://github.com/vector-im/riot-web/issues/7386
 2018-09-25 11:20:58 -06:00
Travis Ralston
8d7cec2a94 Add some comments to describe the build process 2018-09-24 17:57:18 -06:00
Travis Ralston
2b037ee146 Prevent races by blocking on SDK builds 
If we don't block on SDK builds, then the riot-web build fails due to half-built dependencies. This needs to be done at two levels: the js-sdk because it is used by both the react-sdk and riot-web, and at the react-sdk because riot-web needs it. This means our build process is synchronous for js -> react -> riot, at least for the initial build. 

This does increase the startup time, particularly because the file watch timer is at 5 seconds. The timer is used to detect a storm of file changes in the underlying SDKs and give the build process some room to compile larger files if needed. 

The file watcher is accompanied by a "canary signal file" to prevent the build-blocking script from unblocking too early. Both the js and react SDKs build when `npm install` is run, so we ensure that we only listen for the `npm start` build for each SDK.

This is all done at the riot level instead of at the individual SDK levels (where we could use a canary file to signal up the stack) because:
* babel (used by the js-sdk) doesn't really provide an "end up build" signal
* webpack is a bit of a nightmare to get it to behave at times
* this blocking approach is really only applicable to riot-web, although may be useful to some other projects.

Hopefully that all makes sense.
 2018-09-24 17:12:42 -06:00
Travis Ralston
c6da122e41 Fix npm link in the build script 2018-09-17 17:57:27 -06:00
Travis Ralston
67e9606d55 Reduce the number of terminals required to build riot-web to 1 
A step towards a real solution for https://github.com/vector-im/riot-web/issues/7305

This approach makes use of `npm link` to remove the use of symlinks in the build process. The build process has also been altered to invoke the build process of each underlying SDK (react, js). This means that one can now `npm link` and `npm start` and have a working environment. 

At the same time, parallelshell was dropped due to lack of maintenance from the maintainer.
 2018-09-17 17:50:03 -06:00
Ionut Zaharia
1b8f1f5610 Translated using Weblate (Romanian) 
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/ro/
 2018-09-11 21:09:43 +00:00
Weblate
4c6bb8846b Merge remote-tracking branch 'origin/develop' into develop 2018-09-10 10:48:57 +00:00