Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity
7,388 Commits 3 Branches 492 Tags 100 MiB
b62c1277e5
Commit Graph

7388 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
David Baker
f98870db1f
Merge pull request #9601 from vector-im/dbkr/add_scalar_staging_vector_im 
Add new scalar staging url
 2019-05-01 11:51:08 +01:00
David Baker
7c5e39e170 Add new scalar staging url 2019-05-01 11:45:11 +01:00
J. Ryan Stinnett
ebe2ab504b Add reactions feature description 2019-05-01 10:30:57 +01:00
David Baker
e4f997113d v1.1.0-rc.1 2019-04-30 12:49:40 +01:00
David Baker
cb155769d5 Prepare changelog for v1.1.0-rc.1 2019-04-30 12:49:39 +01:00
David Baker
49efece6c6 v1.1.0-rc.1 2019-04-30 12:48:52 +01:00
David Baker
846797be76 add new babel plugins to deps 2019-04-30 12:48:18 +01:00
David Baker
d6d4d95b20 Fix .babelrc to be the same as react-sdk 
it was missing some plugins which firstly means we're using inconsistent
js between projects, but also causes builds to fail due to our unique
build system.
 2019-04-30 12:42:04 +01:00
David Baker
cc8eaea5a7 js-sdk & react-sdk rc.1, electron 4.1.5 2019-04-30 12:10:06 +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