be30a2fbab
Merge pull request #93 from vector-im/t3chguy/flush-on-update
...
Run before-quit on updates too to flush rageshake
2020-05-26 11:58:22 +01:00
66d9204578
Run before-quit on updates too to flush rageshake
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-05-23 11:52:49 +01:00
b543a2e496
Reset matrix-js-sdk back to develop branch
2020-05-22 14:22:01 +01:00
91b4987d52
Merge branch 'master' into develop
2020-05-22 14:21:28 +01:00
73b9dcbb89
v1.6.2
2020-05-22 14:21:03 +01:00
460148e66c
Prepare changelog for v1.6.2
2020-05-22 14:21:03 +01:00
a568d766b0
Merge pull request #87 from vector-im/travis/room-list-2
...
Enable new room list labs flag
2020-05-21 13:30:45 -06:00
9635047c49
Merge branch 'develop' into travis/room-list-2
2020-05-21 13:28:35 -06:00
1d339123e7
Merge pull request #59 from vector-im/t3chguy/script
...
Add asar-webapp script
2020-05-21 10:58:48 +01:00
0f6a42e250
Merge pull request #50 from vector-im/dependabot/npm_and_yarn/acorn-6.4.1
...
Bump acorn from 6.4.0 to 6.4.1
2020-05-21 10:55:51 +01:00
6e7919c6a0
Merge pull request #89 from vector-im/travis/scaling-labs
...
Enable font scaling flag for nightly
2020-05-21 10:52:54 +01:00
9b9b2ee847
Enable font scaling flag for nightly
2020-05-20 10:08:43 -06:00
f9c8aa1753
Merge pull request #88 from vector-im/travis/irc-labs
...
Enable IRC UI labs flag in nightly
2020-05-19 15:00:38 -06:00
96d272f76b
Enable IRC UI labs flag in nightly
...
For https://github.com/vector-im/riot-web/pull/13350
2020-05-19 14:58:46 -06:00
3e8feef642
Reset matrix-js-sdk back to develop branch
2020-05-19 11:16:19 +01:00
48ab056785
Merge branch 'master' into develop
2020-05-19 11:15:22 +01:00
defac64eff
v1.6.1
2020-05-19 11:14:58 +01:00
4069800a92
Prepare changelog for v1.6.1
2020-05-19 11:14:58 +01:00
89318e403a
Upgrade matrix-js-sdk to 6.1.0
2020-05-19 11:11:17 +01:00
c3fde65a1b
Enable new room list labs flag
...
See https://github.com/vector-im/riot-web/pull/13675
2020-05-14 14:28:43 -06:00
829451c4c4
Merge pull request #86 from vector-im/t3chguy/update_help
...
Update help message to fix broken url to electron docs
2020-05-14 19:28:57 +01:00
d391ce6202
v1.6.1-rc.1
2020-05-14 16:22:36 +01:00
d71423181e
Prepare changelog for v1.6.1-rc.1
2020-05-14 16:22:36 +01:00
3f3e0213a7
Upgrade matrix-js-sdk to 6.1.0-rc.1
2020-05-14 16:22:05 +01:00
1cd23edb80
Update help message to fix broken url to electron docs
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-05-14 11:27:26 +01:00
662aa56b4b
Merge pull request #85 from vector-im/jryans/linter
...
Add CI scripts to install and link JS SDK
2020-05-12 10:55:40 +01:00
18f42311f5
Merge pull request #84 from vector-im/jryans/docker-xenial
...
Use Xenial as the build image's base distribution
2020-05-11 14:20:12 +01:00
7f7357573c
Add CI scripts to install and link JS SDK
...
This installs and links the JS SDK to access ESLint rules and their deps. These
scripts are copied from the React SDK.
Part of https://github.com/vector-im/riot-web/issues/13584
2020-05-11 10:33:31 +01:00
70c239f8d8
Merge Seshat deps into a single apt-get
2020-05-07 17:46:19 +01:00
94d8df6c57
Merge pull request #83 from vector-im/jryans/gpg-keys
...
Persist GPG keys for Linux builds via Docker
2020-05-07 17:41:39 +01:00
5bca8b4c83
Remove test.sh
2020-05-07 15:08:01 +01:00
c1be3a760d
Attempt libcurl3
2020-05-07 15:05:31 +01:00
933c6ee3e3
Use Xenial as the build image's base distribution
...
Since Xenial has the oldest glibc (2.23) of all the active distributions, this
attempts to construct a build image based on that. The Dockerfile here was built
by recursively expanding the `FROM` lines until reaching
`buildpack-deps:bionic-curl` and then changing that to `xenial`. Everything else
is the same.
Part of https://github.com/vector-im/riot-web/issues/13553
2020-05-07 14:45:29 +01:00
c2896a9caf
Persist GPG keys for Linux builds via Docker
...
Each build command via Docker for Linux builds creates a separate writable layer
from scratch, so anything shared between commands needs to persist on the host.
This adds the container's GPG keys, so that the riot-web GPG key can be
imported in one step and verified in the next.
Fixes https://github.com/vector-im/riot-web/issues/13545
2020-05-07 13:55:21 +01:00
eac3b284b1
Merge pull request #81 from vector-im/t3chguy/electron_app
...
Update README to mention profile support
2020-05-07 13:49:04 +01:00
4c623dc55a
s/riot-web/riot-desktop/
2020-05-07 13:25:52 +01:00
e8b4ae90c4
Merge pull request #82 from vector-im/jryans/debian-upgrade-path
...
Remove Conflicts from riot-desktop
2020-05-07 11:41:34 +01:00
a0c3295eed
Remove Conflicts from riot-desktop
...
Some early testing suggests removing this will allow the install of the riot-web
transitional package to proceed.
Part of https://github.com/vector-im/riot-web/issues/13509
2020-05-07 11:29:38 +01:00
69b8cfe353
Update README
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-05-06 11:19:08 +01:00
f9e126cb16
Merge branch 'master' into develop
2020-05-05 11:09:22 +01:00
8681dce16f
Merge branch 'release-v1.6.0'
2020-05-05 11:08:43 +01:00
d88cbeaae0
v1.6.0
2020-05-05 11:06:57 +01:00
75d83578c0
Prepare changelog for v1.6.0
2020-05-05 11:06:57 +01:00
3354f15b2c
Upgrade matrix-js-sdk to 6.0.0
2020-05-05 11:05:35 +01:00
491cf680e9
v1.6.0-rc.6
2020-05-01 16:24:41 +01:00
e90fe40054
Prepare changelog for v1.6.0-rc.6
2020-05-01 16:24:41 +01:00
f01c25d01d
Upgrade matrix-js-sdk to 6.0.0-rc.2
2020-05-01 16:23:45 +01:00
63f30c57e4
v1.6.0-rc.5
2020-04-30 11:25:21 +01:00
929638ad64
Prepare changelog for v1.6.0-rc.5
2020-04-30 11:25:20 +01:00
d621c32230
Upgrade matrix-js-sdk to 6.0.0-rc.1
2020-04-30 11:24:49 +01:00
Michael Telatynski