mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity
7621 commits 185 branches 531 tags 233 MiB
Commit graph

7621 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
8dc95ab23b Update docs with build deps 2019-04-09 17:57:16 +01:00
Andrew Morgan
cb2141075c Switch npm i to yarn 2019-04-09 17:09:23 +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
Andrew Morgan
4156034403 Update instructions to ensure downloaded modules 2019-04-08 18:41:08 +01:00
Andrew Morgan
10d0b728fd Update electron version and add compiling docs 2019-04-08 18:16:55 +01: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
Andrew Morgan
c8a04cdfcc Merge branch 'develop' into anoa/jitsi_ptt 
* develop: (47 commits)
  Translated using Weblate (Romanian)
  Translated using Weblate (Finnish)
  Translated using Weblate (Dutch)
  Added translation using Weblate (Slovenian)
  bump olm version
  Use a different cookie to expire any cookies people may already have
  Step cookie down to 4 hours
  Fix autolaunch setting appearing toggled off
  Expire mobile guide cookie after 24 hours
  Don't try to save files the user didn't want to save
  v1.0.6
  Prepare changelog for v1.0.6
  v1.0.6
  Released js-sdk & react-sdk, and bump electron version
  Deleted translation using Weblate (English (United Kingdom))
  Translated using Weblate (Italian)
  Translated using Weblate (Irish)
  Translated using Weblate (Finnish)
  Translated using Weblate (Esperanto)
  Translated using Weblate (English (United Kingdom))
  ...
 2019-04-08 16:18:44 +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
Bruno Windels
659c29cf77 v1.0.7 2019-04-08 16:16:46 +02:00
Bruno Windels
b6da314692 bump js-sdk to 1.0.4 and react-sdk to 1.0.7 2019-04-08 16:15:05 +02:00
David Baker
26955d2b79
Merge pull request #9398 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate
 2019-04-08 09:40:59 +01:00
Weblate
0a79496f0c Merge branch 'origin/develop' into Weblate. 2019-04-08 08:37:28 +00:00
Maros Dumitru
1d23f8c2f4 Translated using Weblate (Romanian) 
Currently translated at 100.0% (19 of 19 strings)

Translation: Riot Web/riot-web
Translate-URL: http://translate.riot.im/projects/riot-web/riot-web/ro/
 2019-04-08 08:37:25 +00:00