gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
7,282 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

7282 Commits

Author SHA1 Message Date
Travis Ralston f08491cee8 Validate default homeserver config before loading the app 
Implements the process described here: https://github.com/vector-im/riot-web/issues/9290#issuecomment-481966910

The expectation is that later layers (like the react-sdk) will make use of the `validated_discovery_config` option instead of interpreting the config themselves.

We intentionally block the UI from loading here to avoid races between discovery and the app loading.
 2019-05-03 11:06:32 -06:00
David Baker 9cd4ac1df4
Merge pull request #9628 from vector-im/dbkr/thanks_you_junit_but_its_not_2005_anymore 
Remove karma junit output
 2019-05-03 12:43:04 +01:00
David Baker c612633402 Merge remote-tracking branch 'origin/develop' into dbkr/thanks_you_junit_but_its_not_2005_anymore 2019-05-03 12:37:28 +01:00
David Baker 0c36849c0f
Merge pull request #9626 from vector-im/dbkr/yarn_upgrade_may19 
yarn upgrade
 2019-05-03 12:36:26 +01:00
David Baker 1a1f2254e5 Remove karma junit output 
See https://github.com/matrix-org/matrix-react-sdk/pull/2944
 2019-05-03 11:40:53 +01:00
David Baker 908a72e00e yarn upgrade 
ALL THE UPDATES!

(so many updates)
 2019-05-03 11:13:04 +01:00
David Baker 2fe6b5074d
Merge pull request #9617 from vector-im/dbkr/arghbuildkite 
Respond quickly to buildkite pokes
 2019-05-02 18:13:38 +01:00
David Baker a7756fc876 Respond quickly to buildkite pokes 
Otherwise it thinks they have failed, as per comment.
 2019-05-02 18:05:11 +01:00
J. Ryan Stinnett 8cb7eeecd2
Merge pull request #9616 from vector-im/jryans/delay-favicon 
Delay creating the `Favico` instance
 2019-05-02 13:51:46 +01:00
J. Ryan Stinnett d4de7f5df3 Delay creating the `Favico` instance 
This avoids a canvas permission prompt from appearing on page load for users in
Firefox's resist fingerprinting mode. The prompt will still happen once you log
in and receive a notification, but at least this prevents it from happening
during the initial app experience.

Fixes https://github.com/vector-im/riot-web/issues/9605
 2019-05-02 13:29:25 +01:00
J. Ryan Stinnett 989b75502c
Merge pull request #9598 from jryans/primary-reactions 
Add reactions feature to config sample
 2019-05-01 20:26:12 +01:00
J. Ryan Stinnett bb675fde0c Tweak redundant title 2019-05-01 19:16:21 +01:00
J. Ryan Stinnett 6df5c35b4e Move to labs doc 2019-05-01 19:16:21 +01:00
Travis Ralston 9957149115
Merge pull request #9426 from vector-im/travis/dockerfile-continued 
Add Dockerfile (part 2)
 2019-05-01 10:42:21 -06:00
J. Ryan Stinnett ebe2ab504b Add reactions feature description 2019-05-01 10:30:57 +01:00
David Baker 269a995a01 We are now releases@riot.im 2019-04-30 11:49:49 +01:00
David Baker 77dff119db Fix variable scope in redeployer 2019-04-26 16:26:48 +01:00
David Baker 0718d438b8 Fix more typos in redeployer 2019-04-26 16:19:49 +01:00
David Baker 3a2541d3bf more logging for auto-deployer 2019-04-26 16:16:14 +01:00
David Baker 00d33599f0
Merge pull request #9577 from vector-im/dbkr/convert_redeploy_server_to_buildkite 
Convert redeploy.py to buildkite
 2019-04-26 16:04:04 +01:00
David Baker f49732b036 Link to buildkite webhook docs 2019-04-26 15:41:20 +01:00
J. Ryan Stinnett 73144c3493
Typing is hard 
Co-Authored-By: dbkr <dbkr@users.noreply.github.com>
 2019-04-26 15:40:23 +01:00
J. Ryan Stinnett c5e7e82b46
I can't type buildkite 
Co-Authored-By: dbkr <dbkr@users.noreply.github.com>
 2019-04-26 15:40:05 +01:00
