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

7505 Commits

Author SHA1 Message Date
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
J. Ryan Stinnett bb5dedeeb9 Update yarn.lock 2019-04-16 13:31:58 +01:00
axel simon 261974e9eb
update installation instructions with new repo 
change mentions of https://riot.im/packages to https://packages.riot.im
add instructions to remove old, now-untrusted riot.im signing key
update language and move from 'apt-get` to the simpler `apt`
 2019-04-16 13:53:59 +02:00
Travis Ralston cbaa7a81bf Use packages.matrix.org for Olm 
Fixes https://github.com/vector-im/riot-web/issues/9497
 2019-04-15 19:18:33 -06:00
David Baker f400cea437 Merge branch 'master' into develop 2019-04-16 01:26:24 +01:00
David Baker dcbe75ec2c v1.0.8 2019-04-16 01:22:59 +01:00
David Baker fec98fd4a9 Prepare changelog for v1.0.8 2019-04-16 01:22:59 +01:00
David Baker 29cb8c42b0 v1.0.8 2019-04-16 01:22:02 +01:00
J. Ryan Stinnett d187a437fe
Merge pull request #9412 from vector-im/anoa/electron_platform_builds 
Add separate platform electron build commands
 2019-04-11 17:16:54 +01:00
Travis Ralston a263ca8cb3 Add USE_CUSTOM_SDKS to docs 2019-04-10 15:51:06 -06:00
Travis Ralston eeae5dbcad Add docs for the Docker image 2019-04-10 15:47:12 -06:00
Travis Ralston 1bb70930fa Support custom SDKs and use yarn 2019-04-10 15:47:02 -06:00
Travis Ralston 8e76cf2c13 Ignore a bunch of files in the docker build to reduce context size 2019-04-10 15:45:42 -06:00
Travis Ralston 9bf5828079 Merge branch 'develop' into travis/dockerfile-continued 2019-04-10 15:04:36 -06:00
J. Ryan Stinnett b3bee52ad1
Merge pull request #9408 from pacien/custom-profiledir 
Add support for custom profile directory
 2019-04-10 10:45:06 +01:00
pacien 2c9b51f29d Add support for custom profile directory 
A custom user data directory can now be specified using the "profile-dir"
command line argument.

Github ref: closes #6175

Signed-off-by: Pacien TRAN-GIRARD <pacien.trangirard@pacien.net>
 2019-04-09 19:35:14 +02:00
Andrew Morgan 96be8ad072
Remove 32-bit builds for MacOS and Linux 2019-04-09 18:24:30 +01:00
Andrew Morgan 38b661e2cb
Switch to yarn 2019-04-09 17:03:58 +01:00
Andrew Morgan 657397b177
Add separate platform electron build commands 
Add commands for building separate electron builds for each platform
 2019-04-09 17:01:19 +01:00
Nad Chishtie 0796f32c17
Merge pull request #9410 from vector-im/nadonomy/mobile-install-guide 
Improved mobile install guide
 2019-04-09 17:07:20 +02:00
Nad Chishtie c70a2925a8 More responsive styling. 2019-04-09 17:05:41 +02:00
Nad Chishtie 17788b2027 Improved responsive styling. 2019-04-09 16:40:41 +02:00
Nad Chishtie 527dc1982e Updated branding. 2019-04-09 16:40:04 +02:00
J. Ryan Stinnett 449065b466
Merge pull request #9404 from vector-im/anoa/no_vec-elec_desktop 
Remove vector-electron-desktop from README
 2019-04-08 17:24:40 +01:00
Andrew Morgan 8a48d9e86b
Remove vector-electron-desktop from README 
The repo (https://github.com/iskrisis/vector-electron-desktop) very clearly states not to use it anymore.
 2019-04-08 17:11:58 +01:00
Bruno Windels a41a14b975 Merge branch 'master' into develop 2019-04-08 16:21:13 +02:00
Bruno Windels f76b30af15 v1.0.7 2019-04-08 16:18:22 +02:00
Bruno Windels 44258ffa4b Prepare changelog for v1.0.7 2019-04-08 16:18:21 +02:00