David Baker af6ad9355d Convert redeploy.py to buildkite 2019-04-26 15:26:03 +01:00
David Baker 6c4c908678 consistent capitalisation in buildkite pipelines 2019-04-26 15:09:01 +01:00
David Baker ae62a46a97
Merge pull request #9568 from vector-im/dbkr/buildkite_cd 
Add package step to buildkite pipeline
 2019-04-26 14:43:43 +01:00
David Baker bf84c64ea9 Only bother packaging the develop branch 2019-04-26 14:38:36 +01:00
David Baker 5ac8a42681 Merge remote-tracking branch 'origin/develop' into dbkr/buildkite_cd 2019-04-26 14:37:11 +01:00
David Baker 03b1914112
Merge pull request #9571 from vector-im/dbkr/package_dont_fail_if_no_local_config 
Don't fail if there's no local config to remove
 2019-04-26 14:36:28 +01:00
David Baker ff21bde839 Merge branch 'dbkr/package_dont_fail_if_no_local_config' into dbkr/buildkite_cd 2019-04-26 14:28:45 +01:00
David Baker c62da0eda6 Don't fail if there's no local config to remove 
The script has a set -e so don't fail if there's nothing to rm
 2019-04-26 14:13:02 +01:00
David Baker 932d3a054c Merge remote-tracking branch 'origin/develop' into dbkr/buildkite_cd 2019-04-26 13:22:39 +01:00
David Baker a67fd48720
Merge pull request #9567 from vector-im/dbkr/bye_bye_jenkins 
Change jenkins script to package script
 2019-04-26 13:19:33 +01:00
David Baker afc2b48073 combine sets 2019-04-26 12:22:32 +01:00
David Baker 093d30121d Try running packager with buildkite 2019-04-26 12:21:21 +01:00
David Baker 1b8583fa51 Change jenkins script to package script 
Take the useful part of the jenkins script and put it in a script
that makes a package with the git hashes as its version.
 2019-04-26 11:25:41 +01:00
J. Ryan Stinnett ea37e777cf Add reactions feature to config sample 2019-04-26 10:56:35 +01:00
Richard van der Hoff cc5911b4aa
Remove redundant and incorrect riot-desktop install instructions (#9558) 2019-04-25 13:22:32 +01:00
J. Ryan Stinnett 28d50100d8
Merge pull request #9555 from jryans/rm-config-from-package 
Remove config.json from package dir
 2019-04-25 09:40:44 +01:00
Hubert Chathi 8ef464597f
Merge pull request #9550 from uhoreg/olm-3.1.0 
use the release version of olm 3.1.0
 2019-04-24 18:19:22 -04:00
Hubert Chathi 2c64a4f3a1 update yarn.lock with olm release 2019-04-24 12:02:41 -04:00
J. Ryan Stinnett 8002d98f50 Remove config.json from package dir 2019-04-24 11:28:26 +01:00
Hubert Chathi 9519ad46a1 use the release version of olm 3.1.0 2019-04-23 18:08:07 -04:00
David Baker 597b3e16e0
Merge pull request #9517 from vector-im/dbkr/fix_deploy_script_include_default 
Fix default for --include arg
 2019-04-17 18:46:56 +01:00
David Baker addca871ad Fix default for --include arg 
nargs options are arrays and we assume it's an array later, so it
would iterate over each char of the string if left as the default
 2019-04-17 18:31:36 +01:00
David Baker 2c0504d596
Merge pull request #9500 from axelsimon/patch-1 
update installation instructions with new repo
 2019-04-17 09:34:35 +01:00
axel simon 434e8cc937
Changed the Debian repo key and public key URLs 2019-04-16 21:03:53 +02:00
axel simon 6c950593b7
the repo key filename changed, reflecting this 2019-04-16 17:58:54 +02:00
David Baker 147f77f1dc Update README.md 
better wording

Co-Authored-By: axelsimon <github@axelsimon.net>
 2019-04-16 17:55:49 +02:00
Travis Ralston 86bbe156db
Merge pull request #9498 from vector-im/travis/packages.matrix.org 
Use packages.matrix.org for Olm
 2019-04-16 08:28:38 -06:00